chore: make mypy happy again

Author: gi0baro

src/sentry/hybridcloud/apigateway_async/circuitbreaker.py

@@ -3,6 +3,7 @@
 import asyncio
 import time
 from collections import defaultdict
+from typing import Any
 
 from django.conf import settings
 
@@ -18,7 +19,7 @@ class CircuitBreaker:
         "_counter_idx",
     ]
 
-    def __init__(self, concurrency, failures):
+    def __init__(self, concurrency: int, failures: tuple[int, int]) -> None:
         self.concurrency = concurrency
         self.counter_window = failures[0]
         self.failures = failures[1]
@@ -27,7 +28,7 @@ def __init__(self, concurrency, failures):
         self._counters = [0, 0]
         self._counter_idx = 0
 
-    def _counter_flip(self, clock):
+    def _counter_flip(self, clock: int) -> None:
         self._clock = clock
         prev = self._counter_idx
         self._counter_idx = 1 - prev
@@ -40,7 +41,7 @@ def _maybe_counter_flip(self):
             if delta // self.counter_window:
                 self._counter_flip(now)
 
-    def counter_incr(self):
+    def counter_incr(self) -> None:
         self._maybe_counter_flip()
         self._counters[self._counter_idx] += 1
 
@@ -66,10 +67,10 @@ class CircuitBreakerCtx:
     def __init__(self, cb: CircuitBreaker):
         self.cb = cb
 
-    def incr_failures(self):
+    def incr_failures(self) -> None:
         self.cb.counter_incr()
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> CircuitBreakerCtx:
         if self.cb.overflow():
             raise CircuitBreakerOverflow
         await self.cb.semaphore.acquire()
@@ -78,7 +79,7 @@ async def __aenter__(self):
             raise CircuitBreakerWindowOverflow
         return self
 
-    async def __aexit__(self, exc_type, exc_value, exc_tb):
+    async def __aexit__(self, exc_type: Any, exc_value: Any, exc_tb: Any) -> None:
         self.cb.semaphore.release()
 
 
@@ -94,7 +95,9 @@ def __init__(
         concurrency = max_concurrency or settings.APIGATEWAY_PROXY_MAX_CONCURRENCY
         failures = failures or settings.APIGATEWAY_PROXY_MAX_FAILURES
         failure_window = failure_window or settings.APIGATEWAY_PROXY_FAILURE_WINDOW
-        self.objs = defaultdict(lambda: CircuitBreaker(concurrency, (failure_window, failures)))
+        self.objs: dict[str, CircuitBreaker] = defaultdict(
+            lambda: CircuitBreaker(concurrency, (failure_window, failures))
+        )
 
     def get(self, key: str) -> CircuitBreakerCtx:
         return self.objs[key].ctx()

src/sentry/objectstore/endpoints/organization.py

@@ -12,7 +12,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry.utils.http import BodyAsyncWrapper, BodyWithLength, BodyWithLengthAiter
+from sentry.utils.http import BodyAsyncWrapper, BodyWithLength
 
 # TODO(granian): Remove this and related code paths when we fully switch from uwsgi to granian
 uwsgi: Any = None
@@ -153,7 +153,7 @@ def stream_generator():
 
 def get_raw_body_async(
     request: HttpRequest,
-) -> BodyAsyncWrapper | ChunkedEncodingAsyncDecoder | BodyWithLengthAiter | None:
+) -> BodyAsyncWrapper | ChunkedEncodingAsyncDecoder | BodyWithLength:
     if request.body:
         return BodyAsyncWrapper(request.body)