trodo-python 2.10.7__tar.gz → 2.10.9__tar.gz

{trodo_python-2.10.7 → trodo_python-2.10.9}/PKG-INFO

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

{trodo_python-2.10.7 → trodo_python-2.10.9}/pyproject.toml

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

{trodo_python-2.10.7 → trodo_python-2.10.9}/tests/test_auto_instrument_fixes.py

@@ -109,3 +109,53 @@ class TestOnStartStamping:
     def test_drops_span_when_no_run_id_anywhere(self):
         otel = _fake_otel_span(start_ns=1, end_ns=2, attrs={})
         assert otel_span_to_trodo_span(otel) is None
+
+
+class TestVercelAiContentMapping:
+    """Regression: the bridge read input/output only from gen_ai.*/llm.*, so
+    Vercel AI SDK spans (ai.* convention) landed with input/output = None and
+    the prompt/response stranded in attributes -> nothing embedded or scored."""
+
+    def _span(self, name, attrs):
+        s = _fake_otel_span(start_ns=1_000_000_000, end_ns=2_000_000_000, attrs=attrs)
+        s.name = name
+        return s
+
+    def test_maps_ai_prompt_messages_and_response_text(self):
+        otel = self._span(
+            "ai.streamText.doStream",
+            {
+                "trodo.run_id": RUN_ID,
+                "gen_ai.system": "openrouter",
+                "ai.model.id": "gemini-2.5-flash-lite",
+                "ai.usage.promptTokens": 766,
+                "ai.usage.completionTokens": 5,
+                "ai.prompt.messages": '[{"role":"user","content":"gaming monitor specs"}]',
+                "ai.response.text": "Here are some gaming monitors...",
+            },
+        )
+        span = otel_span_to_trodo_span(otel)
+        assert span is not None
+        assert span.kind == "llm"
+        assert "gaming monitor specs" in span.input
+        assert "gaming monitors" in span.output
+        assert span.model == "gemini-2.5-flash-lite"
+        assert span.input_tokens == 766
+        assert span.output_tokens == 5
+
+    def test_maps_ai_toolcall_args_and_result(self):
+        otel = self._span(
+            "ai.toolCall",
+            {
+                "trodo.run_id": RUN_ID,
+                "ai.toolCall.name": "create_object",
+                "ai.toolCall.args": '{"isValid":true}',
+                "ai.toolCall.result": '{"ok":1}',
+            },
+        )
+        span = otel_span_to_trodo_span(otel)
+        assert span is not None
+        assert span.kind == "tool"
+        assert span.tool_name == "create_object"
+        assert span.input == '{"isValid":true}'
+        assert span.output == '{"ok":1}'

{trodo_python-2.10.7 → trodo_python-2.10.9}/trodo/__init__.py

