trodo-python 2.4.1__py3-none-any.whl → 2.5.0__py3-none-any.whl

trodo/otel/wrap_agent.py

@@ -114,12 +114,37 @@ def _aggregate(spans: list[TrodoSpan]) -> Dict[str, Any]:
     }
 
 
+def _mint_anon_distinct_id() -> str:
+    """Mint a server-side anonymous distinct_id for an agent run.
+
+    Mirrors UserIdentity.generateAnonymousDistinctId on the backend
+    (``anon_<ts>_<scope>_<uuid>_<rand>``) so server-SDK anon runs and
+    browser-SDK anon sessions share one prefix the dashboard already
+    filters on.
+
+    Minted client-side (not just server-side) so:
+      * the RunHandle / OTLP span attribute carries the id immediately and
+        downstream ``trodo.feedback(distinct_id=...)`` calls have something
+        to bind to,
+      * users running against an older backend still get a real attributable
+        distinct_id on every ``agent_runs`` row, instead of NULL.
+    """
+    import random
+    import string
+    ts = int(time.time() * 1000)
+    rand = "".join(random.choices(string.ascii_lowercase + string.digits, k=16))
+    return f"anon_{ts}_python_{uuid.uuid4()}_{rand}"
+
+
 class RunHandle:
     """Handle returned by wrap_agent for setting input/output and getting run_id."""
 
-    def __init__(self, run_id: str, agent_name: str) -> None:
+    def __init__(self, run_id: str, agent_name: str, distinct_id: str) -> None:
         self.run_id = run_id
         self.agent_name = agent_name
+        # Always populated — wrap_agent mints anon if caller didn't pass one
+        # so downstream ``trodo.feedback(distinct_id=...)`` always has a target.
+        self.distinct_id = distinct_id
         self.input: Optional[str] = None
         self.output: Optional[str] = None
         self.metadata: Dict[str, Any] = {}
@@ -209,10 +234,16 @@ def start_run(
     to add spans — they flush incrementally via ``append_spans``.
     """
     rid = run_id or str(uuid.uuid4())
+    # Mint anon when missing so the run row is attributable. The minted id
+    # is stamped onto the TrodoRun payload but is not surfaced to the caller —
+    # start_run's signature returns just run_id for backward compat. Callers
+    # who need the distinct_id should pass their own (or use wrap_agent,
+    # whose RunHandle exposes it via handle.distinct_id).
+    effective_distinct_id = distinct_id or _mint_anon_distinct_id()
     run = TrodoRun(
         run_id=rid,
         agent_name=agent_name,
-        distinct_id=distinct_id,
+        distinct_id=effective_distinct_id,
         conversation_id=conversation_id,
         parent_run_id=parent_run_id,
         status="running",
@@ -278,7 +309,11 @@ class wrap_agent:
         self._processor = processor
         self._team_site_id = team_site_id
         self._agent_name = agent_name
-        self._distinct_id = distinct_id
+        # Mint anon when caller didn't pass one. From this point on every
+        # internal path uses self._distinct_id, never the raw constructor
+        # argument, so the run row, OTLP span attribute, and RunHandle all
+        # agree on a single non-null value.
+        self._distinct_id = distinct_id or _mint_anon_distinct_id()
         self._conversation_id = conversation_id
         self._parent_run_id = parent_run_id
         self._metadata = metadata
@@ -312,7 +347,7 @@ class wrap_agent:
         self._started_iso = _now_iso()
         self._started_ms = time.time() * 1000.0
 
-        self.handle = RunHandle(run_id, self._agent_name)
+        self.handle = RunHandle(run_id, self._agent_name, self._distinct_id)
         ctx = ActiveSpanContext(
             run_id=run_id,
             span_id=root_span_id,
@@ -387,8 +422,9 @@ class wrap_agent:
         run_id = _hex_to_uuid(trace_id_hex)
 
         otel_span.set_attribute("trodo.agent_name", self._agent_name)
-        if self._distinct_id:
-            otel_span.set_attribute("trodo.distinct_id", str(self._distinct_id))
+        # self._distinct_id is always set (anon-minted in __init__ when caller
+        # didn't pass one), so the attribute always lands on the OTLP span.
+        otel_span.set_attribute("trodo.distinct_id", str(self._distinct_id))
         if self._conversation_id:
             otel_span.set_attribute("trodo.conversation_id", str(self._conversation_id))
         if self._parent_run_id:
@@ -398,7 +434,7 @@ class wrap_agent:
                 otel_span.set_attribute(f"trodo.metadata.{k}", _serialize_attr(v))
 
         self._otel_span = otel_span
-        self.handle = RunHandle(run_id, self._agent_name)
+        self.handle = RunHandle(run_id, self._agent_name, self._distinct_id)
         return self.handle
 
     def _exit_otel(self, exc_type, exc, tb) -> None:

{trodo_python-2.4.1.dist-info → trodo_python-2.5.0.dist-info}/METADATA

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

{trodo_python-2.4.1.dist-info → trodo_python-2.5.0.dist-info}/RECORD

@@ -18,14 +18,14 @@ trodo/otel/helpers.py,sha256=IEAHxAEN-Bvv_ZODrmRzC6PCGGhGTXU7IPcp6iO2nbA,16405
 trodo/otel/processor.py,sha256=jVZkslZlw50G5uRAa7-GMRgn_yvae58EmlWTZL8tMkQ,6285
 trodo/otel/register.py,sha256=YV2EnkUoa-_54YAuChOe-Mg28UUKg8JO7-qhVP9G6u4,7644
 trodo/otel/transport.py,sha256=hzZz8gwSMGJ8CxdijmLn1Ljt18owr9XTWy13DLbwYbw,2441
-trodo/otel/wrap_agent.py,sha256=J_ho4O8oOa5ECX4Cft0mJ9e5pzAe3sWOla5awikOVK8,22542
+trodo/otel/wrap_agent.py,sha256=mXEQqqNSiHJY3M0T0QPRkozOONB0dbLBcX5WYT0ddXI,24560
 trodo/queue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/queue/batch_flusher.py,sha256=4Lg6T3Urwi9U0Q4FpFGPmjDYKg4ZliCTR-ND8BJvWaY,1298
 trodo/queue/event_queue.py,sha256=EVFZrhlq_kwC3jJ2GK0wMhHISf9UzLCZNDnT_aZ2I2A,872
 trodo/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/session/server_session.py,sha256=4bQZc_Zxktmu8RVoyh0qI7tvr8AKsHI5xkGf3jEpWVE,2005
 trodo/session/session_manager.py,sha256=JrgH1VeicmtlxPR4dXEuJbxhi23OelkgwW3-9Slv80o,2525
-trodo_python-2.4.1.dist-info/METADATA,sha256=_V5plcgVHmz0vb9S9fQXgivuVvmsYs2Aict8OViy5FU,17882
-trodo_python-2.4.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-trodo_python-2.4.1.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.4.1.dist-info/RECORD,,
+trodo_python-2.5.0.dist-info/METADATA,sha256=JOZlK8iGa5MyS9B8sVklhM2mVwvI9bKu5UUTFg5c8eI,17882
+trodo_python-2.5.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+trodo_python-2.5.0.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.5.0.dist-info/RECORD,,