trodo-python 2.23.2__tar.gz → 2.23.3__tar.gz

{trodo_python-2.23.2 → trodo_python-2.23.3}/PKG-INFO

@@ -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 → trodo_python-2.23.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "trodo-python"
-version = "2.23.2"
+version = "2.23.3"
 description = "Trodo Analytics SDK for Python — server-side event tracking"
 readme = "README.md"
 license = { text = "ISC" }

trodo_python-2.23.3/tests/test_framework_deference.py

@@ -0,0 +1,41 @@
+"""One model call must produce one llm span.
+
+langchain-openai depends on the `openai` package, so a chain invocation IS a
+provider client call. With both instrumentors registered that single call emits
+two sibling llm spans carrying identical tokens, and the run's totals double.
+Measured on the Node side against real traffic: a 45/2 call reported 90/4. Cost
+escaped doubling only by luck -- the framework's duplicate reported
+model=unknown and so could not be priced at all.
+
+The framework instrumentor therefore defers to the provider one, which knows the
+real model id and can be priced.
+"""
+from trodo.otel.auto_instrument import _superseding_providers
+
+
+def test_langchain_defers_to_openai():
+    assert "openai" in _superseding_providers("langchain", ["anthropic", "openai"])
+
+
+def test_langchain_defers_to_anthropic():
+    assert "anthropic" in _superseding_providers("langchain", ["anthropic"])
+
+
+def test_langchain_registers_when_no_provider_it_routes_through_is_active():
+    # LangChain over a provider we do not instrument: its span is then the ONLY
+    # capture, and suppressing it would lose the call entirely.
+    assert _superseding_providers("langchain", ["google_generativeai"]) == []
+    assert _superseding_providers("langchain", []) == []
+
+
+def test_providers_never_defer_to_each_other():
+    # Two providers are two different clients; there is nothing to double.
+    assert _superseding_providers("openai", ["anthropic"]) == []
+    assert _superseding_providers("anthropic", ["openai"]) == []
+
+
+def test_only_lists_providers_registered_before_the_framework():
+    # The check reads `active`, built in registration order (anthropic, openai,
+    # openai_v2, langchain, ...). Listing bedrock would read right and never fire.
+    got = _superseding_providers("langchain", ["openai", "anthropic", "bedrock", "cohere"])
+    assert "bedrock" not in got and "cohere" not in got

{trodo_python-2.23.2 → trodo_python-2.23.3}/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 → trodo_python-2.23.3}/trodo_python.egg-info/PKG-INFO

@@ -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 → trodo_python-2.23.3}/trodo_python.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ tests/test_datasets.py
 tests/test_end_run.py
 tests/test_error_enrichment.py
 tests/test_experiments.py
+tests/test_framework_deference.py
 tests/test_get_prompt_version_types.py
 tests/test_instrumentor_resolution.py
 tests/test_llm_usage_cost.py