fastapi-sqla 3.1.2__tar.gz → 3.4.8__tar.gz

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: fastapi-sqla
-Version: 3.1.2
+Version: 3.4.8
 Summary: SQLAlchemy extension for FastAPI with support for pagination, asyncio, SQLModel, and pytest, ready for production.
 Home-page: https://github.com/dialoguemd/fastapi-sqla
 License: MIT
 Keywords: FastAPI,SQLAlchemy,asyncio,pytest,alembic
 Author: Hadrien David
 Author-email: hadrien.david@dialogue.co
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.9,<3.14
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: AsyncIO
@@ -22,6 +22,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: SQL
 Classifier: Topic :: Internet
@@ -34,30 +35,19 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Provides-Extra: asyncpg
 Provides-Extra: aws-rds-iam
+Provides-Extra: psycopg2
+Provides-Extra: pytest-plugin
 Provides-Extra: sqlmodel
-Provides-Extra: tests
-Requires-Dist: Faker (>=14.2.0,<15.0.0) ; extra == "tests"
-Requires-Dist: alembic (>=1.4.3,<2.0.0) ; extra == "tests"
-Requires-Dist: asgi_lifespan (>=1.0.1,<2.0.0) ; extra == "tests"
-Requires-Dist: asyncpg (>=0.28.0,<0.29.0) ; extra == "asyncpg"
-Requires-Dist: black (>=22.8.0,<23.0.0) ; extra == "tests"
-Requires-Dist: boto3 (>=1.24.74,<2.0.0) ; extra == "aws-rds-iam"
-Requires-Dist: fastapi (>=0.95.1)
-Requires-Dist: greenlet (>=1.1.3,<2.0.0) ; extra == "tests"
-Requires-Dist: httpx (>=0.23.0,<0.24.0) ; extra == "tests"
-Requires-Dist: isort (>=5.5.3,<6.0.0) ; extra == "tests"
-Requires-Dist: mypy[tests] (>=1.0.0,<2.0.0) ; extra == "tests"
-Requires-Dist: pdbpp (>=0.10.2,<0.11.0) ; extra == "tests"
-Requires-Dist: psycopg2 (>=2.8.6,<3.0.0) ; extra == "tests"
-Requires-Dist: pydantic (>=1)
-Requires-Dist: pylama (>=8.4.1,<9.0.0) ; extra == "tests"
-Requires-Dist: pytest (>=7.2.1,<8.0.0) ; extra == "tests"
-Requires-Dist: pytest-asyncio (>=0.19.0,<0.20.0) ; extra == "tests"
-Requires-Dist: pytest-cov (>=2.10.1,<3.0.0) ; extra == "tests"
-Requires-Dist: sqlalchemy (>=1.3)
-Requires-Dist: sqlmodel (>=0.0.14,<0.0.15) ; extra == "sqlmodel"
-Requires-Dist: structlog (>=20)
-Requires-Dist: tox (>=3.26.0,<4.0.0) ; extra == "tests"
+Requires-Dist: alembic (>=1.4.3,<2) ; extra == "pytest-plugin"
+Requires-Dist: asyncpg (>=0.28.0,<0.31.0) ; extra == "asyncpg"
+Requires-Dist: boto3 (>=1.24.74,<2) ; extra == "aws-rds-iam"
+Requires-Dist: deprecated (>=1.2,<2)
+Requires-Dist: fastapi (>=0.95.1,<0.116)
+Requires-Dist: psycopg2 (>=2.8.6,<3) ; extra == "psycopg2"
+Requires-Dist: pydantic (>=1,<3)
+Requires-Dist: sqlalchemy (>=1.3,<3)
+Requires-Dist: sqlmodel (>=0.0.14,<0.0.23) ; extra == "sqlmodel"
+Requires-Dist: structlog (>=20,<26)
 Project-URL: Repository, https://github.com/dialoguemd/fastapi-sqla
 Description-Content-Type: text/markdown
 
