fastapi-async-sqlalchemy 0.7.0.dev4__py3-none-any.whl → 0.7.0.dev5__py3-none-any.whl

fastapi_async_sqlalchemy/__init__.py

@@ -1,9 +1,9 @@
 from fastapi_async_sqlalchemy.middleware import (
     SQLAlchemyMiddleware,
-    db,
     create_middleware_and_session_proxy,
+    db,
 )
 
 __all__ = ["db", "SQLAlchemyMiddleware", "create_middleware_and_session_proxy"]
 
-__version__ = "0.7.0.dev4"
+__version__ = "0.7.0.dev5"

fastapi_async_sqlalchemy/middleware.py

@@ -1,23 +1,33 @@
 import asyncio
 from contextvars import ContextVar
-from typing import Dict, Optional, Union
+from typing import Dict, Optional, Type, Union
 
-from sqlalchemy.engine import Engine
 from sqlalchemy.engine.url import URL
-from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from starlette.requests import Request
 from starlette.types import ASGIApp
 
-from fastapi_async_sqlalchemy.exceptions import MissingSessionError, SessionNotInitialisedError
+from fastapi_async_sqlalchemy.exceptions import (
+    MissingSessionError,
+    SessionNotInitialisedError,
+)
 
 try:
-    from sqlalchemy.ext.asyncio import async_sessionmaker  # noqa: F811
+    from sqlalchemy.ext.asyncio import async_sessionmaker
 except ImportError:
-    from sqlalchemy.orm import sessionmaker as async_sessionmaker
+    from sqlalchemy.orm import sessionmaker as async_sessionmaker  # type: ignore
+
+# Try to import SQLModel's AsyncSession which has the .exec() method
+try:
+    from sqlmodel.ext.asyncio.session import AsyncSession as SQLModelAsyncSession
+
+    DefaultAsyncSession: Type[AsyncSession] = SQLModelAsyncSession  # type: ignore
+except ImportError:
+    DefaultAsyncSession: Type[AsyncSession] = AsyncSession  # type: ignore
 
 
-def create_middleware_and_session_proxy():
+def create_middleware_and_session_proxy() -> tuple:
     _Session: Optional[async_sessionmaker] = None
     _session: ContextVar[Optional[AsyncSession]] = ContextVar("_session", default=None)
     _multi_sessions_ctx: ContextVar[bool] = ContextVar("_multi_sessions_context", default=False)
@@ -31,9 +41,9 @@ def create_middleware_and_session_proxy():
             self,
             app: ASGIApp,
             db_url: Optional[Union[str, URL]] = None,
-            custom_engine: Optional[Engine] = None,
-            engine_args: Dict = None,
-            session_args: Dict = None,
+            custom_engine: Optional[AsyncEngine] = None,
+            engine_args: Optional[Dict] = None,
+            session_args: Optional[Dict] = None,
             commit_on_exit: bool = False,
         ):
             super().__init__(app)
@@ -44,13 +54,18 @@ def create_middleware_and_session_proxy():
             if not custom_engine and not db_url:
                 raise ValueError("You need to pass a db_url or a custom_engine parameter.")
             if not custom_engine:
+                if db_url is None:
+                    raise ValueError("db_url cannot be None when custom_engine is not provided")
                 engine = create_async_engine(db_url, **engine_args)
             else:
                 engine = custom_engine
 
             nonlocal _Session
             _Session = async_sessionmaker(
-                engine, class_=AsyncSession, expire_on_commit=False, **session_args
+                engine,
+                class_=DefaultAsyncSession,
+                expire_on_commit=False,
+                **session_args,
             )
 
         async def dispatch(self, request: Request, call_next: RequestResponseEndpoint):
@@ -115,7 +130,7 @@ def create_middleware_and_session_proxy():
     class DBSession(metaclass=DBSessionMeta):
         def __init__(
             self,
-            session_args: Dict = None,
+            session_args: Optional[Dict] = None,
             commit_on_exit: bool = False,
             multi_sessions: bool = False,
         ):

{fastapi_async_sqlalchemy-0.7.0.dev4.dist-info → fastapi_async_sqlalchemy-0.7.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fastapi-async-sqlalchemy
-Version: 0.7.0.dev4
+Version: 0.7.0.dev5
 Summary: SQLAlchemy middleware for FastAPI
 Home-page: https://github.com/h0rn3t/fastapi-async-sqlalchemy.git
 Author: Eugene Shershen
@@ -37,6 +37,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python

fastapi_async_sqlalchemy-0.7.0.dev5.dist-info/RECORD

@@ -0,0 +1,9 @@
+fastapi_async_sqlalchemy/__init__.py,sha256=BoDxfjumJJk-SFHEb2H93y9RBmeBvsYa0DNqsms4bAg,236
+fastapi_async_sqlalchemy/exceptions.py,sha256=dH3xjPE7B6kgq8L3LvxK-MsGZ_ZnW2WH2drLkK2oD-4,887
+fastapi_async_sqlalchemy/middleware.py,sha256=P7fTBvh5L7VO1fwRAvecJ24vGhFhE7hAaM3-kDtiJZg,7122
+fastapi_async_sqlalchemy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fastapi_async_sqlalchemy-0.7.0.dev5.dist-info/licenses/LICENSE,sha256=OhSfEMY0WqZhq41M6mLmkuFloAG7ZJYKfryF2jyxkfY,1108
+fastapi_async_sqlalchemy-0.7.0.dev5.dist-info/METADATA,sha256=RQZ9tcP69Tqzn9I3kZvo7C1gzk25MudNs-4EQFnjlPs,7090
+fastapi_async_sqlalchemy-0.7.0.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fastapi_async_sqlalchemy-0.7.0.dev5.dist-info/top_level.txt,sha256=po-P5Tif35GmAaUR0mgZr5uBwN91iAgszaKI_r4ZTZA,25
+fastapi_async_sqlalchemy-0.7.0.dev5.dist-info/RECORD,,

{fastapi_async_sqlalchemy-0.7.0.dev4.dist-info → fastapi_async_sqlalchemy-0.7.0.dev5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

fastapi_async_sqlalchemy-0.7.0.dev4.dist-info/RECORD

@@ -1,9 +0,0 @@
-fastapi_async_sqlalchemy/__init__.py,sha256=7Ac5_oyQGoV5gcLGyEx83lWaT0kgJDYAxx9nlEGiZPU,236
-fastapi_async_sqlalchemy/exceptions.py,sha256=dH3xjPE7B6kgq8L3LvxK-MsGZ_ZnW2WH2drLkK2oD-4,887
-fastapi_async_sqlalchemy/middleware.py,sha256=0jrZrrH9YsimOqsx7hFtO-BvKiNLFeDuDcqYLSS7E_g,6577
-fastapi_async_sqlalchemy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastapi_async_sqlalchemy-0.7.0.dev4.dist-info/LICENSE,sha256=OhSfEMY0WqZhq41M6mLmkuFloAG7ZJYKfryF2jyxkfY,1108
-fastapi_async_sqlalchemy-0.7.0.dev4.dist-info/METADATA,sha256=CGyu0yOvcj3JUJ_TsbUa8UiwxaYOxzWXmuBesxjOS0I,7068
-fastapi_async_sqlalchemy-0.7.0.dev4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-fastapi_async_sqlalchemy-0.7.0.dev4.dist-info/top_level.txt,sha256=po-P5Tif35GmAaUR0mgZr5uBwN91iAgszaKI_r4ZTZA,25
-fastapi_async_sqlalchemy-0.7.0.dev4.dist-info/RECORD,,