lixinger-python 0.3.12__py3-none-any.whl → 0.3.14__py3-none-any.whl

lixinger/api/base.py

@@ -1,9 +1,11 @@
+from datetime import UTC, datetime
+from email.utils import parsedate_to_datetime
 from typing import Any
 
 import httpx
 
 from lixinger.config import Config, settings
-from lixinger.exceptions import APIError, AuthenticationError, RateLimitError
+from lixinger.exceptions import APIError, AuthenticationError, RateLimitError, ValidationError
 from lixinger.utils.rate_limiter import AsyncRateLimiter
 from lixinger.utils.retry import async_retry_on_failure
 
@@ -13,6 +15,12 @@ _global_rate_limiter = AsyncRateLimiter(max_requests=1000)
 # Lazy initialization of global http client to avoid issues with proxy/config changes
 _global_http_client: httpx.AsyncClient | None = None
 
+# Fallback delay in seconds when a 429 response omits Retry-After. The Lixinger
+# rate-limit window is 60s, so short exponential backoff (1/2/4s) almost always
+# fires inside the same window and gets 429ed again. 15s gives the window room
+# to age and burns fewer retry attempts on doomed requests.
+DEFAULT_RATE_LIMIT_RETRY_AFTER = 15.0
+
 
 def get_global_client() -> httpx.AsyncClient:
     """Get or create the global HTTP client."""
@@ -29,6 +37,39 @@ def get_global_client() -> httpx.AsyncClient:
     return _global_http_client
 
 
+def _parse_retry_after(header_value: str | None) -> float | None:
+    """Parse a Retry-After header into seconds.
+
+    Accepts both formats defined by RFC 7231 §7.1.3:
+    - ``delta-seconds`` (e.g. ``"120"``)
+    - ``HTTP-date`` (e.g. ``"Wed, 21 Oct 2015 07:28:00 GMT"``)
+
+    Returns ``None`` when the header is missing or unparseable so the caller
+    can fall back to its default backoff.
+    """
+    if not header_value:
+        return None
+    value = header_value.strip()
+    # Try delta-seconds first — the common case.
+    try:
+        seconds = float(value)
+    except ValueError:
+        pass
+    else:
+        return seconds if seconds >= 0 else None
+    # Fall back to HTTP-date.
+    try:
+        target = parsedate_to_datetime(value)
+    except (TypeError, ValueError):
+        return None
+    if target.tzinfo is None:
+        # RFC 7231 HTTP-date is always GMT, so treat naive dates as UTC.
+        target = target.replace(tzinfo=UTC)
+    now = datetime.now(tz=target.tzinfo)
+    delta = (target - now).total_seconds()
+    return max(delta, 0.0)
+
+
 class BaseAPI:
     """Base class for API endpoint groups."""
 
@@ -42,7 +83,12 @@ class BaseAPI:
         self._config = config or settings
         self._rate_limiter = rate_limiter or _global_rate_limiter
 
-    @async_retry_on_failure(max_retries=3, backoff=1.0)
+    @async_retry_on_failure(
+        max_retries=3,
+        backoff=1.0,
+        # Do NOT retry non-transient errors even though they inherit from Exception.
+        no_retry_on=(AuthenticationError, ValidationError),
+    )
     async def _request(
         self,
         method: str,
@@ -72,7 +118,16 @@ class BaseAPI:
         )
 
         if response.status_code == 429:
-            raise RateLimitError("Rate limit exceeded", status_code=429)
+            retry_after = _parse_retry_after(response.headers.get("Retry-After"))
+            # Server didn't tell us how long to wait — pick a delay long enough
+            # for the 60s rate-limit window to actually age.
+            if retry_after is None:
+                retry_after = DEFAULT_RATE_LIMIT_RETRY_AFTER
+            raise RateLimitError(
+                "Rate limit exceeded",
+                status_code=429,
+                retry_after=retry_after,
+            )
         if response.status_code == 401:
             raise AuthenticationError("Authentication failed", status_code=401)
         if response.status_code != 200:
