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

trodo/api/_retry.py

@@ -0,0 +1,30 @@
+"""When to retry a request, and after how long. Mirrors the Node SDK."""
+import random
+from typing import Optional
+
+
+def retry_delay(status: int, retry_after: Optional[str], attempt: int) -> Optional[float]:
+    """Seconds to wait before retrying, or None when not to retry.
+
+    Retries a 5xx, and a 429 that says when (Retry-After): a rate limit is
+    temporary, an exhausted allowance (429 without Retry-After) is not. A
+    server that says Retry-After is honoured (capped at 30 s). Otherwise
+    exponential backoff with jitter, so a burst of clients hit by the same
+    outage does not retry in lockstep and knock it over again.
+    """
+    retryable = status >= 500 or (status == 429 and retry_after is not None)
+    if not retryable:
+        return None
+    try:
+        seconds = float(retry_after) if retry_after is not None else None
+    except ValueError:
+        seconds = None
+    if seconds is not None and seconds >= 0:
+        return min(seconds, 30.0) + random.random()
+    return jittered_backoff(attempt)
+
+
+def jittered_backoff(attempt: int) -> float:
+    """2**attempt seconds, somewhere in its upper half."""
+    base = float(2 ** attempt)
+    return base / 2 + random.random() * (base / 2)

trodo/api/async_client.py

@@ -7,6 +7,7 @@ import asyncio
 from typing import Any, Callable, Dict, Optional
 
 from ..types import ApiResult, EventPayload
+from ._retry import jittered_backoff, retry_delay
 
 
 class AsyncHttpClient:
@@ -51,9 +52,12 @@ class AsyncHttpClient:
         try:
             async with httpx.AsyncClient(timeout=self.timeout) as client:
                 resp = await client.post(url, json=body, headers=headers)
-            if resp.status_code >= 500 and attempt < self.retries:
-                delay = 2 ** attempt
-                self._log(f"Retry {attempt + 1} after {delay}s")
+            delay = (
+                retry_delay(resp.status_code, resp.headers.get('retry-after'), attempt)
+                if attempt < self.retries else None
+            )
+            if delay is not None:
+                self._log(f"Retry {attempt + 1} after {delay:.1f}s (status {resp.status_code})")
                 await asyncio.sleep(delay)
                 return await self._request(path, body, attempt + 1)
             try:
@@ -62,7 +66,7 @@ class AsyncHttpClient:
                 return {}
         except Exception as exc:
             if attempt < self.retries:
-                await asyncio.sleep(2 ** attempt)
+                await asyncio.sleep(jittered_backoff(attempt))
                 return await self._request(path, body, attempt + 1)
             self._log(f"Error: {exc}")
             if self.on_error:

trodo/api/http_client.py

@@ -10,6 +10,7 @@ import requests
 
 from ..types import ApiResult, EventPayload
 from . import endpoints
+from ._retry import jittered_backoff, retry_delay
 
 
 class HttpClient:
@@ -43,9 +44,12 @@ class HttpClient:
         self._log(f"POST {url}")
         try:
             resp = self._session.post(url, json=body, timeout=self.timeout)
-            if resp.status_code >= 500 and attempt < self.retries:
-                delay = 2 ** attempt
-                self._log(f"Retry {attempt + 1} after {delay}s (status {resp.status_code})")
+            delay = (
+                retry_delay(resp.status_code, resp.headers.get('retry-after'), attempt)
+                if attempt < self.retries else None
+            )
+            if delay is not None:
+                self._log(f"Retry {attempt + 1} after {delay:.1f}s (status {resp.status_code})")
                 time.sleep(delay)
                 return self._request(path, body, attempt + 1)
             if resp.status_code >= 400:
@@ -72,8 +76,8 @@ class HttpClient:
                 return {}
         except Exception as exc:
             if attempt < self.retries:
