fastapi-rtk 2.3.3__tar.gz → 2.3.4__tar.gz

{fastapi_rtk-2.3.3 → fastapi_rtk-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 2.3.3
+Version: 2.3.4
 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-2.3.4/fastapi_rtk/_version.py

@@ -0,0 +1 @@
+__version__ = "2.3.4"

{fastapi_rtk-2.3.3 → fastapi_rtk-2.3.4}/fastapi_rtk/api/base_api.py

@@ -1,3 +1,4 @@
+import collections.abc
 import typing
 
 import fastapi
@@ -87,9 +88,9 @@ class BaseApi:
     """
     routes_to_register: list[
         tuple[
-            typing.Callable,
+            collections.abc.Callable,
             dict[str, typing.Any],
-            typing.Callable,
+            collections.abc.Callable,
             dict[str, typing.Any],
         ]
     ] = lazy(lambda self: [])
@@ -102,7 +103,7 @@ class BaseApi:
     """
     The FastAPIReactToolkit object. Automatically set when the API is added to the toolkit.
     """
-    cache: typing.Dict[str, typing.Any] = lazy(lambda self: dict())
+    cache: dict[str, typing.Any] = lazy(lambda self: dict())
     """
     The cache for the API.
     

{fastapi_rtk-2.3.3 → fastapi_rtk-2.3.4}/fastapi_rtk/api/model_rest_api/__init__.py

@@ -22,6 +22,7 @@ remain on the composed class so they can be overridden in subclasses with
 the usual ``class MyApi(ModelRestApi): list_columns = [...]`` idiom.
 """
 
+import collections.abc
 import enum
 import typing
 
@@ -170,17 +171,17 @@ class ModelRestApi(
     """
     The list of routes to expose. Available routes: `info`, `download`, `bulk`, `get_list`, `get`, `post`, `put`, `delete`.
     """
-    exclude_routes: typing.List[AVAILABLE_ROUTES] = lazy(lambda: [])
+    exclude_routes: list[AVAILABLE_ROUTES] = lazy(lambda: [])
     """
     The list of routes to exclude. Available routes: `info`, `download`, `bulk`, `get_list`, `get`, `post`, `put`, `delete`.
     """
-    protected_routes: typing.List[AVAILABLE_ROUTES] = lazy(
+    protected_routes: list[AVAILABLE_ROUTES] = lazy(
         lambda self: [x for x in self.routes if x not in self.exclude_protected_routes]
     )
     """
     The list of routes to protect. Defaults to all routes within `routes` property except those in `exclude_protected_routes`.
     """
-    exclude_protected_routes: typing.List[AVAILABLE_ROUTES] = lazy(lambda: [])
+    exclude_protected_routes: list[AVAILABLE_ROUTES] = lazy(lambda: [])
     """
     The list of routes to exclude from protection. Defaults to `[]`.
     """
@@ -197,7 +198,7 @@ class ModelRestApi(
     }
     ```
     """
-    base_order: typing.Tuple[str, typing.Literal["asc", "desc"]] | None = None
+    base_order: tuple[str, typing.Literal["asc", "desc"]] | None = None
     """
     The default order for the list endpoint. Set this to set the default order for the list endpoint.
 
@@ -206,9 +207,7 @@ class ModelRestApi(
     base_order = ("name", "asc")
     ```
     """
-    base_filters: (
-        typing.List[typing.Tuple[str, typing.Type[BaseFilter], typing.Any]] | None
-    ) = None
+    base_filters: list[tuple[str, type[BaseFilter], typing.Any]] | None = None
     """
     The default filters to apply for the following endpoints: `download`, `list`, `show`, `add`, and `edit`. Defaults to None.
 
@@ -219,9 +218,7 @@ class ModelRestApi(
     ]
     ```
     """
-    base_opr_filters: (
-        typing.List[typing.Tuple[typing.Type[BaseOprFilter], typing.Any]] | None
-    ) = None
+    base_opr_filters: list[tuple[type[BaseOprFilter], typing.Any]] | None = None
     """
     The default opr filters to apply for the following endpoints: `download`, `list`, `show`, `add`, and `edit`. Defaults to None.
 
@@ -232,7 +229,7 @@ class ModelRestApi(
     ]
     ```
     """
-    opr_filters: typing.List[typing.Type[BaseOprFilter]] | None = None
+    opr_filters: list[type[BaseOprFilter]] | None = None
     """
     The list of opr filters to be exposed to the user. Defaults to None, which means no opr filters will be exposed.
 
@@ -267,7 +264,7 @@ class ModelRestApi(
     """
     The enum for the order columns in the list endpoint.
     """
-    query_schema: typing.Type[QuerySchema] = lazy(
+    query_schema: type[QuerySchema] = lazy(
         lambda self: merge_schema(
             QuerySchema,
             {
@@ -286,7 +283,7 @@ class ModelRestApi(
 
     DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING.
     """
-    download_body_schema: typing.Type[QueryBody] = lazy(
+    download_body_schema: type[QueryBody] = lazy(
         lambda self: merge_schema(
             QueryBody,
             {
@@ -336,7 +333,7 @@ class ModelRestApi(
     ```
     """
     add_query_rel_fields = lazy(
-        lambda: dict[str, list[tuple[str, typing.Type[BaseFilter], typing.Any]]]()
+        lambda: dict[str, list[tuple[str, type[BaseFilter], typing.Any]]]()
     )
     """
     The query fields for the related fields in the add_columns property.
@@ -351,7 +348,7 @@ class ModelRestApi(
     ```
     """
     edit_query_rel_fields = lazy(
-        lambda: dict[str, list[tuple[str, typing.Type[BaseFilter], typing.Any]]]()
+        lambda: dict[str, list[tuple[str, type[BaseFilter], typing.Any]]]()
     )
     """
     The query fields for the related fields in the edit_columns property.
@@ -366,7 +363,7 @@ class ModelRestApi(
     ```
     """
     search_query_rel_fields = lazy(
-        lambda: dict[str, list[tuple[str, typing.Type[BaseFilter], typing.Any]]]()
+        lambda: dict[str, list[tuple[str, type[BaseFilter], typing.Any]]]()
     )
     """
     The query fields for the related fields in the filters.
@@ -393,7 +390,7 @@ class ModelRestApi(
     }
     ```
     """
-    search_filters = lazy(lambda: dict[str, list[typing.Type[BaseFilter]]]())
+    search_filters = lazy(lambda: dict[str, list[type[BaseFilter]]]())
     """
     Add additional filters to the search columns.
 
@@ -404,9 +401,7 @@ class ModelRestApi(
     }
     ```
     """
-    search_exclude_filters = lazy(
-        lambda: dict[str, list[typing.Type[BaseFilter] | str]]()
-    )
+    search_exclude_filters = lazy(lambda: dict[str, list[type[BaseFilter] | str]]())
     """
     Exclude filters from the search columns.
 
@@ -419,7 +414,7 @@ class ModelRestApi(
     }
     ```
     """
-    info_return_schema: typing.Type[InfoResponse] = lazy(
+    info_return_schema: type[InfoResponse] = lazy(
         lambda self: merge_schema(
             InfoResponse,
             {
@@ -663,13 +658,13 @@ class ModelRestApi(
 
     add_jsonforms_schema: (
         dict[str, typing.Any]
-        | typing.Callable[[], dict | typing.Awaitable[dict]]
+        | collections.abc.Callable[[], dict | collections.abc.Awaitable[dict]]
         | None
     ) = None
     """
     The `JSONForms` schema for the add endpoint. If not provided, Defaults to the schema generated from the `add_columns` property. May also be a sync or async callable returning the schema, resolved via `smart_run`.
     """
-    add_jsonforms_uischema: typing.Dict[str, typing.Any] | None = None
+    add_jsonforms_uischema: dict[str, typing.Any] | None = None
     """
     The `JSONForms` uischema for the add endpoint. If not provided, it will let `JSONForms` generate the uischema.
     """
@@ -679,11 +674,15 @@ class ModelRestApi(
     """
     add_jsonforms_use_enum: (
         bool
-        | typing.Callable[[ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool]
+        | collections.abc.Callable[
+            [ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool
+        ]
         | dict[
             str,
             bool
-            | typing.Callable[[ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool],
+            | collections.abc.Callable[
+                [ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool
+            ],
         ]
     ) = lazy(lambda: lambda info: len(info.values) > 100)
     """
@@ -709,13 +708,13 @@ class ModelRestApi(
 
     edit_jsonforms_schema: (
         dict[str, typing.Any]
-        | typing.Callable[[], dict | typing.Awaitable[dict]]
+        | collections.abc.Callable[[], dict | collections.abc.Awaitable[dict]]
         | None
     ) = None
     """
     The `JSONForms` schema for the edit endpoint. If not provided, Defaults to the schema generated from the `edit_columns` property. May also be a sync or async callable returning the schema, resolved via `smart_run`.
     """
-    edit_jsonforms_uischema: typing.Dict[str, typing.Any] | None = None
+    edit_jsonforms_uischema: dict[str, typing.Any] | None = None
     """
     The `JSONForms` uischema for the edit endpoint. If not provided, it will let `JSONForms` generate the uischema.
     """
@@ -725,11 +724,15 @@ class ModelRestApi(
     """
     edit_jsonforms_use_enum: (
         bool
-        | typing.Callable[[ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool]
+        | collections.abc.Callable[
+            [ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool
+        ]
         | dict[
             str,
             bool
-            | typing.Callable[[ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool],
+            | collections.abc.Callable[
+                [ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool
+            ],
         ]
     ) = lazy(lambda: lambda info: len(info.values) > 100)
     """
@@ -823,14 +826,14 @@ class ModelRestApi(
     -------------
     """
 
-    add_schema: typing.Type[pydantic.BaseModel] = lazy(
+    add_schema: type[pydantic.BaseModel] = lazy(
         lambda self: typing.Annotated[
-            self._create_request_schema(
-                merge_schema(
+            merge_schema(
+                self._create_request_schema(
                     self.add_obj_schema,
-                    self._handle_schema_extra_fields(self.add_schema_extra_fields),
-                    name=f"{self.__class__.__name__}-AddObjSchema-Merged",
+                    name=f"{self.__class__.__name__}-AddObjSchema-Request",
                 ),
+                self._handle_schema_extra_fields(self.add_schema_extra_fields),
                 name=f"{self.__class__.__name__}-AddSchema",
             ),
             fastapi.Form(media_type="multipart/form-data")
@@ -843,15 +846,15 @@ class ModelRestApi(
 
     DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING.
     """
-    edit_schema: typing.Type[pydantic.BaseModel] = lazy(
+    edit_schema: type[pydantic.BaseModel] = lazy(
         lambda self: typing.Annotated[
-            self._create_request_schema(
-                merge_schema(
+            merge_schema(
+                self._create_request_schema(
                     self.edit_obj_schema,
-                    self._handle_schema_extra_fields(self.edit_schema_extra_fields),
-                    name=f"{self.__class__.__name__}-EditObjSchema-Merged",
+                    optional=True,
+                    name=f"{self.__class__.__name__}-EditObjSchema-Request",
                 ),
-                optional=True,
+                self._handle_schema_extra_fields(self.edit_schema_extra_fields),
                 name=f"{self.__class__.__name__}-EditSchema",
             ),
             fastapi.Form(media_type="multipart/form-data")
@@ -870,6 +873,8 @@ class ModelRestApi(
     """
     Extra fields to add to the add schema. Useful when you want to add extra fields in the body of the add endpoint for your custom logic.
 
+    Keys must not collide with `add_columns`; a colliding name raises `ValueError` at API setup, since extra fields override the request body but not the JSONForms / object schema.
+
     Example:
     ```python
     add_schema_extra_fields = {
@@ -884,6 +889,8 @@ class ModelRestApi(
     """
     Extra fields to add to the edit schema. Useful when you want to add extra fields in the body of the edit endpoint for your custom logic.
 
+    Keys must not collide with `edit_columns`; a colliding name raises `ValueError` at API setup, since extra fields override the request body but not the JSONForms / object schema.
+
     Example:
     ```python
     edit_schema_extra_fields = {
@@ -899,12 +906,12 @@ class ModelRestApi(
     -------------
     """
 
-    list_return_schema: typing.Type[BaseResponseMany] = lazy(
+    list_return_schema: type[BaseResponseMany] = lazy(
         lambda self: merge_schema(
             BaseResponseMany,
             {
                 **vars(self),
-                "result": (typing.List[self.list_obj_schema], ...),
+                "result": (list[self.list_obj_schema], ...),
             },
             True,
             f"{self.__class__.__name__}-ListResponse",
@@ -915,7 +922,7 @@ class ModelRestApi(
 
     DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING.
     """
-    show_return_schema: typing.Type[BaseResponseSingle] = lazy(
+    show_return_schema: type[BaseResponseSingle] = lazy(
         lambda self: merge_schema(
             BaseResponseSingle,
             {
@@ -931,7 +938,7 @@ class ModelRestApi(
 
     DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING.
     """
-    add_return_schema: typing.Type[BaseResponseSingle] = lazy(
+    add_return_schema: type[BaseResponseSingle] = lazy(
         lambda self: merge_schema(
             self.show_return_schema,
             {},
@@ -943,7 +950,7 @@ class ModelRestApi(
 
     DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING.
     """
-    edit_return_schema: typing.Type[BaseResponseSingle] = lazy(
+    edit_return_schema: type[BaseResponseSingle] = lazy(
         lambda self: merge_schema(
             self.show_return_schema,
             {},
@@ -1055,6 +1062,23 @@ class ModelRestApi(
                 f"Search columns with 2nd level relations are not supported: {not_supported_search_columns}"
             )
 
+        # Extra fields override the request schema but never the JSONForms /
+        # object schema, so a name in both desyncs the form from the body.
+        add_collisions = set(self.add_schema_extra_fields) & set(self.add_columns)
+        if add_collisions:
+            raise ValueError(
+                f"add_schema_extra_fields keys collide with add_columns in "
+                f"{self.__class__.__name__}: {sorted(add_collisions)}. Remove them "
+                f"from add_columns or rename the extra fields."
+            )
+        edit_collisions = set(self.edit_schema_extra_fields) & set(self.edit_columns)
+        if edit_collisions:
+            raise ValueError(
+                f"edit_schema_extra_fields keys collide with edit_columns in "
+                f"{self.__class__.__name__}: {sorted(edit_collisions)}. Remove them "
+                f"from edit_columns or rename the extra fields."
+            )
+
         self._gen_labels_columns(self.list_columns)
         self._gen_labels_columns(self.show_columns)
         self._gen_labels_columns(self.search_columns)
@@ -1111,7 +1135,7 @@ class ModelRestApi(
         Returns the current permissions dependency.
 
         Returns:
-            typing.Callable[..., Coroutine[typing.Any, typing.Any, typing.Any | list]]: The current permissions that the user has for the API dependency.
+            collections.abc.Callable[..., Coroutine[typing.Any, typing.Any, typing.Any | list]]: The current permissions that the user has for the API dependency.
         """
         return current_permissions(self)
 
@@ -1122,7 +1146,7 @@ class ModelRestApi(
         If `list_query_count_enabled` is False or `q.with_count` is False, the session will be None.
 
         Returns:
-            typing.Callable[..., Coroutine[typing.Any, typing.Any, typing.Tuple[QuerySchema, SQLASession | None]]]: The dependency that yields the tuple.
+            collections.abc.Callable[..., Coroutine[typing.Any, typing.Any, tuple[QuerySchema, SQLASession | None]]]: The dependency that yields the tuple.
         """
 
         async def dependency(

{fastapi_rtk-2.3.3 → fastapi_rtk-2.3.4}/fastapi_rtk/api/model_rest_api/_bulk_mixin.py

@@ -3,7 +3,7 @@ Bulk route mixin for ``ModelRestApi``: ``bulk`` registration, ``bulk_headless``
 dispatcher, and the subclass-overridable ``bulk_handler``.
 """
 
-import typing
+import collections.abc
 
 import fastapi
 
@@ -54,7 +54,7 @@ class BulkMixin(_TypedModelRestApi):
             If you are overriding this method, make sure to copy all the decorators too.
         """
         async with AsyncTaskRunner():
-            bulk_handler: typing.Callable | None = getattr(
+            bulk_handler: collections.abc.Callable | None = getattr(
                 self, f"bulk_{handler}", None
             )
             if not bulk_handler:

{fastapi_rtk-2.3.3 → fastapi_rtk-2.3.4}/fastapi_rtk/api/model_rest_api/_columns_mixin.py

@@ -19,6 +19,7 @@ This mixin holds:
   derive the JSONForms schema served by ``/_info``.
 """
 
+import collections.abc
 import enum
 import re
 import types
@@ -52,7 +53,7 @@ class ColumnsMixin(_TypedModelRestApi):
     Column / schema / body helpers shared by every ``ModelRestApi`` route.
     """
 
-    def _gen_labels_columns(self, list_columns: typing.List[str]) -> None:
+    def _gen_labels_columns(self, list_columns: list[str]) -> None:
         """
         Auto generates pretty label_columns from list of columns
         """
@@ -87,17 +88,17 @@ class ColumnsMixin(_TypedModelRestApi):
     def _init_filters(
         self,
         datamodel: SQLAInterface,
-        filters: typing.List[typing.Tuple[str, typing.Type[BaseFilter], typing.Any]],
+        filters: list[tuple[str, type[BaseFilter], typing.Any]],
     ):
         """
         Initialize the filter for the API.
 
         Args:
             datamodel (SQLAInterface): The datamodel object.
-            filters (typing.List[typing.Tuple[str, typing.Type[BaseFilter], typing.Any]]): The list of filters to initialize.
+            filters (list[tuple[str, type[BaseFilter], typing.Any]]): The list of filters to initialize.
 
         Returns:
-            typing.List[typing.Tuple[str, typing.Type[BaseFilter], typing.Any]]: The initialized filters.
+            list[tuple[str, type[BaseFilter], typing.Any]]: The initialized filters.
         """
         return [
             (
@@ -158,7 +159,7 @@ class ColumnsMixin(_TypedModelRestApi):
             col (str): The column name.
 
         Returns:
-            typing.Tuple[SQLAInterface, str]: The datamodel and the related column name.
+            tuple[SQLAInterface, str]: The datamodel and the related column name.
         """
         datamodel = self.datamodel
         col_to_get = col
@@ -169,7 +170,7 @@ class ColumnsMixin(_TypedModelRestApi):
 
     def _create_request_schema(
         self,
-        schema: typing.Type[pydantic.BaseModel],
+        schema: type[pydantic.BaseModel],
         optional: bool = False,
         name: str | None = None,
     ):
@@ -177,7 +178,7 @@ class ColumnsMixin(_TypedModelRestApi):
         Create a request schema from `schema` for add and edit endpoints, transforming relation columns into the appropriate schema.
 
         Args:
-            schema (typing.Type[BaseModel]): The base schema to create the request schema from.
+            schema (type[BaseModel]): The base schema to create the request schema from.
             optional (bool, optional): Flag indicating whether the request schema is optional. Defaults to False.
             name (str | None, optional): The name of the request schema. Defaults to None.
 
@@ -217,8 +218,8 @@ class ColumnsMixin(_TypedModelRestApi):
                 if not optional:
                     params["default"] = []
                 type = (
-                    typing.List[self.datamodel.get_related_interface(col).id_schema]
-                    | typing.List[RelInfo]
+                    list[self.datamodel.get_related_interface(col).id_schema]
+                    | list[RelInfo]
                 )
                 if optional or self.datamodel.is_nullable(col):
                     type = (
@@ -253,24 +254,24 @@ class ColumnsMixin(_TypedModelRestApi):
     async def _process_body(
         self,
         session: SQLASession,
-        body: pydantic.BaseModel | typing.Dict[str, typing.Any],
+        body: pydantic.BaseModel | dict[str, typing.Any],
         filter_dict: dict[str, list[tuple[str, BaseFilter, typing.Any]]],
         exclude: list[str] | None = None,
         *,
         item: Model | None = None,
-    ) -> typing.Dict[str, typing.Any]:
+    ) -> dict[str, typing.Any]:
         """
         Process the body of the request by handling relations and returning a new body dictionary.
 
         Args:
             session (SQLASession): The session object for the database connection.
-            body (BaseModel | typing.Dict[str, typing.Any]): The request body.
+            body (BaseModel | dict[str, typing.Any]): The request body.
             filter_dict (dict[str, list[tuple[str, BaseFilter, typing.Any]]): The filter dictionary.
             exclude (list[str] | None, optional): The list of fields to exclude from the body. Defaults to None.
             item (Model | None, optional): The item to be updated. Defaults to None.
 
         Returns:
-            typing.Dict[str, typing.Any]: The transformed body dictionary.
+            dict[str, typing.Any]: The transformed body dictionary.
 
         Raises:
             HTTPException: If any related items are not found or if an item is not found for a one-to-one or many-to-one relation.
@@ -524,11 +525,15 @@ class ColumnsMixin(_TypedModelRestApi):
         schema: type[pydantic.BaseModel],
         info_columns: list[ColumnInfo | ColumnEnumInfo | ColumnRelationInfo],
         use_enum: bool
-        | typing.Callable[[ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool]
+        | collections.abc.Callable[
+            [ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool
+        ]
         | dict[
             str,
             bool
-            | typing.Callable[[ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool],
+            | collections.abc.Callable[
+                [ColumnInfo | ColumnEnumInfo | ColumnRelationInfo], bool
+            ],
         ] = False,
     ):
         """

{fastapi_rtk-2.3.3 → fastapi_rtk-2.3.4}/fastapi_rtk/api/model_rest_api/_info_mixin.py

@@ -33,7 +33,7 @@ class InfoMixin(_TypedModelRestApi):
 
     async def info_headless(
         self,
-        permissions: typing.List[str] = SelfDepends().get_current_permissions,
+        permissions: list[str] = SelfDepends().get_current_permissions,
         session: SQLASession = SelfDepends().datamodel.get_session_factory,
         session_count: SQLASession = SelfDepends().datamodel.get_session_factory,
     ):
@@ -41,7 +41,7 @@ class InfoMixin(_TypedModelRestApi):
         Retrieves information in headless mode.
 
         Args:
-            permissions (typing.List[str]): A list of permissions.
+            permissions (list[str]): A list of permissions.
             session (SQLASession): A database session from the model's
                 session factory.
 
@@ -67,7 +67,7 @@ class InfoMixin(_TypedModelRestApi):
     async def pre_info(
         self,
         info: InfoResponse,
-        permissions: typing.List[str],
+        permissions: list[str],
         session: SQLASession,
     ):
         """
@@ -76,7 +76,7 @@ class InfoMixin(_TypedModelRestApi):
 
         Args:
             info (InfoResponse): The info response.
-            permissions (typing.List[str]): A list of permissions.
+            permissions (list[str]): A list of permissions.
             session (SQLASession): The database session passed through from
                 `info_headless`.
         """
@@ -84,7 +84,7 @@ class InfoMixin(_TypedModelRestApi):
 
     async def _generate_info_schema(
         self,
-        permissions: typing.List[str],
+        permissions: list[str],
         session: SQLASession,
         session_count: SQLASession,
     ):
@@ -92,7 +92,7 @@ class InfoMixin(_TypedModelRestApi):
         Generates the information schema for the API.
 
         Args:
-            permissions (typing.List[str]): The list of permissions for the API.
+            permissions (list[str]): The list of permissions for the API.
             session (SQLASession): The database session.
             session_count (SQLASession): The database session for counting.
 

{fastapi_rtk-2.3.3 → fastapi_rtk-2.3.4}/fastapi_rtk/api/model_rest_api/_list_mixin.py

@@ -80,7 +80,7 @@ class ListMixin(_TypedModelRestApi):
                         with_name=False,
                     )
                     schema = merge_schema(
-                        schema, {"result": (typing.List[list_obj_schema], ...)}, True
+                        schema, {"result": (list[list_obj_schema], ...)}, True
                     )
 
                 body = await smart_run(

{fastapi_rtk-2.3.3 → fastapi_rtk-2.3.4}/fastapi_rtk/api/model_rest_api/_params.py

@@ -35,12 +35,12 @@ __all__ = [
 class Params(pydantic.BaseModel):
     model_config = pydantic.ConfigDict(arbitrary_types_allowed=True)
     id: PRIMARY_KEY | None = None
-    ids: typing.List[PRIMARY_KEY] | None = None
+    ids: list[PRIMARY_KEY] | None = None
     q: QuerySchema | None = None
     session: SQLASession | AbstractSession | typing.Any | None = None
     body: pydantic.BaseModel | None = None
     item: Model | typing.Any | None = None
-    items: typing.List[Model | typing.Any] | None = None
+    items: list[Model | typing.Any] | None = None
     extra: typing.Any | None = None
 
 
@@ -49,7 +49,7 @@ class P_ID(Params):
 
 
 class P_IDS(Params):
-    ids: typing.List[PRIMARY_KEY]
+    ids: list[PRIMARY_KEY]
 
 
 class P_Q(Params):
@@ -69,7 +69,7 @@ class P_ITEM(Params):
 
 
 class P_ITEMS(Params):
-    items: typing.List[Model | typing.Any]
+    items: list[Model | typing.Any]
 
 
 class PARAM_Q(P_Q):