@@ -88,7 +143,15 @@ class BaseAPI:
         code = data.get("code")
         message = data.get("message")
 
-        if code != 1 or message != "success":
+        # code is the machine-readable success signal; message is human text.
+        # Lixinger returns code=1 for success even when there's no data
+        # (e.g. message="no data" on non-trading days or empty ranges) —
+        # treat any code=1 as success and normalize a missing/null payload
+        # to [] so downstream iteration and get_response_df both work.
+        if code != 1:
             raise APIError(f"API returned error code {code}: {message}")
 
-        return data.get("data")
+        payload = data.get("data")
+        if payload is None:
+            return []
+        return payload

lixinger/exceptions.py

@@ -11,7 +11,23 @@ class APIError(LixingerError):
 
 
 class RateLimitError(APIError):
-    """Rate limit exceeded (429)."""
+    """Rate limit exceeded (429).
+
+    Attributes:
+        retry_after: Optional server-provided delay in seconds parsed from the
+            ``Retry-After`` response header. ``None`` when the header was absent
+            or malformed. The retry decorator honors this value in place of the
+            default exponential backoff.
+    """
+
+    def __init__(
+        self,
+        message: str,
+        status_code: int | None = None,
+        retry_after: float | None = None,
+    ) -> None:
+        super().__init__(message, status_code=status_code)
+        self.retry_after = retry_after
 
 
 class AuthenticationError(APIError):

lixinger/utils/retry.py

@@ -1,6 +1,7 @@
 import asyncio
 from collections.abc import Awaitable, Callable
 from functools import wraps
+import random
 from typing import Any, TypeVar
 
 T = TypeVar("T")
@@ -10,8 +11,28 @@ def async_retry_on_failure(
     max_retries: int = 3,
     backoff: float = 1.0,
     retry_on: tuple[type[Exception], ...] = (Exception,),
+    no_retry_on: tuple[type[Exception], ...] = (),
+    jitter: float = 0.2,
 ) -> Callable[[Callable[..., Awaitable[T]]], Callable[..., Awaitable[T]]]:
-    """Retry failed async requests with exponential backoff."""
+    """Retry failed async requests with exponential backoff and jitter.
+
+    Args:
+        max_retries: Maximum number of retry attempts (total attempts = max_retries + 1).
+        backoff: Base delay in seconds for exponential backoff (2**attempt * backoff).
+        retry_on: Exception types that trigger a retry.
+        no_retry_on: Exception types that must NOT be retried even if matched by
+            ``retry_on``. Use this to short-circuit on non-transient errors such
+            as authentication failures.
+        jitter: Multiplicative jitter fraction applied to every sleep. The actual
+            sleep is drawn from ``uniform(base * (1 - jitter), base * (1 + jitter))``
+            where ``base`` is either the ``retry_after`` hint or the exponential
+            backoff. Pass ``0`` to disable (mostly useful in tests). Values are
+            clamped so the sleep never goes negative.
+
+    If the caught exception exposes a ``retry_after`` attribute (float seconds,
+    typically parsed from a ``Retry-After`` HTTP header on 429 responses), that
+    value is used for the next sleep instead of the exponential backoff.
+    """
 
     def decorator(func: Callable[..., Awaitable[T]]) -> Callable[..., Awaitable[T]]:
         @wraps(func)
