mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-10-07 16:19:09 +00:00
fix: drop dead ttl_cache module; make fallback backoff jitter two-sided
ttl_cache.py was re-introduced via the dev merge but dev/#160 deliberately removed it as dead code (no agent importer). Remove it to match dev. Also make _jittered_delay symmetric (±25%) to match its docstring.
This commit is contained in:
parent
a094ab099b
commit
87652abb4b
2 changed files with 1 additions and 122 deletions
|
|
@ -186,7 +186,7 @@ class ModelFallbackMiddleware(AgentMiddleware):
|
||||||
)
|
)
|
||||||
|
|
||||||
def _jittered_delay(self, delay: float) -> float:
|
def _jittered_delay(self, delay: float) -> float:
|
||||||
return delay + random.uniform(0, delay * 0.25) if delay > 0 else 0.0
|
return delay + random.uniform(-delay * 0.25, delay * 0.25) if delay > 0 else 0.0
|
||||||
|
|
||||||
def _log_retry(
|
def _log_retry(
|
||||||
self, exc_type: str, use_fallback: bool, attempt: int, total: int, delay: float
|
self, exc_type: str, use_fallback: bool, attempt: int, total: int, delay: float
|
||||||
|
|
|
||||||
|
|
@ -1,121 +0,0 @@
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import asyncio
|
|
||||||
import logging
|
|
||||||
from collections.abc import Awaitable, Callable
|
|
||||||
from typing import TypeVar, cast
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
T = TypeVar("T")
|
|
||||||
|
|
||||||
_CACHE: dict[str, tuple[object, float]] = {}
|
|
||||||
_LOCKS: dict[tuple[str, int], asyncio.Lock] = {}
|
|
||||||
_REFRESH_TASKS: dict[tuple[str, int], asyncio.Task[None]] = {}
|
|
||||||
|
|
||||||
|
|
||||||
def _now() -> float:
|
|
||||||
return asyncio.get_running_loop().time()
|
|
||||||
|
|
||||||
|
|
||||||
def _lock_for(key: str) -> asyncio.Lock:
|
|
||||||
loop = asyncio.get_running_loop()
|
|
||||||
lock_key = (key, id(loop))
|
|
||||||
lock = _LOCKS.get(lock_key)
|
|
||||||
if lock is None:
|
|
||||||
lock = asyncio.Lock()
|
|
||||||
_LOCKS[lock_key] = lock
|
|
||||||
return lock
|
|
||||||
|
|
||||||
|
|
||||||
async def cached(key: str, ttl_seconds: float, loader: Callable[[], Awaitable[T]]) -> T:
|
|
||||||
now = _now()
|
|
||||||
entry = _CACHE.get(key)
|
|
||||||
if entry is not None:
|
|
||||||
value, expires_at = entry
|
|
||||||
if expires_at > now:
|
|
||||||
return cast(T, value)
|
|
||||||
|
|
||||||
async with _lock_for(key):
|
|
||||||
now = _now()
|
|
||||||
entry = _CACHE.get(key)
|
|
||||||
if entry is not None:
|
|
||||||
value, expires_at = entry
|
|
||||||
if expires_at > now:
|
|
||||||
return cast(T, value)
|
|
||||||
|
|
||||||
stale = entry[0] if entry is not None else None
|
|
||||||
has_stale = entry is not None
|
|
||||||
try:
|
|
||||||
value = await loader()
|
|
||||||
except Exception:
|
|
||||||
if has_stale:
|
|
||||||
logger.warning(
|
|
||||||
"TTL cache loader failed for %s; serving stale value", key, exc_info=True
|
|
||||||
)
|
|
||||||
return cast(T, stale)
|
|
||||||
raise
|
|
||||||
_CACHE[key] = (value, now + ttl_seconds)
|
|
||||||
return value
|
|
||||||
|
|
||||||
|
|
||||||
async def _refresh_stale_entry(
|
|
||||||
key: str, ttl_seconds: float, loader: Callable[[], Awaitable[object]]
|
|
||||||
) -> None:
|
|
||||||
async with _lock_for(key):
|
|
||||||
try:
|
|
||||||
value = await loader()
|
|
||||||
except Exception:
|
|
||||||
logger.warning("TTL cache background refresh failed for %s", key, exc_info=True)
|
|
||||||
return
|
|
||||||
_CACHE[key] = (value, _now() + ttl_seconds)
|
|
||||||
|
|
||||||
|
|
||||||
def _schedule_refresh(
|
|
||||||
key: str, ttl_seconds: float, loader: Callable[[], Awaitable[object]]
|
|
||||||
) -> None:
|
|
||||||
loop = asyncio.get_running_loop()
|
|
||||||
task_key = (key, id(loop))
|
|
||||||
existing = _REFRESH_TASKS.get(task_key)
|
|
||||||
if existing is not None and not existing.done():
|
|
||||||
return
|
|
||||||
|
|
||||||
task = asyncio.create_task(_refresh_stale_entry(key, ttl_seconds, loader))
|
|
||||||
_REFRESH_TASKS[task_key] = task
|
|
||||||
task.add_done_callback(lambda _task: _REFRESH_TASKS.pop(task_key, None))
|
|
||||||
|
|
||||||
|
|
||||||
async def cached_stale_while_revalidate(
|
|
||||||
key: str,
|
|
||||||
ttl_seconds: float,
|
|
||||||
loader: Callable[[], Awaitable[T]],
|
|
||||||
) -> T:
|
|
||||||
now = _now()
|
|
||||||
entry = _CACHE.get(key)
|
|
||||||
if entry is not None:
|
|
||||||
value, expires_at = entry
|
|
||||||
if expires_at > now:
|
|
||||||
return cast(T, value)
|
|
||||||
_schedule_refresh(key, ttl_seconds, loader)
|
|
||||||
return cast(T, value)
|
|
||||||
return await cached(key, ttl_seconds, loader)
|
|
||||||
|
|
||||||
|
|
||||||
def set_cached(key: str, value: object, ttl_seconds: float) -> None:
|
|
||||||
try:
|
|
||||||
expires_at = _now() + ttl_seconds
|
|
||||||
except RuntimeError:
|
|
||||||
expires_at = float("inf")
|
|
||||||
_CACHE[key] = (value, expires_at)
|
|
||||||
|
|
||||||
|
|
||||||
def invalidate(key: str) -> None:
|
|
||||||
_CACHE.pop(key, None)
|
|
||||||
|
|
||||||
|
|
||||||
def clear() -> None:
|
|
||||||
_CACHE.clear()
|
|
||||||
_LOCKS.clear()
|
|
||||||
for task in _REFRESH_TASKS.values():
|
|
||||||
task.cancel()
|
|
||||||
_REFRESH_TASKS.clear()
|
|
||||||
Loading…
Add table
Reference in a new issue