trodo-python 2.10.8__py3-none-any.whl → 2.10.10__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.8"
+__version__ = "2.10.10"
 
 from typing import Any, Callable, Dict, List, Optional, Union
 

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"
@@ -57,6 +67,99 @@ def _infer_kind(attrs: Dict[str, Any]) -> str:
 _ATTR_TRODO_RUN_ID = "trodo.run_id"
 _ATTR_TRODO_PARENT_SPAN_ID = "trodo.parent_span_id"
 
+# ---------------------------------------------------------------------------
+# Convention-agnostic input/output extraction — covers every common LLM
+# instrumentor convention, not just Vercel AI. Mirrors the backend's
+# services/ingest/spanContent.js.
+#   - Vercel AI ...... ai.prompt(.messages) / ai.response.text|object|toolCalls,
+#                      ai.toolCall.args / ai.toolCall.result
+#   - OTel GenAI ..... gen_ai.input.messages / gen_ai.output.messages (current);
+#                      gen_ai.prompt / gen_ai.completion (legacy single value)
+#   - OpenLLMetry .... INDEXED gen_ai.prompt.{i}.role/content, gen_ai.completion.{i}.*
+#   - OpenInference .. input.value / output.value + INDEXED llm.input_messages.{i}.message.*
+#   - Traceloop/Langfuse/MLflow, plus generic llm.prompts / input / prompt
+# ---------------------------------------------------------------------------
+_INPUT_SINGLE_KEYS = [
+    "gen_ai.input.messages", "ai.prompt.messages", "ai.prompt", "gen_ai.prompt",
+    "input.value", "traceloop.entity.input", "langfuse.observation.input", "mlflow.spanInputs",
+    "llm.input_messages", "llm.prompts", "gen_ai.tool.input", "ai.toolCall.args", "input", "prompt",
+]
+_OUTPUT_SINGLE_KEYS = [
+    "gen_ai.output.messages", "ai.response.text", "ai.response.object", "ai.response.toolCalls",
+    "gen_ai.completion", "output.value", "traceloop.entity.output", "langfuse.observation.output",
+    "mlflow.spanOutputs", "llm.output_messages", "llm.completions", "gen_ai.tool.output",
+    "ai.toolCall.result", "output", "completion",
+]
+_INPUT_INDEXED_BASES = ["gen_ai.prompt", "llm.input_messages"]
+_OUTPUT_INDEXED_BASES = ["gen_ai.completion", "llm.output_messages"]
+
+
+def _first_single(attrs: Dict[str, Any], keys) -> Optional[Any]:
+    for k in keys:
+        v = attrs.get(k)
+        if v is None:
+            continue
+        if isinstance(v, str):
+            if v:
+                return v
+            continue
+        return v  # dict/list — keep structure
+    return None
+
+
+def _set_nested(obj: Dict[str, Any], path: str, val: Any) -> None:
+    parts = path.split(".")
+    cur = obj
+    for p in parts[:-1]:
+        nxt = cur.get(p)
+        if not isinstance(nxt, dict):
+            nxt = {}
+            cur[p] = nxt
+        cur = nxt
+    cur[parts[-1]] = val
+
+
+def _reconstruct_indexed(attrs: Dict[str, Any], bases) -> Optional[str]:
+    import json as _json
+    for base in bases:
+        prefix = base + "."
+        by_index: Dict[int, Dict[str, Any]] = {}
+        for key, val in attrs.items():
+            if not key.startswith(prefix):
+                continue
+            rest = key[len(prefix):]
+            dot = rest.find(".")
+            if dot < 0:
+                continue
+            idx_str = rest[:dot]
+            if not idx_str.isdigit():
+                continue
+            idx = int(idx_str)
+            by_index.setdefault(idx, {})
+            _set_nested(by_index[idx], rest[dot + 1:], val)
+        if by_index:
+            arr = [by_index[i] for i in sorted(by_index)]
+            return _json.dumps(arr)
+    return None
+
+
+def _extract_input(attrs: Dict[str, Any]) -> Optional[Any]:
+    if not isinstance(attrs, dict):
+        return None
+    single = _first_single(attrs, _INPUT_SINGLE_KEYS)
+    if single is not None:
+        return single
+    return _reconstruct_indexed(attrs, _INPUT_INDEXED_BASES)
+
+
+def _extract_output(attrs: Dict[str, Any]) -> Optional[Any]:
+    if not isinstance(attrs, dict):
+        return None
+    single = _first_single(attrs, _OUTPUT_SINGLE_KEYS)
+    if single is not None:
+        return single
+    return _reconstruct_indexed(attrs, _OUTPUT_INDEXED_BASES)
+
 
 def _span_id_to_uuid(span_id: Optional[str]) -> Optional[str]:
     """Convert an OTel hex span id into UUID format. Mirrors trodo-node's
@@ -178,20 +281,35 @@ 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")
+    # Convention-agnostic — see _extract_input/_extract_output above.
+    prompt = _extract_input(attrs)
+    completion = _extract_output(attrs)
+    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 +330,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.8.dist-info → trodo_python-2.10.10.dist-info}/METADATA

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

{trodo_python-2.10.8.dist-info → trodo_python-2.10.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trodo/__init__.py,sha256=tfTaRW3Cmc87r_zTYy1SbztE9qbnvpp7tBo--DNMd8w,18166
+trodo/__init__.py,sha256=NdFjtAqmhBo4Ij9SAl7ByzTxUsVWSKbBGwGiaXKGioc,18167
 trodo/client.py,sha256=dhGiOJmxdWmXDDDabHN865_cAxttJs9LWPeDwEFbAwI,19107
 trodo/types.py,sha256=eySgUvCXROG2TxtxgiU0MNr5iH0DEcduK8bmYtTKG44,3138
 trodo/user_context.py,sha256=9la6azzwEanVmdP4ps_xMoufbeWVeIGU-M8ychmgajg,7859
@@ -12,7 +12,7 @@ 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=JvXXssoCbX3vE_3GrqDZPIqKHXqVrFbW2DEnmuYtFoE,20834
 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
@@ -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.8.dist-info/METADATA,sha256=Itp-gZCxGIWFFQo91wCT5VRdrDmtcw0C79yyKM4veIg,20483
-trodo_python-2.10.8.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-trodo_python-2.10.8.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.10.8.dist-info/RECORD,,
+trodo_python-2.10.10.dist-info/METADATA,sha256=5QKvyxt9X3UnpLrhJy2f4BBqCumdmkZX2y9oahc-sdg,20484
+trodo_python-2.10.10.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+trodo_python-2.10.10.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.10.10.dist-info/RECORD,,