@@ -20,9 +41,20 @@ def async_retry_on_failure(
                 try:
                     return await func(*args, **kwargs)
                 except retry_on as e:
+                    # Bail out immediately on non-transient errors.
+                    if no_retry_on and isinstance(e, no_retry_on):
+                        raise
                     if attempt == max_retries:
                         raise
-                    wait_time = backoff * (2**attempt)
+                    # Prefer server-provided retry hint when available.
+                    hint = getattr(e, "retry_after", None)
+                    base = float(hint) if isinstance(hint, int | float) and hint > 0 else backoff * (2**attempt)
+                    if jitter > 0:
+                        low = max(0.0, base * (1.0 - jitter))
+                        high = base * (1.0 + jitter)
+                        wait_time = random.uniform(low, high)  # noqa: S311 (non-crypto jitter)
+                    else:
+                        wait_time = base
                     await asyncio.sleep(wait_time)
             raise RuntimeError("Unreachable")
 

{lixinger_python-0.3.12.dist-info → lixinger_python-0.3.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lixinger-python
-Version: 0.3.12
+Version: 0.3.14
 Summary: Python SDK for Lixinger Financial Data API
 Project-URL: Homepage, https://www.lixinger.com
 Project-URL: Documentation, https://www.lixinger.com/open/api/doc

{lixinger_python-0.3.12.dist-info → lixinger_python-0.3.14.dist-info}/RECORD

@@ -1,10 +1,10 @@
 lixinger/__init__.py,sha256=VyNwJhDpm-NnDSskdx6bCHmG8iYcPSzX71HAJDtstxo,3290
 lixinger/client.py,sha256=EZ6hbSyWSAL_kODJVDd3j6hUCGr57GiCQSvdu1U6GzM,15457
 lixinger/config.py,sha256=JPz8EOrf1kP4Do-Z5-MsnOM0pMrNE1ZsP-Qoarh9y4c,2008
-lixinger/exceptions.py,sha256=haJOQzZinH0tKk_e2BTUzJfPbtnyLHyRR7HSnWHeKfk,516
+lixinger/exceptions.py,sha256=Gkv1z-LC09paYGVs430-gDgDs43dLyRHbglB3Frehd4,1069
 lixinger/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lixinger/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lixinger/api/base.py,sha256=j90uXrBEIHyPkTu-4hF1876HtsWIPM_J7tunFi-1O1Q,3182
+lixinger/api/base.py,sha256=6YQK-2oPFTPeLzw8WaaG-rajFL1Vv8dxrpS1jkxF2ew,5685
 lixinger/api/cn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lixinger/api/cn/company/__init__.py,sha256=K8aNp2gGj4iQOvc8KjXA5668QUAhwyTfMBPhP3tgtMg,961
 lixinger/api/cn/company/announcement.py,sha256=lYt4AWOV5b9OTKfvJ7ZOqWP61pcPcyIQzb5N2DqFT6k,1920
@@ -120,8 +120,8 @@ lixinger/utils/api.py,sha256=BktR40JtKCMe9excFWo4ujsq3GiQK4ypJLG3MpJgo2s,402
 lixinger/utils/dataframe.py,sha256=tYBrNdmJ4poyuwD-9XgzHt3A_A8bBo0cdHiu8Yy9e9A,2208
 lixinger/utils/dict.py,sha256=yvbUtv8QpRmy0d_o_7gCuEwwiEfBji5_xB490ANxilw,589
 lixinger/utils/rate_limiter.py,sha256=ZHlRTTL60L62uRA_f--LD26qkAfk-pHBllRqPapAXQM,1141
-lixinger/utils/retry.py,sha256=sXtb0ESp12_JedjzDxoeIH48TlOrbxtIA0j1V33DW7M,1026
-lixinger_python-0.3.12.dist-info/METADATA,sha256=qsxT6v3LsbjVsEa3OfQb0usA0dXDj3IU8VVnRUVDExg,9207
-lixinger_python-0.3.12.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-lixinger_python-0.3.12.dist-info/licenses/LICENSE,sha256=5oOwRq1lHSOScbNGCHr2feuNnhNYdGcArj6fSUfsC5U,1064
-lixinger_python-0.3.12.dist-info/RECORD,,
+lixinger/utils/retry.py,sha256=C9QBcrpD7WYAuT8R4SJfWNUZFj1mZsv-qyTRIFQDmwc,2862
+lixinger_python-0.3.14.dist-info/METADATA,sha256=mXD9Q3vhJMy-p0Exnj0knq71zUNpengedXCygEMcHyg,9207
+lixinger_python-0.3.14.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+lixinger_python-0.3.14.dist-info/licenses/LICENSE,sha256=5oOwRq1lHSOScbNGCHr2feuNnhNYdGcArj6fSUfsC5U,1064
+lixinger_python-0.3.14.dist-info/RECORD,,