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

fastapi_sqla/async_pagination.py

@@ -6,7 +6,7 @@ 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/pagination.py

@@ -7,7 +7,7 @@ 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]
@@ -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
@@ -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.1.2.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.1.2
+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
@@ -46,7 +46,7 @@ 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] (>=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)

{fastapi_sqla-3.1.1.dist-info → fastapi_sqla-3.1.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
 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_pagination.py,sha256=jYeZYtIi7mssM3MfwobOoaPYNZF0BE1EmCK8CqFnwOg,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=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/pagination.py,sha256=IjbKFyUHly8jHyOO4pnyPK4RE_cFRDY03OOZeZEm3cY,4513
 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,,
+fastapi_sqla/sqla.py,sha256=lOikCu_BjGQYfbbtcM59ZjwTL-66cM9L_yIbCEQasAQ,6356
+fastapi_sqla-3.1.2.dist-info/LICENSE,sha256=8G0-nWLqi3xRYRrtRlTE8n1mkYJcnCRoZGUhv6ZE29c,1064
+fastapi_sqla-3.1.2.dist-info/METADATA,sha256=xl5jfdozvDDEJGHW0fe9bFm_ITasdlzYb3NThMDveNk,20915
+fastapi_sqla-3.1.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+fastapi_sqla-3.1.2.dist-info/entry_points.txt,sha256=haa0EueKcRo8-AlJTpHBMn08wMBiULNGA53nkvaDWj0,53
+fastapi_sqla-3.1.2.dist-info/RECORD,,