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

trodo/otel/prompt_trace.py

@@ -25,7 +25,7 @@ PromptRef = Dict[str, Any]
 
 def new_prompt_state() -> Dict[str, Any]:
     """Per-run accumulator, shared by reference across the run's span tree."""
-    return {"current": None, "all": []}
+    return {"current": None, "current_span_id": None, "all": []}
 
 
 # Compiled prompt (or its messages list) -> the version it came from.
@@ -93,6 +93,7 @@ def record_compiled_prompt(ref: PromptRef) -> None:
     state = getattr(active, "prompt_state", None) if active is not None else None
     if isinstance(state, dict):
         state["current"] = ref
+        state["current_span_id"] = getattr(active, "span_id", None)
         key = _ref_key(ref)
         used: List[PromptRef] = state["all"]
         if not any(_ref_key(r) == key for r in used):
@@ -116,7 +117,11 @@ def prompt_attributes(ref: Optional[PromptRef]) -> Dict[str, str]:
 
 
 def merge_prompt_attrs(
-    active: Any, attrs: Optional[Dict[str, Any]], from_input: Optional[PromptRef] = None
+    active: Any,
+    attrs: Optional[Dict[str, Any]],
+    from_input: Optional[PromptRef] = None,
+    kind: Optional[str] = None,
+    span_id: Optional[str] = None,
 ) -> Optional[Dict[str, Any]]:
     """Merge the prompt this span used into its attributes.
 
@@ -134,7 +139,24 @@ def merge_prompt_attrs(
         remember_prompt(state, from_input)
         merged.update(prompt_attributes(from_input))
     elif isinstance(state, dict):
-        merged.update(prompt_attributes(state.get("current")))
+        # The run's "most recently compiled" prompt is a FALLBACK, used only
+        # where it is defensible. Applying it to every span meant compiling a
+        # prompt anywhere in a run attributed it to every LATER span -- a tool,
+        # a retrieval, a bit of plain work all claiming a prompt they never ran.
+        # Prompts belong to SPANS: one run's spans routinely use different
+        # prompts, different versions, or none at all.
+        #
+        # Two cases survive: a MODEL call (kind 'llm'), the only thing that runs
+        # a prompt and the one shape whose input we cannot read when it comes
+        # from a provider instrumentation; and the very span the prompt was
+        # compiled INSIDE, which plainly used it whatever its kind.
+        compiled_here = (
+            state.get("current") is not None
+            and span_id is not None
+            and state.get("current_span_id") == span_id
+        )
+        if kind == "llm" or compiled_here:
+            merged.update(prompt_attributes(state.get("current")))
     return merged or None
 
 

trodo/otel/wrap_agent.py

@@ -876,7 +876,8 @@ class join_run:
             temperature=self.handle.temperature,
             tool_name=self.handle.tool_name,
             attributes=merge_prompt_attrs(
-                self._ctx, self.handle.attributes, self.handle.prompt_ref
+                self._ctx, self.handle.attributes, self.handle.prompt_ref,
+                self._kind, self._span_id,
             ),
         )
         try:
@@ -988,7 +989,8 @@ class span:
             temperature=self.handle.temperature,
             tool_name=self.handle.tool_name,
             attributes=merge_prompt_attrs(
-                self._active, self.handle.attributes, self.handle.prompt_ref
+                self._active, self.handle.attributes, self.handle.prompt_ref,
+                self._kind, self._span_id,
             ),
         )
         processor: TrodoSpanProcessor = self._active.processor  # type: ignore[assignment]

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

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

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

@@ -20,10 +20,10 @@ trodo/otel/auto_instrument.py,sha256=dA7IZ9cTSNTFK-oVwkYL2OwfTH3wDKM4iKXtPvZoK-Y
 trodo/otel/context.py,sha256=Jd0aTc0Q-1dM5kXXinhZD8YtnpdKgvneNiODyboVGKY,1418
 trodo/otel/helpers.py,sha256=XOMWcgZHaq5SQbkFxDaXPE4CDFjn01xjJmJ1vIxvwpw,20730
 trodo/otel/processor.py,sha256=LKlXxP3BeQ7DP8SzYAgXZZOeJ6-6b7e43i19gCUC_0Y,7939
-trodo/otel/prompt_trace.py,sha256=X-8AIfwMmegOZl9yMifUkpYu1rV4wE6-kuYYtts0wgA,6184
+trodo/otel/prompt_trace.py,sha256=d2A6UhlWAgHZLIKtU0NxgGUpHk_z3F2Nm4u4QTAC3tA,7332
 trodo/otel/register.py,sha256=bV_ePTfUvPugig2GZnylhzxi2QfoPWs96A9mGLPMrSQ,9387
 trodo/otel/transport.py,sha256=hzZz8gwSMGJ8CxdijmLn1Ljt18owr9XTWy13DLbwYbw,2441
-trodo/otel/wrap_agent.py,sha256=Izty1jxF4ANVqS72L0CR9jmMuW372AApaEO_0LC5Thw,43860
+trodo/otel/wrap_agent.py,sha256=PiluY8r_yvGtuST45sqYWDbtF0trmKFQRiN0vbZl8Rk,43948
 trodo/prompts/__init__.py,sha256=yunNc8WkTSfEEkRR-NZWXAt_ZB3Ee2INRh-4RE7uHj4,806
 trodo/prompts/compile.py,sha256=XoKDKz6Yaofhrk-87AVW-SnwbiXLvfp161AL2bAFzNY,8802
 trodo/prompts/template.py,sha256=eGO2ZVNOw6JK7Ffj1UCYDMJFYyX5qQW2POlmFJSQpAo,9975
@@ -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.1.dist-info/METADATA,sha256=WDaY32vkP94_NzHjeE38-nnxCaUS3bGRYa5YgCA3qYI,25308
-trodo_python-2.23.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-trodo_python-2.23.1.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.23.1.dist-info/RECORD,,
+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,,