@@ -83,6 +73,8 @@ Using [pip](https://pip.pypa.io/):
 pip install fastapi-sqla
 ```
 
+Note that you need a [SQLAlchemy compatible engine](https://docs.sqlalchemy.org/en/20/core/engines.html) adapter. We test with `psycopg2` which you can install using the `psycopg2` extra.
+
 # Quick Example
 
 Assuming it runs against a DB with a table `user` with 3 columns, `id`, `name` and
@@ -90,15 +82,22 @@ unique `email`:
 
 ```python
 # main.py
+from contextlib import asynccontextmanager
 from fastapi import FastAPI, HTTPException
-from fastapi_sqla import Base, Item, Page, Paginate, Session, setup
+from fastapi_sqla import Base, Item, Page, Paginate, Session, setup_middlewares, startup
 from pydantic import BaseModel, EmailStr
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
 
-app = FastAPI()
 
-setup(app)
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    await startup()
+    yield
+
+
+app = FastAPI(lifespan=lifespan)
+setup_middlewares(app)
 
 
 class User(Base):
@@ -203,7 +202,23 @@ And define the environment variable `sqlalchemy_url` with `postgres+asyncpg` sch
 export sqlalchemy_url=postgresql+asyncpg://postgres@localhost
 ```
 
-## Setup the app:
+## Setup the app AsyncContextManager (recommended):
+
+```python
+import fastapi_sqla
+from fastapi import FastAPI
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    await fastapi_sqla.startup()
+    yield
+
+
+app = FastAPI(lifespan=lifespan)
+fastapi_sqla.setup_middlewares(app)
+```
+
+## Setup the app using startup/shutdown events (deprecated):
 
 ```python
 import fastapi_sqla
@@ -640,7 +655,7 @@ If your project uses [SQLModel], then `Session` dependency is an SQLModel sessio
 # Pytest fixtures
 
 This library provides a set of utility fixtures, through its PyTest plugin, which is
-automatically installed with the library.
+automatically installed with the library. Using the plugin requires the `pytest_plugin` extra.
 
 By default, no records are actually written to the database when running tests.
 There currently is no way to change this behaviour.
@@ -784,7 +799,7 @@ It returns the path of  `alembic.ini` configuration file. By default, it returns
 ## Setup
 
 ```bash
-$ poetry install --extras tests --extras asyncpg --extras aws_rds_iam
+$ poetry install --all-extras
 ```
 
 ## Running tests

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/README.md

@@ -20,6 +20,8 @@ Using [pip](https://pip.pypa.io/):
 pip install fastapi-sqla
 ```
 
+Note that you need a [SQLAlchemy compatible engine](https://docs.sqlalchemy.org/en/20/core/engines.html) adapter. We test with `psycopg2` which you can install using the `psycopg2` extra.
+
 # Quick Example
 
 Assuming it runs against a DB with a table `user` with 3 columns, `id`, `name` and
@@ -27,15 +29,22 @@ unique `email`:
 
 ```python
 # main.py
+from contextlib import asynccontextmanager
 from fastapi import FastAPI, HTTPException
-from fastapi_sqla import Base, Item, Page, Paginate, Session, setup
+from fastapi_sqla import Base, Item, Page, Paginate, Session, setup_middlewares, startup
 from pydantic import BaseModel, EmailStr
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
 
-app = FastAPI()
 
-setup(app)
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    await startup()
+    yield
+
+
+app = FastAPI(lifespan=lifespan)
+setup_middlewares(app)
 
 
 class User(Base):
@@ -140,7 +149,23 @@ And define the environment variable `sqlalchemy_url` with `postgres+asyncpg` sch
 export sqlalchemy_url=postgresql+asyncpg://postgres@localhost
 ```
 
-## Setup the app:
+## Setup the app AsyncContextManager (recommended):
+
+```python
+import fastapi_sqla
+from fastapi import FastAPI
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    await fastapi_sqla.startup()
+    yield
+
+
+app = FastAPI(lifespan=lifespan)
+fastapi_sqla.setup_middlewares(app)
+```
+
+## Setup the app using startup/shutdown events (deprecated):
 
 ```python
 import fastapi_sqla
@@ -577,7 +602,7 @@ If your project uses [SQLModel], then `Session` dependency is an SQLModel sessio
 # Pytest fixtures
 
 This library provides a set of utility fixtures, through its PyTest plugin, which is
-automatically installed with the library.
+automatically installed with the library. Using the plugin requires the `pytest_plugin` extra.
 
 By default, no records are actually written to the database when running tests.
 There currently is no way to change this behaviour.
@@ -721,7 +746,7 @@ It returns the path of  `alembic.ini` configuration file. By default, it returns
 ## Setup
 
 ```bash
-$ poetry install --extras tests --extras asyncpg --extras aws_rds_iam
+$ poetry install --all-extras
 ```
 
 ## Running tests

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/__init__.py

@@ -1,4 +1,4 @@
-from fastapi_sqla.base import setup
+from fastapi_sqla.base import setup, setup_middlewares, startup
 from fastapi_sqla.models import Collection, Item, Page
 from fastapi_sqla.pagination import Paginate, PaginateSignature, Pagination
 from fastapi_sqla.sqla import (
@@ -22,6 +22,8 @@ __all__ = [
     "SqlaSession",
     "open_session",
     "setup",
+    "setup_middlewares",
+    "startup",
 ]
 
 

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/_pytest_plugin.py

@@ -28,7 +28,6 @@ def db_host():
     When CI key is set in environment variables, it uses `postgres` as host name else,
     host used is `localhost`
     """
-
     return "postgres" if "CI" in os.environ else "localhost"
 
 
@@ -38,7 +37,6 @@ def db_user():
 
     postgres
     """
-
     return "postgres"
 
 
@@ -48,7 +46,6 @@ def db_url(db_host, db_user):
 
     db url example postgresql://{db_user}@{db_host}/postgres
     """
-
     return f"postgresql://{db_user}@{db_host}/postgres"
 
 
@@ -107,7 +104,6 @@ def sqla_reflection(sqla_modules, sqla_connection):
 @fixture
 def patch_engine_from_config(request, sqla_connection):
     """So that all DB operations are never written to db for real."""
-
     if "dont_patch_engines" in request.keywords:
         yield
     else:
@@ -153,7 +149,7 @@ def async_sqlalchemy_url(db_url):
     return format_async_async_sqlalchemy_url(db_url)
 
 
-if asyncio_support:  # noqa: C901
+if asyncio_support:
 
     @fixture
     def async_engine(async_sqlalchemy_url):
@@ -167,7 +163,6 @@ if asyncio_support:  # noqa: C901
     @fixture
     async def patch_new_engine(request, async_sqla_connection):
         """So that all async DB operations are never written to db for real."""
-
         if "dont_patch_engines" in request.keywords:
             yield
         else:

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/async_pagination.py

@@ -1,6 +1,6 @@
 import math
-from collections.abc import Awaitable, Callable
-from typing import Annotated, Iterator, Optional, Union, cast
+from collections.abc import Awaitable, Callable, Iterator
+from typing import Annotated, Optional, Union, cast
 
 from fastapi import Depends, Query
 from sqlalchemy.sql import Select, func, select

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/async_sqla.py

@@ -3,12 +3,13 @@ from contextlib import asynccontextmanager
 from typing import Annotated
 
 import structlog
-from fastapi import Depends, Request
+from fastapi import Depends, Request, Response
 from fastapi.responses import PlainTextResponse
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import AsyncEngine
 from sqlalchemy.ext.asyncio import AsyncSession as SqlaAsyncSession
 from sqlalchemy.orm.session import sessionmaker
+from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
 from fastapi_sqla import aws_aurora_support, aws_rds_iam_support
 from fastapi_sqla.sqla import _DEFAULT_SESSION_KEY, Base, new_engine
@@ -88,9 +89,7 @@ async def open_session(
         await session.close()
 
 
-async def add_session_to_request(
-    request: Request, call_next, key: str = _DEFAULT_SESSION_KEY
-):
+class AsyncSessionMiddleware:
     """Middleware which injects a new sqla async session into every request.
 
     Handles creation of session, as well as commit, rollback, and closing of session.
@@ -108,36 +107,58 @@ async def add_session_to_request(
         async def get_users(session: fastapi_sqla.AsyncSession):
             return await session.execute(...) # use your session here
     """
-    async with open_session(key) as session:
-        setattr(request.state, f"{_ASYNC_REQUEST_SESSION_KEY}_{key}", session)
-        response = await call_next(request)
-
-        is_dirty = bool(session.dirty or session.deleted or session.new)
-
-        # try to commit after response, so that we can return a proper 500 response
-        # and not raise a true internal server error
-        if response.status_code < 400:
-            try:
-                await session.commit()
-            except Exception:
-                logger.exception("commit failed, returning http error")
-                response = PlainTextResponse(
-                    content="Internal Server Error", status_code=500
-                )
-
-        if response.status_code >= 400:
-            # If ever a route handler returns an http exception, we do not want the
-            # session opened by current context manager to commit anything in db.
-            if is_dirty:
-                # optimistically only log if there were uncommitted changes
-                logger.warning(
-                    "http error, rolling back possibly uncommitted changes",
-                    status_code=response.status_code,
-                )
-            # since this is no-op if session is not dirty, we can always call it
-            await session.rollback()
 
-    return response
+    def __init__(self, app: ASGIApp, key: str = _DEFAULT_SESSION_KEY) -> None:
+        self.app = app
+        self.key = key
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        if scope["type"] != "http":
+            return await self.app(scope, receive, send)
+
+        async with open_session(self.key) as session:
+            request = Request(scope=scope, receive=receive, send=send)
+            setattr(request.state, f"{_ASYNC_REQUEST_SESSION_KEY}_{self.key}", session)
+
+            async def send_wrapper(message: Message) -> None:
+                if message["type"] != "http.response.start":
+                    return await send(message)
+
+                response: Response | None = None
+                status_code = message["status"]
+                is_dirty = bool(session.dirty or session.deleted or session.new)
+
+                # try to commit after response, so that we can return a proper 500
+                # and not raise a true internal server error
+                if status_code < 400:
+                    try:
+                        await session.commit()
+                    except Exception:
+                        logger.exception("commit failed, returning http error")
+                        status_code = 500
+                        response = PlainTextResponse(
+                            content="Internal Server Error", status_code=500
+                        )
+
+                if status_code >= 400:
+                    # If ever a route handler returns an http exception,
+                    # we do not want the current session to commit anything in db.
+                    if is_dirty:
+                        # optimistically only log if there were uncommitted changes
+                        logger.warning(
+                            "http error, rolling back possibly uncommitted changes",
+                            status_code=status_code,
+                        )
+                    # since this is no-op if the session is not dirty,
+                    # we can always call it
+                    await session.rollback()
+
+                if response:
+                    return await response(scope, receive, send)
+
+                return await send(message)
+
+            await self.app(scope, receive, send_wrapper)
 
 
 class AsyncSessionDependency:

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/aws_rds_iam_support.py

@@ -20,7 +20,8 @@ def setup(engine: Engine):
     aws_rds_iam_enabled = lc_environ.get("fastapi_sqla_aws_rds_iam_enabled") == "true"
 
     if aws_rds_iam_enabled:
-        assert boto3_installed, boto3_installed_err
+        if not boto3_installed:
+            raise ImportError(f"boto3 is required for RDS IAM : {boto3_installed_err}")
         # Cache the client at startup
         get_rds_client()
         event.listen(engine, "do_connect", set_connection_token)

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/base.py

@@ -2,6 +2,7 @@ import functools
 import os
 import re
 
+from deprecated import deprecated
 from fastapi import FastAPI
 from sqlalchemy.engine import Engine
 
@@ -20,23 +21,41 @@ except ImportError as err:  # pragma: no cover
 _ENGINE_KEYS_REGEX = re.compile(r"fastapi_sqla__(?!_)(.+)(?<!_)__(?!_).+")
 
 
+async def startup():
+    engine_keys = _get_engine_keys()
+    engines = {key: sqla.new_engine(key) for key in engine_keys}
+    for key, engine in engines.items():
+        if not _is_async_dialect(engine):
+            sqla.startup(key=key)
+        else:
+            await async_sqla.startup(key=key)
+
+
+def setup_middlewares(app: FastAPI):
+    engine_keys = _get_engine_keys()
+    engines = {key: sqla.new_engine(key) for key in engine_keys}
+    for key, engine in engines.items():
+        if not _is_async_dialect(engine):
+            app.add_middleware(sqla.SessionMiddleware, key=key)
+        else:
+            app.add_middleware(async_sqla.AsyncSessionMiddleware, key=key)
+
+
+@deprecated(
+    reason="FastAPI events are deprecated. This function will be remove in the upcoming major release."  # noqa: E501
+)
 def setup(app: FastAPI):
     engine_keys = _get_engine_keys()
     engines = {key: sqla.new_engine(key) for key in engine_keys}
     for key, engine in engines.items():
         if not _is_async_dialect(engine):
             app.add_event_handler("startup", functools.partial(sqla.startup, key=key))
-            app.middleware("http")(
-                functools.partial(sqla.add_session_to_request, key=key)
-            )
+            app.add_middleware(sqla.SessionMiddleware, key=key)
         else:
-            assert has_asyncio_support, asyncio_support_err
             app.add_event_handler(
                 "startup", functools.partial(async_sqla.startup, key=key)
             )
-            app.middleware("http")(
-                functools.partial(async_sqla.add_session_to_request, key=key)
-            )
+            app.add_middleware(async_sqla.AsyncSessionMiddleware, key=key)
 
 
 def _get_engine_keys() -> set[str]:

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/models.py

@@ -3,7 +3,7 @@ from typing import Generic, TypeVar
 from pydantic import BaseModel, Field
 from pydantic import __version__ as pydantic_version
 
-major, _, _ = [int(v) for v in pydantic_version.split(".")]
+major, _, _ = (int(v) for v in pydantic_version.split("."))
 is_pydantic2 = major == 2
 if is_pydantic2:
     GenericModel = BaseModel

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/pagination.py

@@ -1,7 +1,7 @@
 import math
-from collections.abc import Callable
+from collections.abc import Callable, Iterator
 from functools import singledispatch
-from typing import Annotated, Iterator, Optional, Union, cast
+from typing import Annotated, Optional, Union, cast
 
 from fastapi import Depends, Query
 from sqlalchemy.orm import Query as LegacyQuery
@@ -52,7 +52,7 @@ def paginate_query(
     limit: int,
     scalars: bool = True,
 ) -> Page:  # pragma: no cover
-    "Dispatch on registered functions based on `query` type"
+    """Dispatch on registered functions based on `query` type"""
     raise NotImplementedError(f"no paginate_query registered for type {type(query)!r}")
 
 

{fastapi_sqla-3.1.2 → fastapi_sqla-3.4.8}/fastapi_sqla/sqla.py

@@ -5,7 +5,7 @@ from contextlib import contextmanager
 from typing import Annotated
 
 import structlog
-from fastapi import Depends, Request
+from fastapi import Depends, Request, Response
 from fastapi.concurrency import contextmanager_in_threadpool
 from fastapi.responses import PlainTextResponse
 from sqlalchemy import engine_from_config, text
@@ -13,6 +13,7 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.ext.declarative import DeferredReflection
 from sqlalchemy.orm.session import Session as SqlaSession
 from sqlalchemy.orm.session import sessionmaker
+from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
 from fastapi_sqla import aws_aurora_support, aws_rds_iam_support
 
@@ -24,7 +25,7 @@ except ImportError:
     DeclarativeBase = declarative_base()  # type: ignore
 
 try:
-    from sqlmodel import Session as SqlaSession  # type: ignore  # noqa
+    from sqlmodel import Session as SqlaSession  # type: ignore
 
 except ImportError:
     pass
@@ -110,9 +111,7 @@ def open_session(key: str = _DEFAULT_SESSION_KEY) -> Generator[SqlaSession, None
         session.close()
 
 
-async def add_session_to_request(
-    request: Request, call_next, key: str = _DEFAULT_SESSION_KEY
-):
+class SessionMiddleware:
     """Middleware which injects a new sqla session into every request.
 
     Handles creation of session, as well as commit, rollback, and closing of session.
@@ -130,39 +129,60 @@ async def add_session_to_request(
         def get_users(session: fastapi_sqla.Session):
             return session.execute(...) # use your session here
     """
-    async with contextmanager_in_threadpool(open_session(key)) as session:
-        setattr(request.state, f"{_REQUEST_SESSION_KEY}_{key}", session)
-
-        response = await call_next(request)
-
-        is_dirty = bool(session.dirty or session.deleted or session.new)
-
-        loop = asyncio.get_running_loop()
-
-        # try to commit after response, so that we can return a proper 500 response
-        # and not raise a true internal server error
-        if response.status_code < 400:
-            try:
-                await loop.run_in_executor(None, session.commit)
-            except Exception:
-                logger.exception("commit failed, returning http error")
-                response = PlainTextResponse(
-                    content="Internal Server Error", status_code=500
-                )
-
-        if response.status_code >= 400:
-            # If ever a route handler returns an http exception, we do not want the
-            # session opened by current context manager to commit anything in db.
-            if is_dirty:
-                # optimistically only log if there were uncommitted changes
-                logger.warning(
-                    "http error, rolling back possibly uncommitted changes",
-                    status_code=response.status_code,
-                )
-            # since this is no-op if session is not dirty, we can always call it
-            await loop.run_in_executor(None, session.rollback)
-
-    return response
+
+    def __init__(self, app: ASGIApp, key: str = _DEFAULT_SESSION_KEY) -> None:
+        self.app = app
+        self.key = key
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        if scope["type"] != "http":
+            return await self.app(scope, receive, send)
+
+        async with contextmanager_in_threadpool(open_session(self.key)) as session:
+            request = Request(scope=scope, receive=receive, send=send)
+            setattr(request.state, f"{_REQUEST_SESSION_KEY}_{self.key}", session)
+
+            async def send_wrapper(message: Message) -> None:
+                if message["type"] != "http.response.start":
+                    return await send(message)
+
+                response: Response | None = None
+                status_code = message["status"]
+                is_dirty = bool(session.dirty or session.deleted or session.new)
+
+                loop = asyncio.get_running_loop()
+
+                # try to commit after response, so that we can return a proper 500
+                # and not raise a true internal server error
+                if status_code < 400:
+                    try:
+                        await loop.run_in_executor(None, session.commit)
+                    except Exception:
+                        logger.exception("commit failed, returning http error")
+                        status_code = 500
+                        response = PlainTextResponse(
+                            content="Internal Server Error", status_code=status_code
+                        )
+
+                if status_code >= 400:
+                    # If ever a route handler returns an http exception,
+                    # we do not want the current session to commit anything in db.
+                    if is_dirty:
+                        # optimistically only log if there were uncommitted changes
+                        logger.warning(
+                            "http error, rolling back possibly uncommitted changes",
+                            status_code=status_code,
+                        )
+                    # since this is no-op if the session is not dirty,
+                    # we can always call it
+                    await loop.run_in_executor(None, session.rollback)
+
+                if response:
+                    return await response(scope, receive, send)
+
+                return await send(message)
+
+            await self.app(scope, receive, send_wrapper)
 
 
 class SessionDependency:

fastapi_sqla-3.4.8/pyproject.toml

@@ -0,0 +1,206 @@
+[tool.poetry]
+name = "fastapi-sqla"
+version = "3.4.8"
+description = "SQLAlchemy extension for FastAPI with support for pagination, asyncio, SQLModel, and pytest, ready for production."
+authors = [
+    "Hadrien David <hadrien.david@dialogue.co>",
+    "Victor Repkow <victor.repkow@dialogue.co>",
+]
+license = "MIT"
+readme = "README.md"
+repository = "https://github.com/dialoguemd/fastapi-sqla"
+keywords = ["FastAPI", "SQLAlchemy", "asyncio", "pytest", "alembic"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "Framework :: AsyncIO",
+    "Framework :: FastAPI",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Information Technology",
+    "Intended Audience :: System Administrators",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python",
+    "Programming Language :: SQL",
+    "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
+    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Internet",
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development",
+    "Typing :: Typed",
+]
+
+[tool.poetry.dependencies]
+python = ">=3.9,<3.14"
+fastapi = ">=0.95.1,<0.116"
+pydantic = ">=1,<3"
+sqlalchemy = ">=1.3,<3"
+structlog = ">=20,<26"
+deprecated = ">=1.2,<2"
+
+alembic = { version = ">=1.4.3,<2", optional = true }
+asyncpg = { version = ">=0.28.0,<0.31.0", optional = true }
+boto3 = { version = ">=1.24.74,<2", optional = true }
+psycopg2 = { version = ">=2.8.6,<3", optional = true }
+sqlmodel = { version = ">=0.0.14,<0.0.23", optional = true }
+
+[tool.poetry.group.dev.dependencies]
+alembic = "1.14.0"
+asgi_lifespan = "2.1.0"
+Faker = "33.3.1"
+greenlet = "3.1.1"
+httpx = "0.28.1"
+mypy = { version = "1.14.1", extras = ["tests"] }
+psycopg2 = { version = "2.9.10", extras = ["binary"] }
+pytest = "8.3.4"
+pytest-asyncio = "0.25.2"
+pytest-cov = "6.0.0"
+ruff = "0.9.2"
+tox = "4.23.2"
+
+[tool.poetry.extras]
+asyncpg = ["asyncpg"]
+aws_rds_iam = ["boto3"]
+pytest_plugin = ["alembic"]
+psycopg2 = ["psycopg2"]
+sqlmodel = ["sqlmodel"]
+
+[build-system]
+requires = ["poetry>=1.3.0"]
+build-backend = "poetry.masonry.api"
+
+[tool.semantic_release]
+version_toml = ["pyproject.toml:tool.poetry.version"]
+upload_to_pypi = false
+commit_message = "{version}\n\nVersion generated by python-semantic-release [ci skip]"
+
+[tool.poetry.plugins."pytest11"]
+fastapi-sqla = "fastapi_sqla._pytest_plugin"
+
+[tool.ruff]
+target-version = "py39"
+
+[tool.ruff.lint]
+select = [
+    "E",     # pycodestyle
+    "W",     # pycodestyle warnings
+    "F",     # pyflakes
+    "I",     # isort
+    "N",     # pep8-naming
+    "D",     # pydocstyle
+    "UP",    # pyupgrade
+    "ASYNC", # flake8-async
+    "S",     # flake8-bandit
+    "B",     # flake8-bugbear
+    "C4",    # flake8-comprehensions
+    "SIM",   # flake8-simplify
+    "TD",    # flake8-todos
+    "ERA",   # eradicate
+    "PL",    # pylint
+    "RUF",   # ruff
+]
+
+# Ignore some pydocstyle rules that Google convention enables
+ignore = [
+    "D100",
+    "D101",
+    "D102",
+    "D103",
+    "D104",
+    "D105",
+    "D106",
+    "D107",
+    "D212",
+    "D415",
+    "B008",    # Enable using functions in default function args. Easier to work with FastAPI dependencies that way
+    "C408",    # Enable using dict/list/tuple
+    "PLR0911", # Disable max number of return
+    "PLR0912", # Disable max number of branches
+    "PLR0913", # Disable max number of args
+    "PLR0915", # Disable max number of statements
+    "PLR2004", # Enable magic values
+    "SIM105",  # Allow using try - except - pass
+    "TD001",   # Enable FIXMEs
+    "TD002",   # Enable TODOs without author
+    "TD003",   # Enable TODOs without issue link
+    "N802",    # FastAPI dependency conventions is title cased
+    "N803",    # Same as N802
+    "N806",    # Same as N802
+]
+
+[tool.ruff.lint.extend-per-file-ignores]
+"tests/*" = [
+    "S101", # Enable assert
+    "S105", # Disable passwords check
+    "S106", # Disable passwords check
+    "S608", # Allow SQL string construction
+]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+testpaths = "tests"
+norecursedirs = ".git,.venv"
+xfail_strict = "true"
+addopts = """
+    -p no:fastapi-sqla
+    --cov-config pyproject.toml
+    --cov-report term
+    --cov-report term-missing
+"""
+
+# https://nedbatchelder.com/blog/201810/why_warnings_is_mysterious.html
+filterwarnings = ["error:.*removed in version 2.0.*:"]
+
+[tool.pytest-watch.run]
+ext = ".py, .yaml, .cfg"
+
+[tool.coverage.run]
+branch = true
+omit = ["tests/*", ".venv/*"]
+concurrency = ["thread", "greenlet"]
+
+[tool.coverage.report]
+skip_covered = true
+
+[tool.tox]
+legacy_tox_ini = """
+[tox]
+envlist = sqlalchemy{ 1.3, 1.4, 2.0, 2.0-sqlmodel }-{ asyncpg, noasyncpg }-{aws_rds_iam, noaws_rds_iam }-pydantic{ 1, 2 }
+
+[testenv]
+passenv = CI
+skip_install = true
+allowlist_externals = poetry
+commands_pre =
+    poetry install
+    sqlmodel: poetry install --extras "sqlmodel"
+    aws_rds_iam: poetry install --extras "aws_rds_iam"
+    asyncpg: poetry install --extras "asyncpg"
+    asyncpg-aws_rds_iam: poetry install --extras "asyncpg aws_rds_iam"
+    sqlmodel-aws_rds_iam: poetry install --extras "sqlmodel aws_rds_iam"
+    sqlmodel-asyncpg: poetry install --extras "sqlmodel asyncpg"
+    sqlmodel-asyncpg-aws_rds_iam: poetry install --extras "sqlmodel asyncpg aws_rds_iam"
+    sqlalchemy1.3: pip install sqlalchemy==1.3
+    sqlalchemy1.4: pip install sqlalchemy==1.4.52
+    pydantic1: pip install pydantic==1.10.16
+commands =
+    poetry run pytest -vv --showlocals --cov . --cov-report xml --cov-report html --junitxml=test-reports/pytest/junit.xml
+"""
+
+[tool.mypy]
+exclude = ["tests"]
+plugins = ["sqlalchemy.ext.mypy.plugin"]
+
+[[tool.mypy.overrides]]
+module = ["asyncpg", "boto3", "deprecated"]
+ignore_missing_imports = true

fastapi_sqla-3.1.2/pyproject.toml

@@ -1,132 +0,0 @@
-[tool]
-[tool.poetry]
-name = "fastapi-sqla"
-version = "3.1.2"
-description = "SQLAlchemy extension for FastAPI with support for pagination, asyncio, SQLModel, and pytest, ready for production."
-authors = ["Hadrien David <hadrien.david@dialogue.co>", "Victor Repkow <victor.repkow@dialogue.co>"]
-license = "MIT"
-readme = "README.md"
-repository = "https://github.com/dialoguemd/fastapi-sqla"
-keywords = ["FastAPI", "SQLAlchemy", "asyncio", "pytest", "alembic"]
-classifiers = ["Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Framework :: AsyncIO", "Framework :: FastAPI", "Intended Audience :: Developers", "Intended Audience :: Information Technology", "Intended Audience :: System Administrators", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.9", "Programming Language :: Python", "Programming Language :: SQL", "Topic :: Internet :: WWW/HTTP :: HTTP Servers", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet", "Topic :: Software Development :: Libraries :: Application Frameworks", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Software Development :: Libraries", "Topic :: Software Development", "Typing :: Typed"]
-[tool.poetry.dependencies]
-python = "^3.9"
-fastapi = ">=0.95.1"
-pydantic = ">=1"
-sqlalchemy = ">=1.3"
-structlog = ">=20"
-[tool.poetry.dependencies.alembic]
-version = "^1.4.3"
-optional = true
-[tool.poetry.dependencies.asgi_lifespan]
-version = "^1.0.1"
-optional = true
-[tool.poetry.dependencies.asyncpg]
-version = "^0.28.0"
-optional = true
-[tool.poetry.dependencies.black]
-version = "^22.8.0"
-optional = true
-[tool.poetry.dependencies.Faker]
-version = "^14.2.0"
-optional = true
-[tool.poetry.dependencies.httpx]
-version = "^0.23.0"
-optional = true
-[tool.poetry.dependencies.isort]
-version = "^5.5.3"
-optional = true
-[tool.poetry.dependencies.pdbpp]
-version = "^0.10.2"
-optional = true
-[tool.poetry.dependencies.psycopg2]
-version = "^2.8.6"
-optional = true
-[tool.poetry.dependencies.pylama]
-version = "^8.4.1"
-optional = true
-[tool.poetry.dependencies.pytest]
-version = "^7.2.1"
-optional = true
-[tool.poetry.dependencies.pytest-asyncio]
-version = "^0.19.0"
-optional = true
-[tool.poetry.dependencies.pytest-cov]
-version = "^2.10.1"
-optional = true
-[tool.poetry.dependencies.tox]
-version = "^3.26.0"
-optional = true
-[tool.poetry.dependencies.boto3]
-version = "^1.24.74"
-optional = true
-[tool.poetry.dependencies.greenlet]
-version = "^1.1.3"
-optional = true
-[tool.poetry.dependencies.mypy]
-version = "^1.0.0"
-extras = ["tests"]
-optional = true
-[tool.poetry.dependencies.sqlmodel]
-version = "^0.0.14"
-optional = true
-[tool.poetry.extras]
-tests = ["alembic", "asgi_lifespan", "black", "coverage", "Faker", "greenlet", "httpx", "isort", "mypy", "pdbpp", "psycopg2", "pylama", "pytest", "pytest-asyncio", "pytest-cov", "pytest-watch", "tox"]
-asyncpg = ["asyncpg"]
-aws_rds_iam = ["boto3"]
-sqlmodel = ["sqlmodel"]
-[tool.poetry.plugins]
-[tool.poetry.plugins.pytest11]
-fastapi-sqla = "fastapi_sqla._pytest_plugin"
-
-[[tool.poetry.source]]
-name = "dialogue-private"
-url = "https://dialogue-527641002329.d.codeartifact.us-east-1.amazonaws.com/pypi/distribution-readonly/simple/"
-default = true
-[tool.semantic_release]
-version_variable = "pyproject.toml:version"
-upload_to_pypi = false
-commit_message = "Version generated by python-semantic-release [ci skip]"
-[tool.pylama]
-paths = "fastapi_sqla tests"
-linters = "pycodestyle,mccabe,pyflakes"
-[tool.pylama.linter]
-[tool.pylama.linter.pycodestyle]
-max_line_length = 88
-[tool.isort]
-profile = "black"
-lines_between_sections = 1
-multi_line_output = 3
-include_trailing_comma = "True"
-line_length = 88
-[tool.pytest]
-[tool.pytest.ini_options]
-asyncio_mode = "auto"
-testpaths = "tests"
-norecursedirs = ".git,.venv"
-xfail_strict = "true"
-addopts = "    -p no:fastapi-sqla\n    --cov-config pyproject.toml\n    --cov-report term\n    --cov-report term-missing\n"
-filterwarnings = ["error:.*removed in version 2.0.*:"]
-[tool.pytest-watch]
-[tool.pytest-watch.run]
-ext = ".py, .yaml, .cfg"
-[tool.coverage]
-[tool.coverage.run]
-branch = true
-omit = ["tests/*", ".venv/*"]
-concurrency = ["thread", "greenlet"]
-[tool.coverage.report]
-skip_covered = true
-[tool.tox]
-legacy_tox_ini = "[tox]\nenvlist = sqlalchemy{ 1.3, 1.4, 2.0, 2.0-sqlmodel }-{ asyncpg, noasyncpg }-{aws_rds_iam, noaws_rds_iam }-pydantic{ 1, 2 }\n\n[testenv]\npassenv = CI\ndeps =\n    sqlalchemy1.3: sqlalchemy<1.4\n    sqlalchemy1.4: sqlalchemy>=1.4,<2\n    sqlalchemy2.0: sqlalchemy>=2\n    sqlalchemy2.0-sqlmodel: sqlalchemy>=2\n    sqlalchemy2.0-sqlmodel: sqlmodel\n    asyncpg: asyncpg\n    aws_rds_iam: boto3\n    pydantic1: pydantic<2\n    pydantic2: pydantic>=2\n\nextras =\n    tests\n\ncommands = pytest -vv --cov={envsitepackagesdir}/fastapi_sqla --cov-report xml --cov-report html --junitxml=test-reports/pytest/junit.xml\n"
-[tool.black]
-exclude = ".mypy_cache|.pytest_cache|.vscode|.eggs|venv"
---skip-magic-trailing-comma = true
-[tool.mypy]
-exclude = ["tests"]
-ignore_missing_imports = true
-plugins = "sqlalchemy.ext.mypy.plugin"
-
-[build-system]
-requires = ["poetry>=1.3.0"]
-build-backend = "poetry.masonry.api"