trodo-python 2.26.0__tar.gz → 2.26.2__tar.gz

{trodo_python-2.26.0 → trodo_python-2.26.2}/PKG-INFO

@@ -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 → trodo_python-2.26.2}/pyproject.toml

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

{trodo_python-2.26.0 → trodo_python-2.26.2}/tests/test_datasets.py

@@ -128,3 +128,19 @@ def test_export_requires_a_token_and_raises_on_http_errors():
         DatasetManager(FakeExportHttp({})).export("ds", "")
     with pytest.raises(RuntimeError, match="HTTP 404"):
         DatasetManager(FakeExportHttp({"__error": True, "status": 404, "error": "not_found"})).export("ds", "trodo_dx_abc")
+
+
+def test_append_accepts_unit_references_without_input():
+    http = FakeHttp()
+    DatasetManager(http).append("ds", [
+        {"span_id": "s1", "tags": ["hard"]},
+        {"run_id": "r1"},
+        {"conversation_id": "c1", "metadata": {"k": 1}},
+        {"eval_run_id": "v1"},
+    ])
+    assert http.last_body["items"] == [
+        {"span_id": "s1", "tags": ["hard"]},
+        {"run_id": "r1"},
+        {"conversation_id": "c1", "metadata": {"k": 1}},
+        {"eval_run_id": "v1"},
+    ]

trodo_python-2.26.2/tests/test_end_run_order.py

@@ -0,0 +1,50 @@
+"""end_run sends the run's queued spans before the end itself."""
+from __future__ import annotations
+
+from typing import Any, Dict, List, Optional
+
+from trodo.otel.processor import TrodoSpanProcessor, TrodoSpan
+
+
+class _Http:
+    def __init__(self, order: List[str]) -> None:
+        self.order = order
+
+    def post_run_end(self, run_id: str, payload: Dict[str, Any]) -> None:
+        self.order.append("end")
+
+
+class _Sender:
+    def __init__(self, order: List[str]) -> None:
+        self.order = order
+        self.queued: List[Any] = []
+
+    def enqueue(self, item: Any) -> None:
+        self.queued.append(item)
+
+    def flush(self, timeout_s: Optional[float] = None) -> None:
+        self.order.append(f"flush:{len(self.queued)}")
+        self.queued.clear()
+
+
+def _span(run_id: str, span_id: str) -> TrodoSpan:
+    return TrodoSpan(span_id=span_id, run_id=run_id, parent_span_id=None, kind="tool", name=span_id, status="ok", started_at="t")
+
+
+def test_joined_spans_are_sent_before_the_end():
+    order: List[str] = []
+    proc = TrodoSpanProcessor(http_client=_Http(order), sender=_Sender(order))
+    proc.mark_joined("r1")
+    proc.enqueue_span(_span("r1", "s1"))
+    proc.enqueue_span(_span("r1", "s2"))
+    proc.end_run("r1", {"status": "ok"})
+    assert order == ["flush:2", "end"]
+
+
+def test_buffered_spans_of_an_unjoined_run_are_not_lost():
+    order: List[str] = []
+    sender = _Sender(order)
+    proc = TrodoSpanProcessor(http_client=_Http(order), sender=sender)
+    proc.enqueue_span(_span("r2", "s1"))
+    proc.end_run("r2", {"status": "ok"})
+    assert order == ["flush:1", "end"]

{trodo_python-2.26.0 → trodo_python-2.26.2}/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_python-2.26.2/trodo/_version.py

@@ -0,0 +1 @@
+SDK_VERSION = "2.26.2"

{trodo_python-2.26.0 → trodo_python-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_python-2.26.0 → trodo_python-2.26.2}/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 → trodo_python-2.26.2}/trodo_python.egg-info/PKG-INFO

@@ -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 → trodo_python-2.26.2}/trodo_python.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ tests/test_auto_instrument_fixes.py
 tests/test_cross_process_session.py
 tests/test_datasets.py
 tests/test_end_run.py
+tests/test_end_run_order.py
 tests/test_error_enrichment.py
 tests/test_experiments.py
 tests/test_framework_deference.py

trodo_python-2.26.0/trodo/_version.py

@@ -1 +0,0 @@
-SDK_VERSION = "2.26.0"