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

trodo/otel/processor.py

@@ -9,7 +9,7 @@ from __future__ import annotations
 
 import threading
 from dataclasses import dataclass, asdict
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 
 @dataclass
@@ -20,8 +20,8 @@ class TrodoRun:
     conversation_id: Optional[str] = None
     parent_run_id: Optional[str] = None
     status: str = "ok"  # 'running' | 'ok' | 'error'
-    input: Optional[str] = None
-    output: Optional[str] = None
+    input: Optional[Union[str, Dict[str, Any]]] = None
+    output: Optional[Union[str, Dict[str, Any]]] = None
     started_at: Optional[str] = None
     ended_at: Optional[str] = None
     duration_ms: Optional[int] = None
@@ -50,8 +50,8 @@ class TrodoSpan:
     started_at: Optional[str] = None
     ended_at: Optional[str] = None
     duration_ms: Optional[int] = None
-    input: Optional[str] = None
-    output: Optional[str] = None
+    input: Optional[Union[str, Dict[str, Any]]] = None
+    output: Optional[Union[str, Dict[str, Any]]] = None
     error_type: Optional[str] = None
     error_message: Optional[str] = None
     model: Optional[str] = None

trodo/otel/wrap_agent.py

@@ -28,7 +28,7 @@ import json
 import time
 import uuid
 from datetime import datetime, timezone
-from typing import Any, Callable, Dict, Optional
+from typing import Any, Callable, Dict, Optional, Union
 
 from .context import ActiveSpanContext, get_active_context, run_with_context
 from .processor import TrodoSpanProcessor, TrodoRun, TrodoSpan
@@ -62,7 +62,11 @@ def _now_iso() -> str:
     return datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
 
 
-def _truncate(value: Any, max_len: int = 64_000) -> Optional[str]:
+_MAX_VALUE_LEN = 1_000_000  # 1 MB
+
+
+def _truncate(value: Any, max_len: int = _MAX_VALUE_LEN) -> Optional[str]:
+    """Coerce to string and truncate. Use for string-only contexts (OTel attrs, error summaries)."""
     if value is None:
         return None
     if isinstance(value, str):
@@ -75,6 +79,26 @@ def _truncate(value: Any, max_len: int = 64_000) -> Optional[str]:
     return s[:max_len] if len(s) > max_len else s
 
 
+def _prepare_value(value: Any, max_len: int = _MAX_VALUE_LEN) -> Optional[Union[str, Dict[str, Any]]]:
+    """Prepare a value for storage in the JSONB input/output column.
+
+    Dicts/lists pass through as-is (stored as JSONB objects/arrays).
+    Strings are truncated at max_len.
+    Everything else is JSON-serialised then truncated.
+    """
+    if value is None:
+        return None
+    if isinstance(value, dict):
+        return value
+    if isinstance(value, str):
+        return value[:max_len] if len(value) > max_len else value
+    try:
+        s = json.dumps(value, default=str)
+    except Exception:
+        s = str(value)
+    return s[:max_len] if len(s) > max_len else s
+
+
 def current_run_id() -> Optional[str]:
     """Return the run_id of the currently active agent run, if any."""
     ctx = get_active_context()
@@ -145,15 +169,15 @@ class RunHandle:
         # 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.input: Optional[Union[str, Dict[str, Any]]] = None
+        self.output: Optional[Union[str, Dict[str, Any]]] = None
         self.metadata: Dict[str, Any] = {}
 
     def set_input(self, value: Any) -> None:
-        self.input = _truncate(value)
+        self.input = _prepare_value(value)
 
     def set_output(self, value: Any) -> None:
-        self.output = _truncate(value)
+        self.output = _prepare_value(value)
 
     def set_metadata(self, **kwargs: Any) -> None:
         self.metadata.update(kwargs)
@@ -165,8 +189,8 @@ class SpanHandle:
     def __init__(self, span_id: str, name: str) -> None:
         self.span_id = span_id
         self.name = name
