fastapi-sqla 3.1.1__py3-none-any.whl → 3.2.1__py3-none-any.whl

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/async_pagination.py

@@ -1,12 +1,12 @@
 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
 
 from fastapi_sqla.async_sqla import AsyncSessionDependency, SqlaAsyncSession
-from fastapi_sqla.models import Page
+from fastapi_sqla.models import Meta, Page
 from fastapi_sqla.sqla import _DEFAULT_SESSION_KEY
 
 QueryCountDependency = Callable[..., Awaitable[int]]
@@ -19,7 +19,7 @@ PaginateDependency = Union[DefaultDependency, WithQueryCountDependency]
 
 
 async def default_query_count(session: SqlaAsyncSession, query: Select) -> int:
-    result = await session.execute(select(func.count()).select_from(query.subquery()))  # type: ignore # noqa
+    result = await session.execute(select(func.count()).select_from(query.subquery()))
     return cast(int, result.scalar())
 
 
@@ -33,20 +33,20 @@ async def paginate_query(
     scalars: bool = True,
 ) -> Page:
     total_pages = math.ceil(total_items / limit)
-    page_number = offset / limit + 1
-    query = query.offset(offset).limit(limit)  # type: ignore
+    page_number = math.floor(offset / limit + 1)
+    query = query.offset(offset).limit(limit)
     result = await session.execute(query)
     data = iter(
-        cast(Iterator, result.unique().scalars() if scalars else result.mappings())  # type: ignore # noqa
+        cast(Iterator, result.unique().scalars() if scalars else result.mappings())
     )
     return Page(
-        data=data,
-        meta={
-            "offset": offset,
-            "total_items": total_items,
-            "total_pages": total_pages,
-            "page_number": page_number,
-        },
+        data=data,  # type: ignore # Expected to be a list
+        meta=Meta(
+            offset=offset,
+            total_items=total_items,
+            total_pages=total_pages,
+            page_number=page_number,
+        ),
     )
 
 

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/base.py

@@ -30,7 +30,6 @@ def setup(app: FastAPI):
                 functools.partial(sqla.add_session_to_request, key=key)
             )
         else:
-            assert has_asyncio_support, asyncio_support_err
             app.add_event_handler(
                 "startup", functools.partial(async_sqla.startup, key=key)
             )

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/pagination.py

@@ -1,13 +1,13 @@
 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
 from sqlalchemy.sql import Select, func, select
 
-from fastapi_sqla.models import Page
+from fastapi_sqla.models import Meta, Page
 from fastapi_sqla.sqla import _DEFAULT_SESSION_KEY, SessionDependency, SqlaSession
 
 DbQuery = Union[LegacyQuery, Select]
@@ -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}")
 
 
@@ -66,15 +66,15 @@ def _paginate_legacy(
     scalars: bool = True,
 ) -> Page:
     total_pages = math.ceil(total_items / limit)
-    page_number = offset / limit + 1
+    page_number = math.floor(offset / limit + 1)
     return Page(
-        data=query.offset(offset).limit(limit).all(),  # type: ignore
-        meta={
-            "offset": offset,
-            "total_items": total_items,
-            "total_pages": total_pages,
-            "page_number": page_number,
-        },
+        data=query.offset(offset).limit(limit).all(),
+        meta=Meta(
+            offset=offset,
+            total_items=total_items,
+            total_pages=total_pages,
+            page_number=page_number,
+        ),
     )
 
 
@@ -89,20 +89,20 @@ def _paginate(
     scalars: bool = True,
 ) -> Page:
     total_pages = math.ceil(total_items / limit)
-    page_number = offset / limit + 1
-    query = query.offset(offset).limit(limit)  # type: ignore
+    page_number = math.floor(offset / limit + 1)
+    query = query.offset(offset).limit(limit)
     result = session.execute(query)
     data = iter(
-        cast(Iterator, result.unique().scalars() if scalars else result.mappings())  # type: ignore  # noqa
+        cast(Iterator, result.unique().scalars() if scalars else result.mappings())
     )
     return Page(
-        data=data,
-        meta={
-            "offset": offset,
-            "total_items": total_items,
-            "total_pages": total_pages,
-            "page_number": page_number,
-        },
+        data=data,  # type: ignore # Expected to be a list
+        meta=Meta(
+            offset=offset,
+            total_items=total_items,
+            total_pages=total_pages,
+            page_number=page_number,
+        ),
     )
 
 

fastapi_sqla/sqla.py

@@ -2,7 +2,7 @@ import asyncio
 import os
 from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Annotated, Generic, TypeVar
+from typing import Annotated
 
 import structlog
 from fastapi import Depends, Request
