fix(vector): retry transient embed errors so a pod rollover drops 0 docs
From card 309 (OHR-Bench smoke-test triage): during a backend-pod rollover the
embedding endpoint was briefly unreachable, and openai.APIConnectionError /
ConnectError propagated unretried (the provider only retried 429). Documents
exhausted the 3 in-process retries and were dropped for that scan cycle.
Broaden the provider-level retry to the transient set -- APIConnectionError,
APITimeoutError, 429, and 5xx -- on the existing exponential backoff (2s->60s,
5 attempts), so a few seconds of retry rides through the rollover. Permanent
4xx (auth, bad request) still re-raise immediately. Generalize the shared
_retry helper (retry_on_rate_limit -> retry_on_transient, predicate renamed to
should_retry, accurate log label) with a back-compat alias; Mistral gets 429+5xx
for parity. The production gateway path inherits this via GatewayProvider, which
delegates to the decorated OpenAIProvider methods.
Add astrolabe_vector_ingest_dropped_total{reason}, incremented when a document
exhausts retries, classified (connection|timeout|rate_limit|server|qdrant|other)
by _drop_reason so the embed-drop rate is alertable per cause. Dropped docs are
NOT marked failed, so the next full scan re-picks them (re-queue via scan loop).
Refs: Deck board 12 card 309 (AC #1 no permanently-dropped docs; embed-drop
metric for AC #5).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
457c115ef4
commit
258ee96f4c
@@ -1,8 +1,10 @@
|
||||
"""Shared rate-limit retry helper for provider modules.
|
||||
"""Shared transient-error retry helper for provider modules.
|
||||
|
||||
OpenAI and Mistral both retry on 429 with the same exponential-backoff curve;
|
||||
extracting the loop here keeps the two provider modules thin and lets future
|
||||
providers (Bedrock throttling, etc.) reuse the same primitive.
|
||||
OpenAI and Mistral retry transient failures (429 rate limits, plus connection
|
||||
drops / timeouts / 5xx for the embedding path) on the same exponential-backoff
|
||||
curve; extracting the loop here keeps the two provider modules thin and lets
|
||||
future providers (Bedrock throttling, etc.) reuse the same primitive. The
|
||||
``should_retry`` predicate decides which caught exceptions are transient.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -23,23 +25,26 @@ MAX_RETRY_DELAY = 60.0
|
||||
T = TypeVar("T")
|
||||
|
||||
|
||||
def retry_on_rate_limit(
|
||||
exception_type: type[BaseException],
|
||||
is_rate_limit: Callable[[BaseException], bool] = lambda _exc: True,
|
||||
def retry_on_transient(
|
||||
exception_type: type[BaseException] | tuple[type[BaseException], ...],
|
||||
should_retry: Callable[[BaseException], bool] = lambda _exc: True,
|
||||
*,
|
||||
provider_name: str = "provider",
|
||||
label: str = "rate limit",
|
||||
) -> Callable[[Callable[..., Awaitable[T]]], Callable[..., Awaitable[T]]]:
|
||||
"""Build a decorator that retries on rate-limit exceptions.
|
||||
"""Build a decorator that retries transient exceptions with backoff.
|
||||
|
||||
Args:
|
||||
exception_type: Catch this exception class (e.g. ``openai.RateLimitError``,
|
||||
``mistralai.client.errors.SDKError``).
|
||||
is_rate_limit: Predicate that decides whether a caught exception is
|
||||
actually a rate-limit (vs. some other error of the same class).
|
||||
Defaults to "always True" — appropriate when ``exception_type`` is
|
||||
already a rate-limit-specific class.
|
||||
exception_type: Catch this exception class (or tuple of classes), e.g.
|
||||
``openai.APIError`` or ``mistralai.client.errors.SDKError``.
|
||||
should_retry: Predicate that decides whether a caught exception is
|
||||
transient (and so retryable) vs. a permanent error of the same
|
||||
class. Defaults to "always True" — appropriate when
|
||||
``exception_type`` is already transient-specific (e.g. a 429 class).
|
||||
provider_name: Used in log messages so operators can tell which
|
||||
provider exhausted retries.
|
||||
label: Short noun for the log message ("rate limit", "transient error")
|
||||
so the line accurately names what was retried.
|
||||
"""
|
||||
|
||||
def decorator(func: Callable[..., Awaitable[T]]) -> Callable[..., Awaitable[T]]:
|
||||
@@ -52,22 +57,27 @@ def retry_on_rate_limit(
|
||||
try:
|
||||
return await func(*args, **kwargs)
|
||||
except exception_type as e:
|
||||
if not is_rate_limit(e):
|
||||
if not should_retry(e):
|
||||
raise
|
||||
last_error = e
|
||||
if attempt < MAX_RETRIES:
|
||||
logger.warning(
|
||||
"%s rate limit hit (attempt %d/%d), retrying in %.1fs...",
|
||||
"%s %s (attempt %d/%d): %r; retrying in %.1fs...",
|
||||
provider_name,
|
||||
label,
|
||||
attempt,
|
||||
MAX_RETRIES,
|
||||
e,
|
||||
retry_delay,
|
||||
)
|
||||
await anyio.sleep(retry_delay)
|
||||
retry_delay = min(retry_delay * 2, MAX_RETRY_DELAY)
|
||||
|
||||
logger.error(
|
||||
"%s rate limit exceeded after %d attempts", provider_name, MAX_RETRIES
|
||||
"%s %s not resolved after %d attempts",
|
||||
provider_name,
|
||||
label,
|
||||
MAX_RETRIES,
|
||||
)
|
||||
if last_error is None: # pragma: no cover — loop above always sets this
|
||||
raise RuntimeError("retry loop exited without capturing an error")
|
||||
@@ -76,3 +86,7 @@ def retry_on_rate_limit(
|
||||
return wrapper
|
||||
|
||||
return decorator
|
||||
|
||||
|
||||
# Back-compat alias: the helper was originally rate-limit-specific.
|
||||
retry_on_rate_limit = retry_on_transient
|
||||
|
||||
@@ -13,7 +13,7 @@ import logging
|
||||
from mistralai.client import Mistral
|
||||
from mistralai.client.errors import SDKError
|
||||
|
||||
from ._retry import retry_on_rate_limit
|
||||
from ._retry import retry_on_transient
|
||||
from .base import Provider
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -30,13 +30,17 @@ BATCH_SIZE = 64
|
||||
_NO_EMBEDDING_MODEL_MSG = "Embedding not supported - no embedding_model configured"
|
||||
|
||||
|
||||
def _is_rate_limit(exc: BaseException) -> bool:
|
||||
"""True only for HTTP 429 SDKErrors."""
|
||||
return getattr(exc, "status_code", None) == 429
|
||||
def _is_transient(exc: BaseException) -> bool:
|
||||
"""Retry HTTP 429 (rate limit) and 5xx (server/transient) SDKErrors."""
|
||||
status = getattr(exc, "status_code", None)
|
||||
return status == 429 or (isinstance(status, int) and status >= 500)
|
||||
|
||||
|
||||
_retry_429 = retry_on_rate_limit(
|
||||
SDKError, is_rate_limit=_is_rate_limit, provider_name="Mistral"
|
||||
_retry_transient = retry_on_transient(
|
||||
SDKError,
|
||||
should_retry=_is_transient,
|
||||
provider_name="Mistral",
|
||||
label="transient error",
|
||||
)
|
||||
|
||||
|
||||
@@ -90,7 +94,7 @@ class MistralProvider(Provider):
|
||||
def supports_generation(self) -> bool:
|
||||
return False
|
||||
|
||||
@_retry_429
|
||||
@_retry_transient
|
||||
async def embed(self, text: str) -> list[float]:
|
||||
"""Generate an embedding for a single text."""
|
||||
if not self.supports_embeddings:
|
||||
@@ -169,7 +173,7 @@ class MistralProvider(Provider):
|
||||
|
||||
return all_embeddings, total_tokens
|
||||
|
||||
@_retry_429
|
||||
@_retry_transient
|
||||
async def _embed_batch_request(
|
||||
self, batch: list[str]
|
||||
) -> tuple[list[list[float]], int]:
|
||||
|
||||
@@ -8,16 +8,37 @@ Supports:
|
||||
|
||||
import logging
|
||||
|
||||
from openai import AsyncOpenAI, RateLimitError
|
||||
from openai import APIConnectionError, APIError, APIStatusError, AsyncOpenAI
|
||||
|
||||
from ._retry import retry_on_rate_limit
|
||||
from ._retry import retry_on_transient
|
||||
from .base import Provider
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# OpenAI's RateLimitError is itself a 429-specific class, so the default
|
||||
# is_rate_limit predicate ("always True") matches the previous behavior.
|
||||
_retry_429 = retry_on_rate_limit(RateLimitError, provider_name="OpenAI")
|
||||
|
||||
def _is_transient(exc: BaseException) -> bool:
|
||||
"""Whether an OpenAI APIError is transient and worth retrying.
|
||||
|
||||
Covers the failures seen dropping documents during a backend-pod rollover
|
||||
(card 309): ``APIConnectionError`` / ``APITimeoutError`` (brief gateway
|
||||
unreachability) and 429 / 5xx status errors. Permanent 4xx (auth, bad
|
||||
request) are NOT retried — they would fail identically every attempt.
|
||||
"""
|
||||
if isinstance(exc, APIConnectionError): # incl. APITimeoutError
|
||||
return True
|
||||
if isinstance(exc, APIStatusError):
|
||||
return exc.status_code == 429 or exc.status_code >= 500
|
||||
return False
|
||||
|
||||
|
||||
# Catch the APIError base (parent of both APIConnectionError and APIStatusError)
|
||||
# and let the predicate decide; non-transient errors re-raise immediately.
|
||||
_retry_transient = retry_on_transient(
|
||||
APIError,
|
||||
should_retry=_is_transient,
|
||||
provider_name="OpenAI",
|
||||
label="transient error",
|
||||
)
|
||||
|
||||
|
||||
# Well-known embedding dimensions for OpenAI models
|
||||
@@ -95,7 +116,7 @@ class OpenAIProvider(Provider):
|
||||
"""Whether this provider supports text generation."""
|
||||
return self.generation_model is not None
|
||||
|
||||
@_retry_429
|
||||
@_retry_transient
|
||||
async def embed(self, text: str) -> list[float]:
|
||||
"""
|
||||
Generate embedding vector for text.
|
||||
@@ -208,7 +229,7 @@ class OpenAIProvider(Provider):
|
||||
|
||||
return all_embeddings, total_tokens
|
||||
|
||||
@_retry_429
|
||||
@_retry_transient
|
||||
async def _embed_batch_request(
|
||||
self, batch: list[str]
|
||||
) -> tuple[list[list[float]], int]:
|
||||
@@ -262,7 +283,7 @@ class OpenAIProvider(Provider):
|
||||
)
|
||||
return self._dimension
|
||||
|
||||
@_retry_429
|
||||
@_retry_transient
|
||||
async def generate(self, prompt: str, max_tokens: int = 500) -> str:
|
||||
"""
|
||||
Generate text from a prompt.
|
||||
|
||||
Reference in New Issue
Block a user