refactor: switch RedisRateLimiter to async redis.asyncio client
Replace sync redis.Redis with redis.asyncio to avoid blocking the event loop during rate-limit checks. Make RateLimiter.is_allowed async across both backends and update all call sites to await. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
committed by
Abhimanyu Saharan
parent
b4bbe1c657
commit
6b55b52a68
@@ -115,7 +115,7 @@ async def get_agent_auth_context(
|
||||
) -> AgentAuthContext:
|
||||
"""Require and validate agent auth token from request headers."""
|
||||
client_ip = get_client_ip(request)
|
||||
if not agent_auth_limiter.is_allowed(client_ip):
|
||||
if not await agent_auth_limiter.is_allowed(client_ip):
|
||||
raise HTTPException(status_code=status.HTTP_429_TOO_MANY_REQUESTS)
|
||||
resolved = _resolve_agent_token(
|
||||
agent_token,
|
||||
@@ -176,7 +176,7 @@ async def get_agent_auth_context_optional(
|
||||
# normal user Authorization headers are not throttled.
|
||||
if agent_token:
|
||||
client_ip = get_client_ip(request)
|
||||
if not agent_auth_limiter.is_allowed(client_ip):
|
||||
if not await agent_auth_limiter.is_allowed(client_ip):
|
||||
raise HTTPException(status_code=status.HTTP_429_TOO_MANY_REQUESTS)
|
||||
agent = await _find_agent_for_token(session, resolved)
|
||||
if agent is None:
|
||||
|
||||
@@ -14,6 +14,7 @@ from collections import deque
|
||||
from threading import Lock
|
||||
|
||||
import redis as redis_lib
|
||||
import redis.asyncio as aioredis
|
||||
|
||||
from app.core.logging import get_logger
|
||||
from app.core.rate_limit_backend import RateLimitBackend
|
||||
@@ -28,7 +29,7 @@ class RateLimiter(ABC):
|
||||
"""Base interface for sliding-window rate limiters."""
|
||||
|
||||
@abstractmethod
|
||||
def is_allowed(self, key: str) -> bool:
|
||||
async def is_allowed(self, key: str) -> bool:
|
||||
"""Return True if the request should be allowed, False if rate-limited."""
|
||||
|
||||
|
||||
@@ -50,7 +51,7 @@ class InMemoryRateLimiter(RateLimiter):
|
||||
for k in expired_keys:
|
||||
del self._buckets[k]
|
||||
|
||||
def is_allowed(self, key: str) -> bool:
|
||||
async def is_allowed(self, key: str) -> bool:
|
||||
"""Return True if the request should be allowed, False if rate-limited."""
|
||||
now = time.monotonic()
|
||||
cutoff = now - self._window_seconds
|
||||
@@ -78,9 +79,9 @@ class RedisRateLimiter(RateLimiter):
|
||||
"""Redis-backed sliding-window rate limiter using sorted sets.
|
||||
|
||||
Each key is stored as a Redis sorted set where members are unique
|
||||
request identifiers and scores are wall-clock timestamps. A pipeline
|
||||
prunes expired entries, adds the new request, counts the window, and
|
||||
sets a TTL — all in a single round-trip.
|
||||
request identifiers and scores are wall-clock timestamps. An async
|
||||
pipeline prunes expired entries, adds the new request, counts the
|
||||
window, and sets a TTL — all in a single round-trip.
|
||||
|
||||
Fail-open: if Redis is unreachable during a request, the request is
|
||||
allowed and a warning is logged.
|
||||
@@ -97,9 +98,9 @@ class RedisRateLimiter(RateLimiter):
|
||||
self._namespace = namespace
|
||||
self._max_requests = max_requests
|
||||
self._window_seconds = window_seconds
|
||||
self._client: redis_lib.Redis = redis_lib.Redis.from_url(redis_url)
|
||||
self._client: aioredis.Redis = aioredis.from_url(redis_url)
|
||||
|
||||
def is_allowed(self, key: str) -> bool:
|
||||
async def is_allowed(self, key: str) -> bool:
|
||||
"""Return True if the request should be allowed, False if rate-limited."""
|
||||
redis_key = f"ratelimit:{self._namespace}:{key}"
|
||||
now = time.time()
|
||||
@@ -112,7 +113,7 @@ class RedisRateLimiter(RateLimiter):
|
||||
pipe.zadd(redis_key, {member: now})
|
||||
pipe.zcard(redis_key)
|
||||
pipe.expire(redis_key, int(self._window_seconds) + 1)
|
||||
results = pipe.execute()
|
||||
results = await pipe.execute()
|
||||
count: int = results[2]
|
||||
except Exception:
|
||||
logger.warning(
|
||||
|
||||
Reference in New Issue
Block a user