fastapi-rtk 1.0.10__py3-none-any.whl → 1.0.12__py3-none-any.whl

fastapi_rtk/_version.py

@@ -1 +1 @@
-__version__ = "1.0.10"
+__version__ = "1.0.12"

fastapi_rtk/api/model_rest_api.py

@@ -462,6 +462,17 @@ class ModelRestApi(BaseApi):
     DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING.
     """
 
+    """
+    -------------
+     LIST
+    -------------
+    """
+
+    list_query_count_enabled = True
+    """
+    Whether to enable counting the total number of items in the list endpoint. Defaults to `True`.
+    """
+
     """
     -------------
      TITLES
@@ -1030,6 +1041,28 @@ class ModelRestApi(BaseApi):
         """
         return current_permissions(self)
 
+    def get_q_and_session_count_factory(self):
+        """
+        Returns a dependency that yields a tuple of (QuerySchema, session or None).
+
+        If `list_query_count_enabled` is False or `q.with_count` is False, the session will be None.
+
+        Returns:
+            Callable[..., Coroutine[Any, Any, Tuple[QuerySchema, AsyncSession | Session | None]]]: The dependency that yields the tuple.
+        """
+        session_factory = self.datamodel.get_session_factory()
+
+        async def dependency(q: self.query_schema = Depends()):  # type: ignore
+            q: QuerySchema = q
+            if not self.list_query_count_enabled or not q.with_count:
+                yield q, None
+                return
+
+            async for session in session_factory():
+                yield q, session
+
+        return dependency
+
     """
     -------------
      ROUTES
@@ -1508,19 +1541,17 @@ class ModelRestApi(BaseApi):
 
     async def get_list_headless(
         self,
-        q: QuerySchema = SelfType.with_depends().query_schema,
         session: AsyncSession | Session = SelfDepends().datamodel.get_session_factory,
-        session_count: AsyncSession
-        | Session = SelfDepends().datamodel.get_session_factory,
+        q_session_count: tuple[
+            QuerySchema, AsyncSession | Session | None
+        ] = SelfDepends().get_q_and_session_count_factory,
     ):
         """
         Retrieves all items in a headless mode.
 
         Args:
-            q (QuerySchema): The query schema.
-            query (QueryManager): The query manager object.
             session (AsyncSession | Session): A database scoped session.
-            session_count (AsyncSession | Session): A database scoped session for counting.
+            q_session_count (tuple[QuerySchema, AsyncSession | Session | None]): A tuple of query schema and a database scoped session for counting.
 
         Returns:
             list_return_schema: The list return schema.
@@ -1529,6 +1560,7 @@ class ModelRestApi(BaseApi):
             If you are overriding this method, make sure to copy all the decorators too.
         """
         async with AsyncTaskRunner():
+            q, session_count = q_session_count
             self._validate_query_parameters(q)
             params = self._handle_query_params(q)
             try:
@@ -1536,9 +1568,14 @@ class ModelRestApi(BaseApi):
                     task_items = tg.create_task(
                         smart_run(self.datamodel.get_many, session, params)
                     )
-                    task_count = tg.create_task(
-                        smart_run(self.datamodel.count, session_count, params)
-                    )
+                    if session_count:
+                        task_count = tg.create_task(
+                            smart_run(self.datamodel.count, session_count, params)
+                        )
+                    else:
+                        task_count = tg.create_task(
+                            asyncio.sleep(0, result=None)
+                        )  # Dummy task
                 items, count = await task_items, await task_count
                 pks, data = self.datamodel.convert_to_result(items)
                 schema = self.list_return_schema

fastapi_rtk/db.py

@@ -9,6 +9,7 @@ from typing import (
     Optional,
 )
 
+import sqlalchemy.orm
 from fastapi import Depends
 from fastapi_users.db import SQLAlchemyUserDatabase
 from fastapi_users.models import ID, OAP, UP