-                delay = 2 ** attempt
-                self._log(f"Retry {attempt + 1} after {delay}s (network error)")
+                delay = jittered_backoff(attempt)
+                self._log(f"Retry {attempt + 1} after {delay:.1f}s (network error)")
                 time.sleep(delay)
                 return self._request(path, body, attempt + 1)
             self._log(f"Error: {exc}")
@@ -91,9 +95,12 @@ class HttpClient:
         self._log(f"GET {url}")
         try:
             resp = self._session.get(url, params=params or {}, timeout=self.timeout)
-            if resp.status_code >= 500 and attempt < self.retries:
-                delay = 2 ** attempt
-                self._log(f"Retry {attempt + 1} after {delay}s (status {resp.status_code})")
+            delay = (
+                retry_delay(resp.status_code, resp.headers.get('retry-after'), attempt)
+                if attempt < self.retries else None
+            )
+            if delay is not None:
+                self._log(f"Retry {attempt + 1} after {delay:.1f}s (status {resp.status_code})")
                 time.sleep(delay)
                 return self._get(path, params, attempt + 1)
             try:
@@ -108,8 +115,8 @@ class HttpClient:
             return data
         except Exception as exc:
             if attempt < self.retries:
-                delay = 2 ** attempt
-                self._log(f"Retry {attempt + 1} after {delay}s (network error)")
+                delay = jittered_backoff(attempt)
+                self._log(f"Retry {attempt + 1} after {delay:.1f}s (network error)")
                 time.sleep(delay)
                 return self._get(path, params, attempt + 1)
             self._log(f"Error: {exc}")

trodo/otel/auto_instrument.py

@@ -554,6 +554,33 @@ def _register_instrumentors() -> None:
     ]
 
 
