trodo-python 2.10.7__py3-none-any.whl → 2.10.9__py3-none-any.whl

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/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/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/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.dist-info → trodo_python-2.10.9.dist-info}/METADATA

@@ -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.dist-info → trodo_python-2.10.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
-trodo/__init__.py,sha256=yRCFouIIerEbGEf14s1hA4Koa7RzDrytWt7H3k-EUx8,17810
-trodo/client.py,sha256=_T9gGu2GnAmGqA5VZSan4Hdy0DjfYOalnXpXl-_nkRg,18940
+trodo/__init__.py,sha256=C1zk-TLozRzrOUg23zjHKuR44cKhiM1vNEnYSvWugb8,18166
+trodo/client.py,sha256=dhGiOJmxdWmXDDDabHN865_cAxttJs9LWPeDwEFbAwI,19107
 trodo/types.py,sha256=eySgUvCXROG2TxtxgiU0MNr5iH0DEcduK8bmYtTKG44,3138
 trodo/user_context.py,sha256=9la6azzwEanVmdP4ps_xMoufbeWVeIGU-M8ychmgajg,7859
 trodo/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,11 +12,11 @@ trodo/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/managers/group_manager.py,sha256=ki3Se3qEoSZfREX63oeDeBmEfZF-ISHLE8azEtLg0tM,3542
 trodo/managers/people_manager.py,sha256=mMVnx40Mlifx6NGgChvohC9ViK6dQu2mkXNHbV8pK1E,2882
 trodo/otel/__init__.py,sha256=yiRFXWUU45bAM2CV37XeO7zf1hmnmjufdP4XO50yEyE,624
-trodo/otel/auto_instrument.py,sha256=QhSqQF6KRbSbeRuG28mzyJZleeCyDIpDRdxCKcC7eps,16169
+trodo/otel/auto_instrument.py,sha256=ERAj60N9_Okmq3psZ7CF7dempez25Gsh7Zwf-cT-HLk,17882
 trodo/otel/context.py,sha256=iJ1rE42-SbO8VZHAxhIl2ZJXgNwLIVps5xLg8GKgfFc,1165
 trodo/otel/helpers.py,sha256=4HsjMOrE-7zuvaRSiGXxV7ZyfXQ5gLxtR3HdpLut9sk,20054
 trodo/otel/processor.py,sha256=aqcTmzTw9cESgIp829pu_XCa5_dG_2MaeJNsqJZeqQU,7495
-trodo/otel/register.py,sha256=VE3VA8ey3SV9Ibp4TNLcPxhs62V8MQCUDpL61G1hq7s,9353
+trodo/otel/register.py,sha256=bV_ePTfUvPugig2GZnylhzxi2QfoPWs96A9mGLPMrSQ,9387
 trodo/otel/transport.py,sha256=hzZz8gwSMGJ8CxdijmLn1Ljt18owr9XTWy13DLbwYbw,2441
 trodo/otel/wrap_agent.py,sha256=CWzu_yUwHYft5lvi4uY8LX3ceQvCjH8HYLbyM0xOk0s,38220
 trodo/queue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,7 +25,7 @@ trodo/queue/event_queue.py,sha256=EVFZrhlq_kwC3jJ2GK0wMhHISf9UzLCZNDnT_aZ2I2A,87
 trodo/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/session/server_session.py,sha256=McsudEiq33XDq3nqxgzBcUvIjQxCMscwEuAPnYXrTjs,2136
 trodo/session/session_manager.py,sha256=JrgH1VeicmtlxPR4dXEuJbxhi23OelkgwW3-9Slv80o,2525
-trodo_python-2.10.7.dist-info/METADATA,sha256=UFFetsvkOCKxZkKzN-Jes2BLjYuPUuJBGnYDOPtEYzc,20483
-trodo_python-2.10.7.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-trodo_python-2.10.7.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.10.7.dist-info/RECORD,,
+trodo_python-2.10.9.dist-info/METADATA,sha256=SMDqPlJivMYbIfWM7qRoRfH9HXmKT_XzAXnbK4F0uqs,20483
+trodo_python-2.10.9.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+trodo_python-2.10.9.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.10.9.dist-info/RECORD,,