@@ -24,7 +24,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
@@ -165,14 +165,11 @@ async def add_session_to_request(
     return response
 
 
-S = TypeVar("S", bound=SqlaSession)
-
-
-class SessionDependency(Generic[S]):
+class SessionDependency:
     def __init__(self, key: str = _DEFAULT_SESSION_KEY) -> None:
         self.key = key
 
-    def __call__(self, request: Request) -> S:
+    def __call__(self, request: Request) -> SqlaSession:
         """Yield the sqlalchemy session for that request.
 
         It is meant to be used as a FastAPI dependency::
@@ -197,5 +194,5 @@ class SessionDependency(Generic[S]):
             raise
 
 
-default_session_dep = SessionDependency[SqlaSession]()
+default_session_dep = SessionDependency()
 Session = Annotated[SqlaSession, Depends(default_session_dep)]

{fastapi_sqla-3.1.1.dist-info → fastapi_sqla-3.2.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: fastapi-sqla
-Version: 3.1.1
-Summary: SQLAlchemy extension for FastAPI with support for pagination, asyncio, and pytest, ready for production.
+Version: 3.2.1
+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
@@ -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
@@ -40,20 +41,18 @@ 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: greenlet (>=3.0.3,<4.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] (>=0.991,<0.992) ; 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: ruff (>=0.4.5,<0.5.0) ; extra == "tests"
 Requires-Dist: sqlalchemy (>=1.3)
 Requires-Dist: sqlmodel (>=0.0.14,<0.0.15) ; extra == "sqlmodel"
 Requires-Dist: structlog (>=20)

fastapi_sqla-3.2.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+fastapi_sqla/__init__.py,sha256=G9bKR6L9EnLgzelE_BLnHgc1cOm0Yu0wMzwLAdyA8iE,1153
+fastapi_sqla/_pytest_plugin.py,sha256=IQUlj-O874Sfuth254LBrEBGCrwH3rNHST9OMZl2pIk,5411
+fastapi_sqla/async_pagination.py,sha256=3DHGUjvrpkbWMIc_BEX4GvM-_PTcn62K9z48ucTJlH0,3164
+fastapi_sqla/async_sqla.py,sha256=7SXRH3DMsQvpjCQdvCBEjQhDZ4-cPAg175MlgNVBnCg,5888
+fastapi_sqla/aws_aurora_support.py,sha256=4dxLKOqDccgLwFqlz81L6f4HzrOXMZkY7Zuf4t_310U,838
+fastapi_sqla/aws_rds_iam_support.py,sha256=Uw-XaiwShMMWYKCvlSqXoxvtKMblCAvbCZ1m6BYVpJk,1257
+fastapi_sqla/base.py,sha256=ssgt-EU7KrRg3IfvXoEZdCsDE4uQVhOVTFuamMmw-Kk,1546
+fastapi_sqla/models.py,sha256=-B1xwINpTc9rEQd3KYHEC1s5s7jdVQkJ6Gy6xpmT13c,1108
+fastapi_sqla/pagination.py,sha256=1gfIGcmt1OFspbRgtJ8AZOZdFd14DGRc4FkDgyh5bJ8,4517
+fastapi_sqla/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fastapi_sqla/sqla.py,sha256=irHuZaun027o9WJrdcZPavCN2vXNHupCWYhU5Dx-AqE,6348
+fastapi_sqla-3.2.1.dist-info/LICENSE,sha256=8G0-nWLqi3xRYRrtRlTE8n1mkYJcnCRoZGUhv6ZE29c,1064
+fastapi_sqla-3.2.1.dist-info/METADATA,sha256=48-YxU0G8S7GR5zDMrLLgRY5LyMA7v0ku29SiEnqihA,20848
+fastapi_sqla-3.2.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastapi_sqla-3.2.1.dist-info/entry_points.txt,sha256=haa0EueKcRo8-AlJTpHBMn08wMBiULNGA53nkvaDWj0,53
+fastapi_sqla-3.2.1.dist-info/RECORD,,

{fastapi_sqla-3.1.1.dist-info → fastapi_sqla-3.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

fastapi_sqla-3.1.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-fastapi_sqla/__init__.py,sha256=G9bKR6L9EnLgzelE_BLnHgc1cOm0Yu0wMzwLAdyA8iE,1153
-fastapi_sqla/_pytest_plugin.py,sha256=bjPzOuwk32Zo4hoOa_bGjTGhtHGPImh3RyiORqz-J84,5430
-fastapi_sqla/async_pagination.py,sha256=r5APFbE-xpqQPF1aTG19ILOwYDhuIlHql3UF3mYZMt4,3176
-fastapi_sqla/async_sqla.py,sha256=7SXRH3DMsQvpjCQdvCBEjQhDZ4-cPAg175MlgNVBnCg,5888
-fastapi_sqla/aws_aurora_support.py,sha256=4dxLKOqDccgLwFqlz81L6f4HzrOXMZkY7Zuf4t_310U,838
-fastapi_sqla/aws_rds_iam_support.py,sha256=YSJNhrxmhGN-GVk9PLMTmQSWTKZBvuorKkhc_XaoL44,1189
-fastapi_sqla/base.py,sha256=0X7Gbt49rBHPiSFmNy5S2PT0dA4UBNnwrAesYSkaHBc,1606
-fastapi_sqla/models.py,sha256=fesW7BqkwOA4iC345dbybzcV8Kz4-kLwREo38oqy_7A,1108
-fastapi_sqla/pagination.py,sha256=uhsNRf9w2GzJQkF8eUUQZMAudPDi7tN5OCb00kz3Dn4,4515
-fastapi_sqla/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastapi_sqla/sqla.py,sha256=zAkzY07bHEnOrmP7_dwO4Gdar18qm1ZbhB1RD3AZGrA,6427
-fastapi_sqla-3.1.1.dist-info/LICENSE,sha256=8G0-nWLqi3xRYRrtRlTE8n1mkYJcnCRoZGUhv6ZE29c,1064
-fastapi_sqla-3.1.1.dist-info/METADATA,sha256=caalhTVa91W2oBq_rXUhu5xahUzINgBpq39GRlsbvxc,20905
-fastapi_sqla-3.1.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-fastapi_sqla-3.1.1.dist-info/entry_points.txt,sha256=haa0EueKcRo8-AlJTpHBMn08wMBiULNGA53nkvaDWj0,53
-fastapi_sqla-3.1.1.dist-info/RECORD,,