trodo-python 2.26.0__py3-none-any.whl → 2.26.2__py3-none-any.whl

trodo/__init__.py

@@ -41,7 +41,7 @@ Downstream microservice (join the caller's run instead of making a new one):
 
 from __future__ import annotations
 
-__version__ = "2.26.0"
+__version__ = "2.26.2"
 
 from typing import Any, Callable, Dict, List, Optional, Union
 

trodo/_version.py

@@ -1 +1 @@
-SDK_VERSION = "2.26.0"
+SDK_VERSION = "2.26.2"

trodo/managers/dataset_manager.py

@@ -17,16 +17,28 @@ from typing import Any, Dict, List, Optional, Union
 
 __all__ = ["DatasetManager"]
 
-# The optional per-item fields, in wire order. ``input`` is always required.
-_ITEM_OPTIONAL = ("expected_output", "metadata", "source_trace_ref")
+# The optional per-item fields, in wire order. ``input`` is required on a row.
+_ITEM_OPTIONAL = ("output", "expected_output", "metadata", "source_trace_ref", "tags")
+# A reference to production instead of content: the item becomes that unit's
+# row (Input, Output and Evaluations filled by Trodo). ``eval_run_id`` names a
+# verdict: Output is what the eval said, Expected its correction.
+_UNIT_REF_KEYS = ("span_id", "run_id", "conversation_id", "eval_run_id")
+_UNIT_REF_OPTIONAL = ("tags", "metadata")
 
 
 def _clean_item(item: Dict[str, Any]) -> Dict[str, Any]:
     if not isinstance(item, dict):
         raise ValueError("trodo: each dataset item must be a dict")
+    ref = [k for k in _UNIT_REF_KEYS if item.get(k)]
+    if ref and ("input" not in item or item["input"] is None):
+        out: Dict[str, Any] = {ref[0]: str(item[ref[0]])}
+        for key in _UNIT_REF_OPTIONAL:
+            if item.get(key) is not None:
+                out[key] = item[key]
+        return out
     if "input" not in item or item["input"] is None:
-        raise ValueError("trodo: each dataset item requires an 'input' dict")
-    out: Dict[str, Any] = {"input": item["input"]}
+        raise ValueError("trodo: each dataset item requires an 'input' dict, or a span_id / run_id / conversation_id / eval_run_id")
+    out = {"input": item["input"]}
     for key in _ITEM_OPTIONAL:
         if item.get(key) is not None:
             out[key] = item[key]

trodo/otel/processor.py

@@ -11,6 +11,9 @@ import threading
 from dataclasses import dataclass, asdict
 from typing import Any, Dict, List, Optional, Union
 
+# How long end_run waits for the run's queued spans to send before sending the end.
+END_RUN_FLUSH_S = 5.0
+
 
 @dataclass
 class TrodoRun:
@@ -189,7 +192,21 @@ class TrodoSpanProcessor:
             pass
 
     def end_run(self, run_id: str, payload: Dict[str, Any]) -> None:
-        """Finalise a Run opened by start_run."""
+        """Finalise a Run opened by start_run.
+
+        The run's spans go first: joined spans wait in the sender's queue, and
+        an end that overtakes them gets the run evaluated on a partial trace.
+        Bounded, and a failure here never holds up the end.
+        """
+        try:
+            with self._lock:
+                buffered = self._pending.pop(run_id, None) or []
+            if buffered:
+                self._send_spans(run_id, [s.to_dict() for s in buffered])
+            if self._sender is not None:
+                self._sender.flush(END_RUN_FLUSH_S)
+        except Exception:
+            pass
         try:
             self._http.post_run_end(run_id, payload)
         except Exception:

{trodo_python-2.26.0.dist-info → trodo_python-2.26.2.dist-info}/METADATA

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

{trodo_python-2.26.0.dist-info → trodo_python-2.26.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-trodo/__init__.py,sha256=P8tsY10bg0h-A8TjIYYEiFuYpo-jGSbDzViEsKbnKsU,28752
-trodo/_version.py,sha256=MX7IGM5dYbXPeFIXOWPhV7DPbCslhEe8Q7DCvxwKmhY,23
+trodo/__init__.py,sha256=VDSYG1fk0IQ7WHKaU9OFHUpgQyNAhtzlxl-rq1MP8hM,28752
+trodo/_version.py,sha256=GiZggLfKnXVCrwzvq12hUijpWwqpB6bz8DKCKTTDDPU,23
 trodo/client.py,sha256=6k6HeKrGV2720kK17--u6BjbhAUFZNUzpd9yEYiaQOs,24137
 trodo/types.py,sha256=eySgUvCXROG2TxtxgiU0MNr5iH0DEcduK8bmYtTKG44,3138
 trodo/user_context.py,sha256=uHCI2WYoOI3cNwdIUEuZdX4VYSu14pzm348ksn6hn_c,8195
@@ -13,7 +13,7 @@ trodo/auto/auto_event_manager.py,sha256=cztuRsRkNoJE5R4NfSfTrTJTGl4jx2Yb-Ncy0aVA
 trodo/delivery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/delivery/sender.py,sha256=urO7m6mRMnSEW7_cNAmJ4A6jtDNxuihZHOxCx1jQScI,21348
 trodo/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trodo/managers/dataset_manager.py,sha256=kR3aoyuq1gcZ5Gpr6bf2Mz_cqv275dXlO6cGL5qfwEA,4902
+trodo/managers/dataset_manager.py,sha256=mifHYkHLWo0olXCNfQOqvpLPL8DDgbub7YAWWlrjIHQ,5609
 trodo/managers/experiment_manager.py,sha256=V-vemLtenfSI5VIcP0HPiXzEy8AyTrRrbJVCA9Z6wjo,10579
 trodo/managers/group_manager.py,sha256=ki3Se3qEoSZfREX63oeDeBmEfZF-ISHLE8azEtLg0tM,3542
 trodo/managers/people_manager.py,sha256=mMVnx40Mlifx6NGgChvohC9ViK6dQu2mkXNHbV8pK1E,2882
@@ -23,7 +23,7 @@ trodo/otel/__init__.py,sha256=yiRFXWUU45bAM2CV37XeO7zf1hmnmjufdP4XO50yEyE,624
 trodo/otel/auto_instrument.py,sha256=M5YVpFoPqn9bQohDFM7yyADrVGJPqFBToJLnBO7nOSA,29029
 trodo/otel/context.py,sha256=Jd0aTc0Q-1dM5kXXinhZD8YtnpdKgvneNiODyboVGKY,1418
 trodo/otel/helpers.py,sha256=XOMWcgZHaq5SQbkFxDaXPE4CDFjn01xjJmJ1vIxvwpw,20730
-trodo/otel/processor.py,sha256=WgtLdXT9gpR4TZ_9iuoX-kBP4UN4nelCtoDnogtW_Qc,8289
+trodo/otel/processor.py,sha256=GiMQR3uKHq_sbqXU00MdyarStaBzrZLmPgU1YnlzZb4,8965
 trodo/otel/prompt_trace.py,sha256=-kywRBU0Q2gWntS9HU-P5i7Kc5U-IJU7UVLjkdC2jw4,13593
 trodo/otel/register.py,sha256=7X3AfFQ5YvHGOUmdq8J38LQGvOJFPD907yT3uAp90lI,9607
 trodo/otel/transport.py,sha256=hzZz8gwSMGJ8CxdijmLn1Ljt18owr9XTWy13DLbwYbw,2441
@@ -40,7 +40,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.26.0.dist-info/METADATA,sha256=RE-9yCbqYEzBYYWCQuyXOGsyhGTSPw6rLpiv9cfEdF4,25308
-trodo_python-2.26.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-trodo_python-2.26.0.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.26.0.dist-info/RECORD,,
+trodo_python-2.26.2.dist-info/METADATA,sha256=-GYtkkYP3I9IlFhwYAqfq5rinYCAB0h12KcfErRwmoE,25308
+trodo_python-2.26.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+trodo_python-2.26.2.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.26.2.dist-info/RECORD,,