trodo-python 2.23.3__tar.gz → 2.23.4__tar.gz

{trodo_python-2.23.3 → trodo_python-2.23.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trodo-python
-Version: 2.23.3
+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.3 → trodo_python-2.23.4}/pyproject.toml

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trodo-python
-Version: 2.23.3
+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.3 → trodo_python-2.23.4}/trodo_python.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ trodo/client.py
 trodo/types.py
 trodo/user_context.py
 trodo/api/__init__.py
+trodo/api/_retry.py
 trodo/api/async_client.py
 trodo/api/endpoints.py
 trodo/api/http_client.py