mypy

Author: sanderegg

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

@@ -5,7 +5,7 @@
 
 import logging
 from collections.abc import Awaitable, Callable
-from typing import Any, Union
+from typing import Any
 
 from aiohttp import web
 from aiohttp.web_request import Request
@@ -37,7 +37,7 @@ def is_api_request(request: web.Request, api_version: str) -> bool:
     return bool(request.path.startswith(base_path))
 
 
-def error_middleware_factory(
+def error_middleware_factory(  # noqa: C901
     api_version: str,
 ) -> Middleware:
     _is_prod: bool = is_production_environ()
@@ -69,7 +69,7 @@ def _process_and_raise_unexpected_error(request: web.BaseRequest, err: Exception
         raise http_error
 
     @web.middleware
-    async def _middleware_handler(request: web.Request, handler: Handler):
+    async def _middleware_handler(request: web.Request, handler: Handler):  # noqa: C901
         """
         Ensure all error raised are properly enveloped and json responses
         """
@@ -147,12 +147,14 @@ async def _middleware_handler(request: web.Request, handler: Handler):
     return _middleware_handler
 
 
-_ResponseOrBodyData = Union[StreamResponse, Any]
+_ResponseOrBodyData = StreamResponse | Any
 HandlerFlexible = Callable[[Request], Awaitable[_ResponseOrBodyData]]
 MiddlewareFlexible = Callable[[Request, HandlerFlexible], Awaitable[StreamResponse]]
 
 
-def envelope_middleware_factory(api_version: str) -> MiddlewareFlexible:
+def envelope_middleware_factory(
+    api_version: str,
+) -> Callable[..., Awaitable[StreamResponse]]:
     # FIXME: This data conversion is very error-prone. Use decorators instead!
     _is_prod: bool = is_production_environ()