-        self.input: Optional[str] = None
-        self.output: Optional[str] = None
+        self.input: Optional[Union[str, Dict[str, Any]]] = None
+        self.output: Optional[Union[str, Dict[str, Any]]] = None
         self.attributes: Dict[str, Any] = {}
         self.model: Optional[str] = None
         self.provider: Optional[str] = None
@@ -177,10 +201,10 @@ class SpanHandle:
         self.tool_name: Optional[str] = None
 
     def set_input(self, value: Any) -> None:
-        self.input = _truncate(value)
+        self.input = _prepare_value(value)
 
     def set_output(self, value: Any) -> None:
-        self.output = _truncate(value)
+        self.output = _prepare_value(value)
 
     def set_attribute(self, key: str, value: Any) -> None:
         self.attributes[key] = value
@@ -247,7 +271,7 @@ def start_run(
         conversation_id=conversation_id,
         parent_run_id=parent_run_id,
         status="running",
-        input=_truncate(input),
+        input=_prepare_value(input),
         started_at=_now_iso(),
         metadata=metadata,
     )
@@ -279,7 +303,7 @@ def end_run(
         **agg,
     }
     if output is not None:
-        payload["output"] = _truncate(output)
+        payload["output"] = _prepare_value(output)
     if error_summary is not None:
         payload["error_summary"] = _truncate(error_summary, 4_000)
     if metadata is not None:
@@ -493,7 +517,7 @@ class join_run:
         self._parent_span_id = parent_span_id
         self._name = name
         self._kind = kind
-        self._input = _truncate(input) if input is not None else None
+        self._input = _prepare_value(input) if input is not None else None
         self._attributes = attributes
         self._ctx_mgr: Optional[run_with_context] = None
         self._started_ms: float = 0.0
@@ -580,7 +604,7 @@ class span:
     ) -> None:
         self._name = name
         self._kind = kind
-        self._input = _truncate(input) if input is not None else None
+        self._input = _prepare_value(input) if input is not None else None
         self._attributes = attributes
         self._ctx_mgr: Optional[run_with_context] = None
         self._started_ms: float = 0.0

trodo/session/server_session.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import time
-import uuid
 from datetime import datetime, timezone
 from typing import Any, Dict, Optional
 
@@ -14,13 +13,24 @@ def now_iso() -> str:
     return datetime.now(timezone.utc).isoformat()
 
 
