trodo-python 2.23.2__py3-none-any.whl → 2.23.3__py3-none-any.whl

trodo/otel/auto_instrument.py

@@ -554,6 +554,33 @@ def _register_instrumentors() -> None:
     ]
 
 
+# Framework instrumentors that call a provider client we ALSO instrument.
+#
+# langchain-openai depends on the `openai` package, langchain-anthropic on
+# `anthropic` -- so one chain invocation is also a genuine provider client call.
+# With both instrumentors registered that single call emits TWO sibling llm
+# spans carrying the same tokens, and the run's totals come out doubled.
+# Measured on the Node side against real traffic: a 45/2 call reported 90/4.
+#
+# The provider span is the better of the two: it carries the real model id, so
+# it can be priced, while the framework's reported model=unknown and could not
+# be. So the framework instrumentor defers.
+#
+# Only providers registered BEFORE the framework in _INSTRUMENTORS may appear
+# here -- the check reads `active`, which is built in registration order. That
+# order is anthropic, openai, openai_v2, langchain, ... so those are covered;
+# listing bedrock or cohere would read correctly and never fire.
+_ROUTES_THROUGH: dict[str, tuple[str, ...]] = {
+    "langchain": ("openai", "openai_v2", "anthropic"),
+    "llama_index": ("openai", "openai_v2", "anthropic"),
+}
+
+
+def _superseding_providers(name: str, active: List[str]) -> List[str]:
+    """Provider instrumentors already active that `name` would double-count."""
+    return [p for p in _ROUTES_THROUGH.get(name, ()) if p in active]
+
+
 def enable_auto_instrument(
     processor: TrodoSpanProcessor,
     disable: Optional[Iterable[str]] = None,
@@ -590,6 +617,24 @@ def enable_auto_instrument(
     for name, register in _INSTRUMENTORS:
         if name in disabled:
             continue
+        # BEFORE registering: a framework instrumentor whose model calls are
+        # already captured by an active provider instrumentor would double every
+        # token. Checked here rather than after, because instrumentors patch on
+        # instrument() and undoing it afterwards is too late.
+        superseded = _superseding_providers(name, active)
+        if superseded:
+            _warn_once(
+                f"superseded-{name}",
+                f"auto-instrument: '{name}' was NOT loaded because "
+                f"{', '.join(superseded)} instrumentation is already active and "
+                f"{name} calls those clients directly -- running both makes one "
+                f"model call emit two llm spans and doubles its tokens and cost. "
+                f"Your {name} calls are still captured, by the provider "
+                f"instrumentation, which also records the real model id so the "
+                f"span can be priced. To choose the other way round, pass "
+                f"disable=['{superseded[0]}'].",
+            )
+            continue
         try:
             register()
             active.append(name)

{trodo_python-2.23.2.dist-info → trodo_python-2.23.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trodo-python
-Version: 2.23.2
+Version: 2.23.3
 Summary: Trodo Analytics SDK for Python — server-side event tracking
 License: ISC
 Keywords: analytics,tracking,trodo,server-side

{trodo_python-2.23.2.dist-info → trodo_python-2.23.3.dist-info}/RECORD

@@ -16,7 +16,7 @@ trodo/managers/people_manager.py,sha256=mMVnx40Mlifx6NGgChvohC9ViK6dQu2mkXNHbV8p
 trodo/managers/prompt_manager.py,sha256=qFVHgh7PW-SlgHp62ybirdYsJBg-fcQVMTTU3jPqFvo,13435
 trodo/managers/user_manager.py,sha256=faJYX3CHrD7ulYiShV7FhThSMX9aJ3kdOgU4Qtdy5FM,2844
 trodo/otel/__init__.py,sha256=yiRFXWUU45bAM2CV37XeO7zf1hmnmjufdP4XO50yEyE,624
-trodo/otel/auto_instrument.py,sha256=dA7IZ9cTSNTFK-oVwkYL2OwfTH3wDKM4iKXtPvZoK-Y,23800
+trodo/otel/auto_instrument.py,sha256=I_F3NCvc0JML2UpX9PaxFM3OGzMSuEYYfxZYTwkQDuo,26224
 trodo/otel/context.py,sha256=Jd0aTc0Q-1dM5kXXinhZD8YtnpdKgvneNiODyboVGKY,1418
 trodo/otel/helpers.py,sha256=XOMWcgZHaq5SQbkFxDaXPE4CDFjn01xjJmJ1vIxvwpw,20730
 trodo/otel/processor.py,sha256=LKlXxP3BeQ7DP8SzYAgXZZOeJ6-6b7e43i19gCUC_0Y,7939
@@ -36,7 +36,7 @@ trodo/session/server_session.py,sha256=McsudEiq33XDq3nqxgzBcUvIjQxCMscwEuAPnYXrT
 trodo/session/session_manager.py,sha256=7ht5LeeZX1HLLfPeNV_a8NkXGbHl3up0CRtCGr3EzjQ,2995
 trodo/util/__init__.py,sha256=Z9c4rPPdKg06Kk3byKheDqksSgR4WNvS475oQ5sNljc,54
 trodo/util/lru.py,sha256=QIsM7s6J_E9ZjiXatSyReZIEeGypTAcgrPWWy8YsRa4,2465
-trodo_python-2.23.2.dist-info/METADATA,sha256=HWnV5YiFL2qLt9cMyNDi8Sjuq9FCh9HmfCmLVhRBvIY,25308
-trodo_python-2.23.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-trodo_python-2.23.2.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.23.2.dist-info/RECORD,,
+trodo_python-2.23.3.dist-info/METADATA,sha256=Jim05wcQ2OduKmnK4NYi19Hp3fFf2FrD8E575KKzShc,25308
+trodo_python-2.23.3.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+trodo_python-2.23.3.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.23.3.dist-info/RECORD,,