wip

Author: gi0baro

src/sentry/hybridcloud/apigateway/middleware.py

@@ -22,13 +22,13 @@ def __init__(self, get_response: Callable[[Request], HttpResponseBase]):
         if iscoroutinefunction(self.get_response):
             markcoroutinefunction(self)
 
-    def __call__(self, request: Request) -> HttpResponseBase:
+    def __call__(self, request: Request) -> Any:
         if iscoroutinefunction(self):
             return self.__acall__(request)
         return self.get_response(request)
 
     async def __acall__(self, request: Request) -> HttpResponseBase:
-        return await self.get_response(request)
+        return await self.get_response(request)  # type: ignore[misc]
 
     def process_view(
         self,
@@ -45,14 +45,14 @@ def _process_view_match(
         view_func: Callable[..., HttpResponseBase],
         view_args: tuple[str],
         view_kwargs: dict[str, Any],
-    ):
+    ) -> Any:
         #: we check if we're in an async or sync runtime once, then
         #  overwrite the method with the actual impl.
         try:
             asyncio.get_running_loop()
-            method = self._process_view_inner
+            method = self._process_view_inner  # type: ignore[assignment]
         except RuntimeError:
-            method = self._process_view_sync
+            method = self._process_view_sync  # type: ignore[assignment]
         setattr(self, "_process_view_match", method)
         return method(request, view_func, view_args, view_kwargs)
 

src/sentry/hybridcloud/apigateway/proxy.py

@@ -6,7 +6,7 @@
 
 import asyncio
 import logging
-from collections.abc import AsyncGenerator
+from collections.abc import AsyncGenerator, AsyncIterator
 from urllib.parse import urljoin, urlparse
 from wsgiref.util import is_hop_by_hop
 
@@ -85,7 +85,7 @@ def _adapt_response(response: httpx.Response, remote_url: str) -> StreamingHttpR
     return streamed_response
 
 
-async def _stream_request(body) -> AsyncGenerator[bytes]:
+async def _stream_request(body: AsyncIterator[bytes]) -> AsyncGenerator[bytes]:
     async for chunk in body:
         yield chunk
 
@@ -159,7 +159,6 @@ async def proxy_cell_request(
     if settings.APIGATEWAY_PROXY_SKIP_RELAY and request.path.startswith("/api/0/relays/"):
         return StreamingHttpResponse(streaming_content="relay proxy skipped", status=404)
 
-    data: AsyncGenerator[bytes] | None = None
     if url_name == "sentry-api-0-organization-objectstore":
         if content_encoding:
             header_dict["Content-Encoding"] = content_encoding

src/sentry/objectstore/endpoints/organization.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import AsyncGenerator, Callable, Generator
+from collections.abc import Callable, Generator
 from typing import Any
 from urllib.parse import urlparse
 from wsgiref.util import is_hop_by_hop
@@ -153,7 +153,7 @@ def stream_generator():
 
 def get_raw_body_async(
     request: HttpRequest,
-) -> AsyncGenerator[bytes] | ChunkedEncodingAsyncDecoder | BodyWithLengthAiter | None:
+) -> BodyAsyncWrapper | ChunkedEncodingAsyncDecoder | BodyWithLengthAiter | None:
     if request.body:
         return BodyAsyncWrapper(request.body)
 
@@ -278,6 +278,9 @@ def read(self, size: int = -1) -> bytes:
 
 
 class ChunkedEncodingAsyncDecoder(ChunkedEncodingDecoder):
+    def __aiter__(self):
+        return self
+
     async def __anext__(self) -> bytes:
         if self._done:
             raise StopAsyncIteration

src/sentry/utils/http.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Collection, Iterator
-from typing import TYPE_CHECKING, Iterable, NamedTuple, TypeGuard, overload
+from typing import TYPE_CHECKING, Any, NamedTuple, TypeGuard, overload
 from urllib.parse import quote, urljoin, urlparse
 
 from asgiref.sync import sync_to_async
@@ -228,7 +228,7 @@ def is_using_customer_domain(request: HttpRequest) -> TypeGuard[_HttpRequestWith
 
 
 class BodyAsyncWrapper:
-    def __init__(self, body: Iterable):
+    def __init__(self, body: Any):
         self.body = [body] if isinstance(body, bytes) else body
 
     def __aiter__(self):