Open-source AI teammates in Slack, Teams, Discord, Telegram and Mattermost. Self-host it, with any agent harness and any model.
Python agent-orchestrationaiai-agentschatopsdiscordlangchainmcpmicrosoft-teamsmulti-agentopen-sourceopenaiself-hostedslack
Make every transaction's tenant binding and pool checkout cheaper on the server (CHOO-3667)
Abel Dantas2ee92843be93
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 8b9791612..3fd9bdef3 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -159,6 +159,12 @@ version of their own to them without also giving them a release of their own.compares it only when someone signs in.#### Changed+- **Each database transaction costs the server a little less.** Binding the+ workspace to a transaction built and compiled the same statement every+ time; it is now sent to the driver as it is. And timing who holds a pooled+ connection worked out the borrower's name and a short stack on every+ checkout; the name is now kept per function, and the stack is written out+ only for a hold long enough to log.- **An agent's stream reads in one database session per pass, and pooledconnections are no longer pinged before use.** A pass that delivered amessage opened a session for each of its reads, six pool checkouts and sixdiff --git a/core/switch_core/db/tenant_session.py b/core/switch_core/db/tenant_session.pyindex cb41dad8e..2df556491 100644--- a/core/switch_core/db/tenant_session.py+++ b/core/switch_core/db/tenant_session.py@@ -66,7 +66,7 @@ from __future__ import annotationsfrom typing import Any-from sqlalchemy import event, text+from sqlalchemy import eventfrom sqlalchemy.engine import Connectionfrom sqlalchemy.orm import ORMExecuteState, Session, SessionTransaction@@ -135,6 +135,9 @@ def register_tenant_session_hook() -> None:_registered = True+_SET_TENANT = "SELECT set_config('app.tenant_id', $1, true)"++def _set_tenant_on_begin(session: Session, transaction: SessionTransaction, connection: Connection) -> None:@@ -155,10 +158,9 @@ def _set_tenant_on_begin(session.info[_STAMPED] = tenant_idif tenant_id is None:return- connection.execute(- text("SELECT set_config('app.tenant_id', :tenant_id, true)"),- {"tenant_id": tenant_id},- )+ # Sent to the driver as it is: a `text()` construct would be built and+ # compiled again for every transaction, which is every session.+ connection.exec_driver_sql(_SET_TENANT, (tenant_id,))def _forget_the_stamp(session: Session, transaction: SessionTransaction) -> None:diff --git a/core/switch_core/observability/pool.py b/core/switch_core/observability/pool.pyindex b4177b415..d4f90e52f 100644--- a/core/switch_core/observability/pool.py+++ b/core/switch_core/observability/pool.py@@ -17,8 +17,9 @@ import osimport sysimport threadingimport time+from collections.abc import Iteratorfrom dataclasses import dataclass-from types import FrameType+from types import CodeType, FrameTypefrom typing import Anyimport greenlet@@ -146,10 +147,16 @@ UNKNOWN_CALLER = "unknown"class _Hold:started: floatcaller: str- stack: tuple[str, ...]+ # The borrower's innermost switch_core frames, as each one's code and the+ # line it was on: written out as text only for a hold long enough to log.+ places: tuple[tuple[CodeType, int], ...] = ()+ @property+ def stack(self) -> tuple[str, ...]:+ return tuple(_place(code, line) for code, line in self.places)-def _frames_of_borrower() -> list[FrameType]:++def _frames_of_borrower() -> Iterator[FrameType]:"""The call stack of the code borrowing a connection, innermost first.A checkout on the async engine runs inside SQLAlchemy's greenlet, whose@@ -157,52 +164,76 @@ def _frames_of_borrower() -> list[FrameType]:awaited it. That coroutine is suspended in the parent greenlet, so thewalk continues from the parent's frame when the local one runs out."""- frames: list[FrameType] = []frame: FrameType | None = sys._getframe(1)while frame is not None:- frames.append(frame)+ yield frameframe = frame.f_backcurrent = greenlet.getcurrent()parent = current.parentif parent is not None and parent.gr_frame is not None:frame = parent.gr_framewhile frame is not None:- frames.append(frame)+ yield frameframe = frame.f_back- return frames-def _ours(frame: FrameType) -> bool:- filename = frame.f_code.co_filename- return (- _PACKAGE_MARKER in filename- and _TESTS_MARKER not in filename- and not any(p in filename for p in _PLUMBING)- )+# Whether a file's frames are ours, and the label a function is named by,+# kept: asked on every checkout, of the same few dozen functions. Keyed by+# file and name rather than by code object, as two functions compiled from+# the same source in different files compare equal.+_OURS: dict[str, bool] = {}+_LABELS: dict[tuple[str, str], str] = {}-def _module(frame: FrameType) -> str:- filename = frame.f_code.co_filename- tail = filename.rsplit(_PACKAGE_MARKER, 1)[-1]- return "switch_core." + tail.removesuffix(".py").replace(os.sep, ".")+def _ours(code: CodeType) -> bool:+ filename = code.co_filename+ ours = _OURS.get(filename)+ if ours is None:+ ours = _OURS[filename] = (+ _PACKAGE_MARKER in filename+ and _TESTS_MARKER not in filename+ and not any(p in filename for p in _PLUMBING)+ )+ return ours+++def _label(code: CodeType) -> str:+ key = (code.co_filename, code.co_name)+ label = _LABELS.get(key)+ if label is None:+ tail = code.co_filename.rsplit(_PACKAGE_MARKER, 1)[-1]+ module = "switch_core." + tail.removesuffix(".py").replace(os.sep, ".")+ label = _LABELS[key] = f"{module}:{code.co_name}"+ return label+++def _place(code: CodeType, line: int) -> str:+ return f"{_label(code)}:{line}"+++def _borrower() -> tuple[str, tuple[tuple[CodeType, int], ...]]:+ """The innermost switch_core function borrowing a connection, as a label,+ and the borrower's innermost switch_core frames, as places."""+ places: list[tuple[CodeType, int]] = []+ for frame in _frames_of_borrower():+ code = frame.f_code+ if _ours(code):+ places.append((code, frame.f_lineno))+ if len(places) == _LONG_HOLD_STACK_DEPTH:+ break+ if not places:+ return UNKNOWN_CALLER, ()+ return _label(places[0][0]), tuple(places)def describe_borrower() -> tuple[str, tuple[str, ...]]:"""`module:function` of the innermost switch_core frame, and a short stack.The label is bounded by the code rather than the traffic, so it can be a- metric attribute. Asked on every checkout: walking a few dozen frames is- microseconds against a round trip of a hundred or more.+ metric attribute."""- ours = [f for f in _frames_of_borrower() if _ours(f)]- if not ours:- return UNKNOWN_CALLER, ()- caller = f"{_module(ours[0])}:{ours[0].f_code.co_name}"- stack = tuple(- f"{_module(f)}:{f.f_code.co_name}:{f.f_lineno}"- for f in ours[:_LONG_HOLD_STACK_DEPTH]- )- return caller, stack+ caller, places = _borrower()+ return caller, tuple(_place(code, line) for code, line in places)class _LongHoldLog:@@ -245,8 +276,8 @@ def install_hold_timer(engine: AsyncEngine) -> None:@event.listens_for(engine.sync_engine, "checkout")def _on_checkout(_dbapi: object, record: Any, _proxy: object) -> None:- caller, stack = describe_borrower()- record.info[_HOLD_KEY] = _Hold(time.perf_counter(), caller, stack)+ caller, places = _borrower()+ record.info[_HOLD_KEY] = _Hold(time.perf_counter(), caller, places)@event.listens_for(engine.sync_engine, "checkin")def _on_checkin(_dbapi: object, record: Any) -> None:diff --git a/core/tests/switch_core/observability/test_pool_holds.py b/core/tests/switch_core/observability/test_pool_holds.pyindex 5d8ec4c17..7ea508524 100644--- a/core/tests/switch_core/observability/test_pool_holds.py+++ b/core/tests/switch_core/observability/test_pool_holds.py@@ -128,7 +128,7 @@ class TestTheLongHoldLog:clock = iter([100.0, 110.0, 200.0])monkeypatch.setattr(pool_module.time, "monotonic", lambda: next(clock))log = _LongHoldLog()- hold = _Hold(started=0.0, caller="switch_core.rooms:slow", stack=())+ hold = _Hold(started=0.0, caller="switch_core.rooms:slow")with caplog.at_level(logging.WARNING, logger=pool_module.__name__):log.report(hold, 2.0)