@@ -91,6 +92,7 @@ class UserDatabase(SQLAlchemyUserDatabase[UP, ID]):
 
         statement = (
             select(self.user_table)
+            .options(sqlalchemy.orm.selectinload(self.user_table.oauth_accounts))
             .join(self.oauth_account_table)
             .where(self.oauth_account_table.oauth_name == oauth)
             .where(self.oauth_account_table.account_id == account_id)

fastapi_rtk/schemas.py

@@ -323,7 +323,7 @@ class BaseResponseMany(BaseResponse):
     Represents a response containing multiple items.
 
     Attributes:
-        count (int): The count of items.
+        count (int | None): The count of items. If None, count is not provided.
         ids (List[PRIMARY_KEY]): The IDs of the items.
         list_columns (List[str]): The columns to show in the list.
         list_title (str): The title for the list.
@@ -331,7 +331,7 @@ class BaseResponseMany(BaseResponse):
         result (List[BaseModel] | None): The result of the response.
     """
 
-    count: int
+    count: int | None = None
     ids: list[PRIMARY_KEY]
     list_columns: list[str] = []
     list_title: str = ""
@@ -384,24 +384,26 @@ class QuerySchema(BaseModel):
     Represents the query parameters for selection, pagination, ordering, and filtering.
 
     Attributes:
-        columns (str, optional): The columns to select in the query. Defaults to '[]'.
         page (int): The page number for pagination. Defaults to 0.
         page_size (int, optional): The number of items per page. Defaults to 25.
         order_column (str, optional): The column to order the results by.
         order_direction (Literal['asc', 'desc'], optional): The direction of the ordering (asc or desc).
+        columns (str, optional): The columns to select in the query. Defaults to '[]'.
         filters (str, optional): The filters to apply to the query. Defaults to '[]'.
         opr_filters (str, optional): The filters to apply without column name. Defaults to '[]'.
         global_filter (str, optional): The filter to apply globally across all columns.
+        with_count (bool): Whether to include the total count of items. Defaults to True.
     """
 
-    columns: str = "[]"
     page: int = 0
     page_size: int | None = 25
     order_column: str | None = None
     order_direction: Literal["asc", "desc"] | None = None
+    columns: str = "[]"
     filters: str = "[]"
     opr_filters: str = "[]"
     global_filter: str | None = None
+    with_count: bool = True
 
     @field_validator("columns")
     @classmethod

{fastapi_rtk-1.0.10.dist-info → fastapi_rtk-1.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 1.0.10
+Version: 1.0.12
 Summary: A package that provides a set of tools to build a FastAPI application with a Class-Based CRUD API.
 Project-URL: Homepage, https://codeberg.org/datatactics/fastapi-rtk
 Project-URL: Issues, https://codeberg.org/datatactics/fastapi-rtk/issues

{fastapi_rtk-1.0.10.dist-info → fastapi_rtk-1.0.12.dist-info}/RECORD

@@ -1,9 +1,9 @@
 fastapi_rtk/__init__.py,sha256=Lg6Er5blOMcbtQSRJMNWbRQ1VX4PWEPMVFm2ie5r8mA,6183
-fastapi_rtk/_version.py,sha256=5vGk-8GWz6jojEu9w36UP5aNA0LuiwgbNSJ8Umn2rLA,23
+fastapi_rtk/_version.py,sha256=bQ8TKIXU3qSGr-K-gVtWDgjDfBlCgBju76OGKtY9tS8,23
 fastapi_rtk/apis.py,sha256=6X_Lhl98m7lKrDRybg2Oe24pLFLJ29eCOQSwCAvpKhY,172
 fastapi_rtk/config.py,sha256=9PZF9E5i1gxmnsZEprZZKxVHSk0dFEklJSplX9NEqdo,14036
 fastapi_rtk/const.py,sha256=sEj_cYeerj9pVwbCu0k5Sy1EYpdr1EHzUjqqbnporgc,4905
-fastapi_rtk/db.py,sha256=gItbbRYYAtAF7_1YqaZGBeQY5_E0cKvomGEzcCjIhpg,24548
+fastapi_rtk/db.py,sha256=4bNlpG_HqJzMkhgQ4c7kxm1AH82UVWRSD2ajexHp1Cs,24654
 fastapi_rtk/decorators.py,sha256=HqAFSiO0l5_M0idWs0IcY24FdzbAcDQDQoifM_WgZAQ,14515
 fastapi_rtk/dependencies.py,sha256=jlcsMrh83yrJsgXvpWJet_mjqwDP3nBZfPSg4Lq8KKE,7757
 fastapi_rtk/exceptions.py,sha256=P0qwd4VkeWFotgMVQHgmdT1NphFQaEznKLFIvJzW4Zs,2594
@@ -15,13 +15,13 @@ fastapi_rtk/middlewares.py,sha256=ycdaAdLIUaNEZ7KotczTHS6OOqy98Mn1_O7Hpe7Sma8,10
 fastapi_rtk/mixins.py,sha256=78RqwrRJFOz6KAxf-GSNOmRdr7R3b-ws7OIENYlzRQQ,238
 fastapi_rtk/models.py,sha256=lQSqe-r0H7jWBVdqXjEi_bNL1cGQr0YWnyI1ToS_coc,178
 fastapi_rtk/routers.py,sha256=5gMGyH4Any9TwB3Fz23QDkmrX8MouzCxVgoAIcBqnTI,18988
-fastapi_rtk/schemas.py,sha256=zzzmf5qjSn6PtzrekD3Kll_WOn6XWR7h4AHQchW3GX8,17723
+fastapi_rtk/schemas.py,sha256=mdIX93QRaQBLrQz-kBvG5wyKoi8H6OQpFuTBO9-mCK4,17894
 fastapi_rtk/setting.py,sha256=vpjnio0mp_yZhDajZaBl6uOFmrBYl-sqB0L_lSkBpfk,19529
 fastapi_rtk/types.py,sha256=-LPnTIbHvqJW81__gab3EWrhjNmznHhptz0BtXkEAHQ,3612
 fastapi_rtk/version.py,sha256=D2cmQf2LNeHOiEfcNzVOOfcAmuLvPEmGEtZv5G54D0c,195
 fastapi_rtk/api/__init__.py,sha256=MwFR7HHppnhbjZGg3sOdQ6nqy9uxnHHXvicpswNFMNA,245
 fastapi_rtk/api/base_api.py,sha256=42I9v3b25lqxNAMDGEtajA5-btIDSyUWF0xMDgGkA8c,8078
-fastapi_rtk/api/model_rest_api.py,sha256=R-zdfDK6QiVb8u6EBTpZt7cqvH4kP86udNMxdJRiphQ,105254
+fastapi_rtk/api/model_rest_api.py,sha256=pLuwefPEunf0P1k_UlKFEINZaT8RTPEHcN0j784G8Z0,106536
 fastapi_rtk/auth/__init__.py,sha256=iX7O41NivBYDfdomEaqm4lUx9KD17wI4g3EFLF6kUTw,336
 fastapi_rtk/auth/auth.py,sha256=F2qZoR7go_7FnvVJrDxUCd6vtRz5XW8yyOv143MWPts,20664
 fastapi_rtk/auth/hashers/__init__.py,sha256=uBThFj2VPPSMSioxYTktNiM4-mVgtDAjTpKA3ZzWxxs,110
@@ -126,8 +126,8 @@ fastapi_rtk/utils/timezone.py,sha256=62S0pPWuDFFXxV1YTFCsc4uKiSP_Ba36Fv7S3gYjfhs
 fastapi_rtk/utils/update_signature.py,sha256=PIzZgNpGEwvDNgQ3G51Zi-QhVV3mbxvUvSwDwf_-yYs,2209
 fastapi_rtk/utils/use_default_when_none.py,sha256=H2HqhKy_8eYk3i1xijEjuaKak0oWkMIkrdz6T7DK9QU,469
 fastapi_rtk/utils/werkzeug.py,sha256=1Gv-oyqSmhVGrmNbB9fDqpqJzPpANOzWf4zMMrhW9UA,3245
-fastapi_rtk-1.0.10.dist-info/METADATA,sha256=FWjDKJQ40ntwOVswJo9zqpKqasIu4dugohhYo7bWaCU,1271
-fastapi_rtk-1.0.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-fastapi_rtk-1.0.10.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
-fastapi_rtk-1.0.10.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
-fastapi_rtk-1.0.10.dist-info/RECORD,,
+fastapi_rtk-1.0.12.dist-info/METADATA,sha256=nOPH5lvxtFDeEzmUw31wV2hfmnfFFn4Gtg2sZ9SSmpQ,1271
+fastapi_rtk-1.0.12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fastapi_rtk-1.0.12.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
+fastapi_rtk-1.0.12.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
+fastapi_rtk-1.0.12.dist-info/RECORD,,