rate limit logging

openaq_api/openaq_api/dependencies.py

@@ -88,10 +88,7 @@ async def check_api_key(
                 limit = 60
             limited = False
             # check if its limited
-            now = datetime.now()
-            # Using a sliding window rate limiting algorithm
-            # we add the current time to the minute to the api key and use that as our check
-            key = f"{api_key}:{now.year}{now.month}{now.day}{now.hour}{now.minute}"
+            key = f"{api_key}"
             # if the that key is in our redis db it will return the number of requests
             # that key has made during the current minute
             value = await redis.get(key)
@@ -121,6 +118,9 @@ async def check_api_key(
                 limited = True
                 requests_used = int(value)
             ttl = await redis.ttl(key)
+            request.state.rate_limiter = (
+                f"{key}/{limit}/{requests_used}/{limit - requests_used}/{ttl}"
+            )
 
             response.headers["x-ratelimit-limit"] = str(limit)
             response.headers["x-ratelimit-remaining"] = str(requests_used)

openaq_api/openaq_api/middleware.py

@@ -1,9 +1,6 @@
 import logging
 import time
-from os import environ
-from fastapi import Response
-from fastapi.responses import JSONResponse
-from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
+from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.requests import Request
 from starlette.types import ASGIApp
 
@@ -14,6 +11,7 @@
 
 logger = logging.getLogger("middleware")
 
+
 class CacheControlMiddleware(BaseHTTPMiddleware):
     """MiddleWare to add CacheControl in response headers."""