fix: Replace asgi_dispatch with asgi_middleware.

Author: amisadmin

sqlalchemy_database/_abc_async_database.py

@@ -1,6 +1,7 @@
 import abc
 import asyncio
 import functools
+import warnings
 from typing import Callable, Dict, TypeVar, Union
 
 from sqlalchemy.ext.asyncio import AsyncEngine
@@ -85,17 +86,15 @@ def __init__(self, engine: Union[Engine, AsyncEngine], *args, **kwargs) -> None:
             setattr(self, f"async_{func_name}", func)
 
     async def asgi_dispatch(self, request, call_next):
-        """Middleware for ASGI applications, such as: Starlette, FastAPI, Quart, Sanic, Hug, Responder, etc.
-        Bind a SQLAlchemy session connection to the incoming HTTP request session context,
-        you can access the session object through `self.session`.
-        The instance shortcut method will also try to use this `session` object by default.
-        Example:
-            ```Python
-            app = FastAPI()
-            db = Database.create("sqlite:///test.db")
-            app.add_middleware(BaseHTTPMiddleware, dispatch=db.asgi_dispatch)
-            ```
         """
+        This method has been deprecated and is not recommended. Please use the `asgi_middleware` method instead.
+        Reference: https://www.starlette.io/middleware/#limitations
+        """
+        # 打印警告信息
+        warnings.warn(
+            "This method has been deprecated and is not recommended. Please use the `asgi_middleware` method instead.",
+            DeprecationWarning,
+        )
         if request.scope.get(f"__sqlalchemy_database__:{id(self)}", False):
             return await call_next(request)
         # bind session to request
@@ -112,6 +111,32 @@ def attach_middleware(self, app):
             db.attach_middlewares(app)
             ```
         """
-        from starlette.middleware.base import BaseHTTPMiddleware
+        app.add_middleware(self.asgi_middleware)
+
+    @property
+    def asgi_middleware(self):
+        """Middleware for ASGI applications, such as: Starlette, FastAPI, Quart, Sanic, Hug, Responder, etc.
+        Bind a SQLAlchemy session connection to the incoming HTTP request session context,
+        you can access the session object through `self.session`.
+        The instance shortcut method will also try to use this `session` object by default.
+        Example:
+            ```Python
+            app = FastAPI()
+            db = Database.create("sqlite:///test.db")
+            app.add_middleware(db.asgi_middleware)
+            ```
+        """
+
+        def asgi_decorator(app):
+            @functools.wraps(app)
+            async def wrapped_app(scope, receive, send):
+                if scope.get(f"__sqlalchemy_database__:{id(self)}", False):
+                    return await app(scope, receive, send)
+                    # bind session to request
+                async with self.__call__(scope=id(scope)):
+                    scope[f"__sqlalchemy_database__:{id(self)}"] = self
+                    await app(scope, receive, send)
+
+            return wrapped_app
 
-        app.add_middleware(BaseHTTPMiddleware, dispatch=self.asgi_dispatch)
+        return asgi_decorator

sqlalchemy_database/_abc_async_database.pyi

@@ -6,6 +6,7 @@ from typing import (
     Mapping,
     Optional,
     Sequence,
+    Tuple,
     Type,
     TypeVar,
     Union,
@@ -46,7 +47,8 @@ class AbcAsyncDatabase(metaclass=abc.ABCMeta):
         is_session: bool = True,
         **kwargs: _P.kwargs,
     ) -> _T: ...
-    async def asgi_dispatch(self, request, call_next): ...
+    def asgi_middleware(self, app: Any) -> Callable[[Any], Tuple[Mapping[str, Any], Any, Any]]: ...
+    def attach_middleware(self, app: Any) -> None: ...
     def __call__(self, scope: Any = None) -> AsyncSessionContextVarManager:
         pass
     async def async_close(self) -> None: ...

tests/test_fastapi.py

@@ -80,7 +80,7 @@ async def test_async_db_in_fastapi():
     app = FastAPI()
     sub_app = FastAPI()
     app.mount("/sub", sub_app)
-    app.add_middleware(BaseHTTPMiddleware, dispatch=async_db.asgi_dispatch)
+    app.add_middleware(async_db.asgi_middleware)
     client = TestClient(app)
 
     @app.get("/users")