+# Framework instrumentors that call a provider client we ALSO instrument.
+#
+# langchain-openai depends on the `openai` package, langchain-anthropic on
+# `anthropic` -- so one chain invocation is also a genuine provider client call.
+# With both instrumentors registered that single call emits TWO sibling llm
+# spans carrying the same tokens, and the run's totals come out doubled.
+# Measured on the Node side against real traffic: a 45/2 call reported 90/4.
+#
+# The provider span is the better of the two: it carries the real model id, so
+# it can be priced, while the framework's reported model=unknown and could not
+# be. So the framework instrumentor defers.
+#
+# Only providers registered BEFORE the framework in _INSTRUMENTORS may appear
+# here -- the check reads `active`, which is built in registration order. That
+# order is anthropic, openai, openai_v2, langchain, ... so those are covered;
+# listing bedrock or cohere would read correctly and never fire.
+_ROUTES_THROUGH: dict[str, tuple[str, ...]] = {
+    "langchain": ("openai", "openai_v2", "anthropic"),
+    "llama_index": ("openai", "openai_v2", "anthropic"),
+}
+
+
+def _superseding_providers(name: str, active: List[str]) -> List[str]:
+    """Provider instrumentors already active that `name` would double-count."""
+    return [p for p in _ROUTES_THROUGH.get(name, ()) if p in active]
+
+
 def enable_auto_instrument(
     processor: TrodoSpanProcessor,
     disable: Optional[Iterable[str]] = None,
@@ -590,6 +617,24 @@ def enable_auto_instrument(
     for name, register in _INSTRUMENTORS:
         if name in disabled:
             continue
+        # BEFORE registering: a framework instrumentor whose model calls are
+        # already captured by an active provider instrumentor would double every
+        # token. Checked here rather than after, because instrumentors patch on
+        # instrument() and undoing it afterwards is too late.
+        superseded = _superseding_providers(name, active)
+        if superseded:
+            _warn_once(
+                f"superseded-{name}",
+                f"auto-instrument: '{name}' was NOT loaded because "
+                f"{', '.join(superseded)} instrumentation is already active and "
+                f"{name} calls those clients directly -- running both makes one "
+                f"model call emit two llm spans and doubles its tokens and cost. "
+                f"Your {name} calls are still captured, by the provider "
+                f"instrumentation, which also records the real model id so the "
+                f"span can be priced. To choose the other way round, pass "
+                f"disable=['{superseded[0]}'].",
+            )
+            continue
         try:
             register()
             active.append(name)

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

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

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

@@ -1,11 +1,12 @@
-trodo/__init__.py,sha256=yv0gxvU4OpZhqck-U2YY0RZE7qRWDhD4ig4zenbMPI0,26928
+trodo/__init__.py,sha256=SbEfXeTk-1B_rMcbO2kCU66Ock4p7pmiEBLQGttMaP4,26928
 trodo/client.py,sha256=9UYaHZtWPMYdlG2xWVf77PQJ9DfFgN-zobTh60i8_Cc,22453
 trodo/types.py,sha256=eySgUvCXROG2TxtxgiU0MNr5iH0DEcduK8bmYtTKG44,3138
 trodo/user_context.py,sha256=uHCI2WYoOI3cNwdIUEuZdX4VYSu14pzm348ksn6hn_c,8195
 trodo/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trodo/api/async_client.py,sha256=rZN4aJ2QiKyrHBK260bApCUB9JaMWU6BQtzoSJZh7xk,3408
+trodo/api/_retry.py,sha256=mHhuzfe3QuYa6j9BqRYVClvnYH0o3WkXXngmSwqWfgY,1214
+trodo/api/async_client.py,sha256=qF97NbvoYbNhem8uXtPh14EG4JVAhEAzUCYn7busaaA,3609
 trodo/api/endpoints.py,sha256=H0Da456mf2IUNZH5bsln69IIUoUhdF4bncPo-WDLZ9I,1433
-trodo/api/http_client.py,sha256=RRsXVDqTp3H8OrOqM-7tsE3_WKHYCuRkf9icvyowVQE,9577
+trodo/api/http_client.py,sha256=wzvxUpY2bR8BvebqbmqeHizVBmw41TmY3WQWVeAzABg,9881
 trodo/auto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/auto/auto_event_manager.py,sha256=cztuRsRkNoJE5R4NfSfTrTJTGl4jx2Yb-Ncy0aVAPo8,4247
 trodo/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,7 +17,7 @@ trodo/managers/people_manager.py,sha256=mMVnx40Mlifx6NGgChvohC9ViK6dQu2mkXNHbV8p
 trodo/managers/prompt_manager.py,sha256=qFVHgh7PW-SlgHp62ybirdYsJBg-fcQVMTTU3jPqFvo,13435
 trodo/managers/user_manager.py,sha256=faJYX3CHrD7ulYiShV7FhThSMX9aJ3kdOgU4Qtdy5FM,2844
 trodo/otel/__init__.py,sha256=yiRFXWUU45bAM2CV37XeO7zf1hmnmjufdP4XO50yEyE,624
-trodo/otel/auto_instrument.py,sha256=dA7IZ9cTSNTFK-oVwkYL2OwfTH3wDKM4iKXtPvZoK-Y,23800
+trodo/otel/auto_instrument.py,sha256=I_F3NCvc0JML2UpX9PaxFM3OGzMSuEYYfxZYTwkQDuo,26224
 trodo/otel/context.py,sha256=Jd0aTc0Q-1dM5kXXinhZD8YtnpdKgvneNiODyboVGKY,1418
 trodo/otel/helpers.py,sha256=XOMWcgZHaq5SQbkFxDaXPE4CDFjn01xjJmJ1vIxvwpw,20730
 trodo/otel/processor.py,sha256=LKlXxP3BeQ7DP8SzYAgXZZOeJ6-6b7e43i19gCUC_0Y,7939
@@ -36,7 +37,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.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,,
+trodo_python-2.23.4.dist-info/METADATA,sha256=VQP23ftatdvKhd55L_qv-XX60zq7OuTjVKI0c6Kw9dI,25308
+trodo_python-2.23.4.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+trodo_python-2.23.4.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.23.4.dist-info/RECORD,,