@@ -40,7 +40,7 @@ Downstream microservice (join the caller's run instead of making a new one):
 
 from __future__ import annotations
 
-__version__ = "2.10.7"
+__version__ = "2.10.9"
 
 from typing import Any, Callable, Dict, List, Optional, Union
 
@@ -132,6 +132,7 @@ def init(
     on_error: Optional[Any] = None,
     debug: bool = False,
     auto_instrument: bool = True,
+    disable_instrumentations: Optional[List[str]] = None,
     otel_mode: str = "trodo",
 ) -> TrodoClient:
     """Initialise the singleton SDK instance.
@@ -140,6 +141,11 @@ def init(
     Anthropic, OpenAI, LangChain, LlamaIndex, Google Generative AI and
     any other installed opentelemetry-instrumentation-* package, so
     LLM calls emit token/cost spans with no further code.
+
+    ``disable_instrumentations`` turns OFF specific instrumentors by id
+    (e.g. ``['openai']`` when LangChain is your primary framework, to avoid
+    double-counting the same model call). Mirrors Node's
+    ``disableInstrumentations``.
     """
     global _client
     _client = TrodoClient(
@@ -154,6 +160,7 @@ def init(
         on_error=on_error,
         debug=debug,
         auto_instrument=auto_instrument,
+        disable_instrumentations=disable_instrumentations,
         otel_mode=otel_mode,
     )
     return _client

{trodo_python-2.10.7 → trodo_python-2.10.9}/trodo/client.py

@@ -57,6 +57,7 @@ class TrodoClient:
         on_error: Optional[Any] = None,
         debug: bool = False,
         auto_instrument: bool = True,
+        disable_instrumentations: Optional[List[str]] = None,
         otel_mode: str = "trodo",
     ) -> None:
         if not site_id:
@@ -100,13 +101,14 @@ class TrodoClient:
             import os
             if os.environ.get("TRODO_LEGACY_INIT") == "1":
                 # Pre-2.4 escape hatch for one minor version.
-                enable_auto_instrument(self._span_processor)
+                enable_auto_instrument(self._span_processor, disable=disable_instrumentations)
             else:
                 _register_otel(
                     site_id=site_id,
                     processor=self._span_processor,
                     mode=otel_mode,
                     endpoint=api_base,
+                    disable_instrumentations=disable_instrumentations,
                 )
 
     def _get_span_processor(self) -> TrodoSpanProcessor:

{trodo_python-2.10.7 → trodo_python-2.10.9}/trodo/otel/auto_instrument.py

@@ -45,9 +45,19 @@ def _trunc(s: Any, max_len: int) -> Optional[str]:
 def _infer_kind(attrs: Dict[str, Any]) -> str:
     if not attrs:
         return "generic"
-    if attrs.get("gen_ai.tool.name"):
+    # Vercel AI SDK tool spans (`ai.toolCall`) carry ai.toolCall.name, not
+    # gen_ai.tool.name — without this they landed as 'generic'.
+    if attrs.get("gen_ai.tool.name") or attrs.get("ai.toolCall.name") or attrs.get("ai.functionCall.name"):
         return "tool"
-    if attrs.get("gen_ai.operation.name") or attrs.get("gen_ai.request.model"):
+    if (
+        attrs.get("gen_ai.operation.name")
+        or attrs.get("gen_ai.request.model")
+        or attrs.get("gen_ai.response.model")
+        or attrs.get("ai.model.id")
+        or attrs.get("ai.response.model")
+        or attrs.get("gen_ai.usage.input_tokens") is not None
+        or attrs.get("ai.usage.promptTokens") is not None
+    ):
         return "llm"
     if attrs.get("db.system") or attrs.get("retrieval.query"):
         return "retrieval"
@@ -178,20 +188,52 @@ def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
         attrs.get("gen_ai.usage.input_tokens")
         or attrs.get("gen_ai.usage.prompt_tokens")
         or attrs.get("llm.usage.prompt_tokens")
+        or attrs.get("ai.usage.promptTokens")
+        or attrs.get("ai.usage.inputTokens")
     )
     out_toks = (
         attrs.get("gen_ai.usage.output_tokens")
         or attrs.get("gen_ai.usage.completion_tokens")
         or attrs.get("llm.usage.completion_tokens")
+        or attrs.get("ai.usage.completionTokens")
+        or attrs.get("ai.usage.outputTokens")
     )
     model = (
         attrs.get("gen_ai.request.model")
         or attrs.get("gen_ai.response.model")
         or attrs.get("llm.request.model")
+        or attrs.get("ai.model.id")
+        or attrs.get("ai.response.model")
+    )
+    provider = attrs.get("gen_ai.system") or attrs.get("llm.vendor") or attrs.get("ai.model.provider")
+    # Vercel AI SDK uses the `ai.*` convention, NOT gen_ai.prompt/completion:
+    # ai.prompt.messages / ai.prompt (input), ai.response.text / ai.response.object
+    # (output), ai.toolCall.args / ai.toolCall.result (tool spans). Omitting these
+    # left input/output empty -> NULL in the DB -> nothing embedded or scored.
+    prompt = (
+        attrs.get("gen_ai.prompt")
+        or attrs.get("llm.prompts")
+        or attrs.get("ai.prompt")
+        or attrs.get("ai.prompt.messages")
+        or attrs.get("ai.toolCall.args")
+        or attrs.get("input.value")
+    )
+    completion = (
+        attrs.get("gen_ai.completion")
+        or attrs.get("llm.completion")
+        or attrs.get("ai.response.text")
+        or attrs.get("ai.response.object")
+        or attrs.get("ai.toolCall.result")
+        or attrs.get("output.value")
+    )
+    tool_name = (
+        attrs.get("gen_ai.tool.name")
+        or attrs.get("ai.toolCall.name")
+        or attrs.get("ai.functionCall.name")
     )
-    provider = attrs.get("gen_ai.system") or attrs.get("llm.vendor")
-    prompt = attrs.get("gen_ai.prompt") or attrs.get("llm.prompts")
-    completion = attrs.get("gen_ai.completion") or attrs.get("llm.completion")
+    temperature = attrs.get("gen_ai.request.temperature")
+    if temperature is None:
+        temperature = attrs.get("ai.settings.temperature")
 
     return TrodoSpan(
         span_id=span_id,
@@ -212,8 +254,8 @@ def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
         provider=provider,
         input_tokens=int(in_toks) if in_toks is not None else None,
         output_tokens=int(out_toks) if out_toks is not None else None,
-        temperature=attrs.get("gen_ai.request.temperature"),
-        tool_name=attrs.get("gen_ai.tool.name"),
+        temperature=temperature,
+        tool_name=tool_name,
         input=prompt,
         output=completion,
         attributes=attrs or None,

{trodo_python-2.10.7 → trodo_python-2.10.9}/trodo/otel/register.py

@@ -93,7 +93,7 @@ def register_otel(
     endpoint = (endpoint or "https://sdkapi.trodo.ai").rstrip("/")
 
     if mode == "trodo":
-        active = enable_auto_instrument(processor)
+        active = enable_auto_instrument(processor, disable=disable_instrumentations)
     elif mode == "otlp":
         active = _setup_otlp_mode(
             site_id=site_id,

{trodo_python-2.10.7 → trodo_python-2.10.9}/trodo_python.egg-info/PKG-INFO

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