+def server_session_id(distinct_id: str) -> str:
+    """Deterministic, "backend consistent" session id for a backend user.
+
+    Backend SDKs are stateless: the same distinct_id must resolve to the SAME
+    session across processes and restarts. Using ``server:{distinct_id}`` instead
+    of a per-process ``uuid4()`` produces exactly one session row per backend
+    user (no per-process bloat) and is idempotent server-side.
+    """
+    return f"server:{distinct_id}"
+
+
 def create_server_session(
     site_id: str,
     distinct_id: str,
     session_id: Optional[str] = None,
 ) -> ServerSession:
     return ServerSession(
-        session_id=session_id or str(uuid.uuid4()),
+        session_id=session_id or server_session_id(distinct_id),
         site_id=site_id,
         distinct_id=distinct_id,
         start_time=now_iso(),
@@ -30,6 +40,15 @@ def create_server_session(
 
 
 def build_session_payload(session: ServerSession) -> Dict[str, Any]:
+    """Minimal server-session payload.
+
+    Backend SDKs cannot know browser-only signals (geo, device, browser, UTM,
+    referrer, wallet), so those fields are OMITTED rather than sent as ~30
+    explicit nulls — ingestion defaults missing fields to null. This saves
+    ingestion bandwidth and is more accurate. Only the markers ingestion keys
+    on are retained: ``is_server_session`` (drives identity-level browser-field
+    guards) and ``device_type='server'`` (server-origin fallback detector).
+    """
     return {
         "session_id": session.session_id,
         "site_id": session.site_id,
@@ -37,39 +56,9 @@ def build_session_payload(session: ServerSession) -> Dict[str, Any]:
         "distinct_id": session.distinct_id,
         "team_id": None,
         "start_time": session.start_time,
-        "end_time": None,
         "last_activity": int(session.last_activity * 1000),
-        "duration": 0,
-        "pages_viewed": 0,
         "is_bounce": False,
-        "previous_session_id": None,
-        "time_since_last_session": None,
-        "entry_page": None,
-        "exit_page": None,
         "referrer": "server",
-        "ip_address": None,
-        "city": None,
-        "region": None,
-        "country": None,
-        "browser_name": None,
-        "browser_version": None,
         "device_type": "server",
-        "os": None,
-        "resolution": None,
-        "user_agent": None,
-        "language": None,
-        "wallet_address": None,
-        "wallet_type": None,
-        "chain_name": None,
-        "is_web3_user": False,
-        "wallet_connected": False,
-        "utm_source": None,
-        "utm_medium": None,
-        "utm_campaign": None,
-        "utm_term": None,
-        "utm_content": None,
-        "utm_id": None,
-        "visited_pages": [],
-        "active_time_ms": 0,
         "is_server_session": True,
     }

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

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

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

@@ -1,4 +1,4 @@
-trodo/__init__.py,sha256=bO9bAzJhM6-QGDSIIxyiy0UxjYUcQsrhxhb6r6Rvu-8,16678
+trodo/__init__.py,sha256=NapUF153zVbbqH45gud9g9M_UyQgxuqw_yAYERTGJlw,16678
 trodo/client.py,sha256=8DsKoLh_eaNxj93qkHynfeee-QsdomB_kXfUQjGnWDk,18607
 trodo/types.py,sha256=eySgUvCXROG2TxtxgiU0MNr5iH0DEcduK8bmYtTKG44,3138
 trodo/user_context.py,sha256=9la6azzwEanVmdP4ps_xMoufbeWVeIGU-M8ychmgajg,7859
@@ -15,17 +15,17 @@ trodo/otel/__init__.py,sha256=yiRFXWUU45bAM2CV37XeO7zf1hmnmjufdP4XO50yEyE,624
 trodo/otel/auto_instrument.py,sha256=7uKhir0o0Mo_od1H2oMf5PHZovcUocHtgV18mRm2Erc,11193
 trodo/otel/context.py,sha256=iJ1rE42-SbO8VZHAxhIl2ZJXgNwLIVps5xLg8GKgfFc,1165
 trodo/otel/helpers.py,sha256=IEAHxAEN-Bvv_ZODrmRzC6PCGGhGTXU7IPcp6iO2nbA,16405
-trodo/otel/processor.py,sha256=jVZkslZlw50G5uRAa7-GMRgn_yvae58EmlWTZL8tMkQ,6285
+trodo/otel/processor.py,sha256=9y5gUMg7iQ1anXf2vGLbmgdT8iRXUGu7QivAqxg4JS4,6384
 trodo/otel/register.py,sha256=YV2EnkUoa-_54YAuChOe-Mg28UUKg8JO7-qhVP9G6u4,7644
 trodo/otel/transport.py,sha256=hzZz8gwSMGJ8CxdijmLn1Ljt18owr9XTWy13DLbwYbw,2441
-trodo/otel/wrap_agent.py,sha256=mXEQqqNSiHJY3M0T0QPRkozOONB0dbLBcX5WYT0ddXI,24560
+trodo/otel/wrap_agent.py,sha256=T5pbD2iGE2B7oilKszPsFTRyRtEvdXe2cz20xpg20ik,25529
 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/server_session.py,sha256=McsudEiq33XDq3nqxgzBcUvIjQxCMscwEuAPnYXrTjs,2136
 trodo/session/session_manager.py,sha256=JrgH1VeicmtlxPR4dXEuJbxhi23OelkgwW3-9Slv80o,2525
-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,,
+trodo_python-2.7.0.dist-info/METADATA,sha256=K19DXcIe8jCHbOCEWXkyy0mxGhjCz_fH_VIdm0vuM9E,17882
+trodo_python-2.7.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+trodo_python-2.7.0.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.7.0.dist-info/RECORD,,