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
Build the usage insert once, not on every message (CHOO-3667)
Abel Dantasfeaf0b408a8c
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 8b9791612..bcf1d2840 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -224,6 +224,9 @@ version of their own to them without also giving them a release of their own.group whose subgroup would move up next to a namesake is refused too, andthe dashboard now shows why. Names can no longer contain `/` or be blank.Existing duplicates are left as they are and can be reached by id.+- **Recording a message's usage builds its statement once.** The insert was+ built for every message an agent sent; it is built once and run with bind+ parameters.#### Fixed- **On Slack, the 👀 and the activity card no longer arrive after the agent'sdiff --git a/core/switch_core/db/stores/usage_store.py b/core/switch_core/db/stores/usage_store.pyindex 0ea4b13f6..a7a2291a8 100644--- a/core/switch_core/db/stores/usage_store.py+++ b/core/switch_core/db/stores/usage_store.py@@ -1,7 +1,8 @@from dataclasses import dataclassfrom datetime import datetime+from typing import Any-from sqlalchemy import and_, func, literal, select+from sqlalchemy import and_, bindparam, func, literal, selectfrom sqlalchemy.dialects.postgresql import insertfrom sqlalchemy.ext.asyncio import AsyncSession@@ -24,6 +25,28 @@ class UsageTotal:amount: int+def _record() -> Any:+ """The statement `UsageStore.record` runs, built once and run with bind+ parameters: every message an agent sends records its usage, and building+ the statement each time cost more than running it."""+ bucket = func.date_trunc("hour", func.now(), literal("UTC"))+ statement = insert(TenantUsage).values(+ tenant_id=bindparam("tenant_id"),+ metric=bindparam("metric"),+ bucket_start=bucket,+ client_id=bindparam("client_id"),+ model=bindparam("model"),+ amount=bindparam("amount"),+ )+ return statement.on_conflict_do_update(+ index_elements=["tenant_id", "metric", "bucket_start", "client_id", "model"],+ set_={"amount": TenantUsage.amount + statement.excluded.amount},+ )+++_RECORD = _record()++class UsageStore:async def record(self,@@ -43,26 +66,16 @@ class UsageStore:"""if amount <= 0:raise ValueError(f"usage amount must be positive, got {amount}")- bucket = func.date_trunc("hour", func.now(), literal("UTC"))- statement = insert(TenantUsage).values(- tenant_id=tenant_id,- metric=metric.value,- bucket_start=bucket,- client_id=client_id,- model=model,- amount=amount,- )- statement = statement.on_conflict_do_update(- index_elements=[- "tenant_id",- "metric",- "bucket_start",- "client_id",- "model",- ],- set_={"amount": TenantUsage.amount + statement.excluded.amount},+ await session.execute(+ _RECORD,+ {+ "tenant_id": tenant_id,+ "metric": metric.value,+ "client_id": client_id,+ "model": model,+ "amount": amount,+ },)- await session.execute(statement)async def totals(self,