init import fixes

Author: krylosov-aa

context_async_sqlalchemy/__init__.py

@@ -28,17 +28,6 @@
     ASGIHTTPDBSessionMiddleware,
 )
 
-from .starlette_utils import (
-    add_starlette_http_db_session_middleware,
-    starlette_http_db_session_middleware,
-    StarletteHTTPDBSessionMiddleware,
-)
-
-from .fastapi_utils import (
-    fastapi_http_db_session_middleware,
-    add_fastapi_http_db_session_middleware,
-)
-
 __all__ = [
     "init_db_session_ctx",
     "is_context_initiated",
@@ -60,9 +49,4 @@
     "rollback_all_sessions",
     "close_all_sessions",
     "ASGIHTTPDBSessionMiddleware",
-    "add_starlette_http_db_session_middleware",
-    "starlette_http_db_session_middleware",
-    "StarletteHTTPDBSessionMiddleware",
-    "fastapi_http_db_session_middleware",
-    "add_fastapi_http_db_session_middleware",
 ]

context_async_sqlalchemy/asgi_utils/middleware.py

@@ -1,4 +1,6 @@
-from starlette.types import ASGIApp, Receive, Scope, Send
+from collections.abc import Awaitable, MutableMapping
+from typing import Any, Callable
+
 from http import HTTPStatus
 
 from context_async_sqlalchemy import (
@@ -9,14 +11,22 @@
     rollback_all_sessions,
 )
 
+Message = MutableMapping[str, Any]
+Receive = Callable[[], Awaitable[Message]]
+Scope = MutableMapping[str, Any]
+Send = Callable[[Message], Awaitable[None]]
+ASGIApp = Callable[[Scope, Receive, Send], Awaitable[None]]
+
 
 class ASGIHTTPDBSessionMiddleware:
     """Database session lifecycle management."""
 
     def __init__(self, app: ASGIApp):
         self.app = app
 
-    async def __call__(self, scope: Scope, receive: Receive, send: Send):
+    async def __call__(
+        self, scope: Scope, receive: Receive, send: Send
+    ) -> None:
         """
         Database session lifecycle management.
         The session itself is created on demand in db_session().
@@ -45,7 +55,7 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send):
 
         status_code = HTTPStatus.INTERNAL_SERVER_ERROR
 
-        async def send_wrapper(message):
+        async def send_wrapper(message: Message) -> None:
             nonlocal status_code
             if message["type"] == "http.response.start":
                 status_code = message["status"]

context_async_sqlalchemy/fastapi_utils/middleware.py

@@ -5,7 +5,7 @@
     RequestResponseEndpoint,
 )
 
-from context_async_sqlalchemy import (
+from context_async_sqlalchemy.starlette_utils import (
     add_starlette_http_db_session_middleware,
     starlette_http_db_session_middleware,
 )

context_async_sqlalchemy/starlette_utils/http_middleware.py

@@ -28,9 +28,7 @@ class StarletteHTTPDBSessionMiddleware(BaseHTTPMiddleware):
     async def dispatch(
         self, request: Request, call_next: RequestResponseEndpoint
     ) -> Response:
-        return await starlette_http_db_session_middleware(
-            request, call_next
-        )
+        return await starlette_http_db_session_middleware(request, call_next)
 
 
 async def starlette_http_db_session_middleware(

examples/starlette_example/setup_app.py

@@ -6,7 +6,6 @@
 from starlette.applications import Starlette
 from starlette.routing import Route
 
-from context_async_sqlalchemy import ASGIHTTPDBSessionMiddleware
 from context_async_sqlalchemy.starlette_utils import (
     add_starlette_http_db_session_middleware,
 )

setup.cfg

@@ -1,6 +1,7 @@
 [flake8]
 exclude = .venv
 ignore=WPS476, WPS300, WPS410, WPS412, WPS501, WPS229, WPS202, WPS110, WPS473
+    WPS217, WPS430, WPS420
 
 per-file-ignores =
     examples/*: WPS110, WPS432, WPS204, WPS114, WPS226, WPS201