fastapi-rtk 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

fastapi_rtk/_version.py

@@ -1 +1 @@
-__version__ = "1.0.6"
+__version__ = "1.0.8"

fastapi_rtk/api/model_rest_api.py

@@ -1,5 +1,4 @@
 import asyncio
-import copy
 import csv
 import enum
 import re
@@ -256,9 +255,7 @@ class ModelRestApi(BaseApi):
 
     Example:
     ```python
-    opr_filters = [
-        [FilterEqualOnNameAndAge],
-    ]
+    opr_filters = [FilterEqualOnNameAndAge]
     ```
     """
     label_columns = lazy(lambda: dict[str, str]())
@@ -2331,6 +2328,7 @@ class ModelRestApi(BaseApi):
                     )
 
                     if self.datamodel.is_files(key) or self.datamodel.is_images(key):
+                        value = [x for x in value if x]  # Remove None values
                         old_filenames = (
                             [x for x in value if isinstance(x, str)] if value else []
                         )
@@ -2591,12 +2589,18 @@ class ModelRestApi(BaseApi):
         Returns:
             dict: The generated JSONForms schema.
         """
-        jsonforms_schema = schema.model_json_schema()
+        cache_key = f"jsonforms_schema_{schema.__name__}"
+        jsonforms_schema = self.cache.get(cache_key)
+        if not jsonforms_schema:
+            self.cache[cache_key] = jsonforms_schema = schema.model_json_schema()
 
         # Remove unused vars
         jsonforms_schema.pop("$defs", None)
 
-        for key, value in jsonforms_schema["properties"].items():
+        result = jsonforms_schema.copy()
+        result["properties"] = jsonforms_schema["properties"].copy()
+        for key, value in result["properties"].items():
+            value = value.copy()
             label = self.label_columns.get(key)
             if label:
                 value["title"] = label
@@ -2621,7 +2625,7 @@ class ModelRestApi(BaseApi):
                     ]
                 value["contentMediaType"] = ", ".join(allowed_extensions)
                 if self.datamodel.is_files(key) or self.datamodel.is_images(key):
-                    current_value = copy.deepcopy(value)
+                    current_value = value.copy()
                     value["type"] = "array"
                     value["items"] = current_value
             elif self.datamodel.is_boolean(key):
@@ -2688,9 +2692,9 @@ class ModelRestApi(BaseApi):
             if key in g.sensitive_data.get(self.datamodel.obj.__name__, []):
                 value["format"] = "password"
 
-            jsonforms_schema["properties"][key] = value
+            result["properties"][key] = value
 
-        return jsonforms_schema
+        return result
 
     async def _export_data(
         self,

fastapi_rtk/backends/sqla/db.py

@@ -34,6 +34,7 @@ LOAD_TYPE_MAPPING = {
 
 class LoadColumn(typing.TypedDict):
     statement: Select[tuple[T]] | _AbstractLoad
+    statement_type: typing.Literal["select", "joinedload", "selectinload"] | None
     type: typing.Literal["defer", "some", "all"]
     columns: list[str]
     related_columns: collections.defaultdict[str, "LoadColumn"]
@@ -42,6 +43,7 @@ class LoadColumn(typing.TypedDict):
 def create_load_column(statement: Select[tuple[T]] | _AbstractLoad | None = None):
     return LoadColumn(
         statement=statement,
+        statement_type=None,
         type="defer",
         columns=[],
         related_columns=collections.defaultdict(create_load_column),
@@ -104,7 +106,7 @@ class SQLAQueryBuilder(AbstractQueryBuilder[Select[tuple[T]]]):
                     statement = statement.options(cache_option)
             return statement
 
-        load_column = self._load_columns_recursively(statement, list_columns)
+        load_column = self._load_columns_recursively(statement, "select", list_columns)
         logger.debug(f"Load Column:\n{prettify_dict(load_column)}")
         return self._load_columns_from_dictionary(statement, load_column, list_columns)
 
@@ -365,27 +367,32 @@ class SQLAQueryBuilder(AbstractQueryBuilder[Select[tuple[T]]]):
         return statement
 
     def _load_columns_recursively(
-        self, statement: Select[tuple[T]] | _AbstractLoad, columns: list[str]
+        self,
+        statement: Select[tuple[T]] | _AbstractLoad,
+        statement_type: typing.Literal["select", "joinedload", "selectinload"],
+        columns: list[str],
     ):
         """
         Load specified columns into the given SQLAlchemy statement. This returns a dictionary that can be used with the `load_columns_from_dictionary` method.
 
         Args:
             statement (Select[tuple[T]] | _AbstractLoad): The SQLAlchemy statement to which the columns will be loaded.
+            statement_type (typing.Literal["select", "joinedload", "selectinload"]): The type of statement to use for loading.
             columns (list[str]): A list of column names to be loaded.
 
         Returns:
             dict: A dictionary that can be used with the `load_columns_from_dictionary` method.
         """
         load_column = create_load_column(statement)
+        load_column["statement_type"] = statement_type
         for col in columns:
             sub_col = ""
             if "." in col:
                 col, sub_col = col.split(".", 1)
 
-            # If it is not a relation, load only the column if it is in the user column list, else skip
+            # If it is not a relation, load only the column if it is in the column list, else skip
             if not self.datamodel.is_relation(col):
-                if col in self.datamodel.get_user_column_list():
+                if col in self.datamodel.get_column_list():
                     load_column["columns"].append(col)
                     load_column["type"] = "some"
                 continue
@@ -393,10 +400,18 @@ class SQLAQueryBuilder(AbstractQueryBuilder[Select[tuple[T]]]):
             if self.datamodel.is_relation_one_to_one(
                 col
             ) or self.datamodel.is_relation_many_to_one(col):
+                load_column["related_columns"][col]["statement_type"] = (
+                    load_column["related_columns"][col]["statement_type"]
+                    or "joinedload"
+                )
                 load_column["related_columns"][col]["statement"] = load_column[
                     "related_columns"
                 ][col]["statement"] or joinedload(self.datamodel.obj.load_options(col))
             else:
+                load_column["related_columns"][col]["statement_type"] = (
+                    load_column["related_columns"][col]["statement_type"]
+                    or "selectinload"
+                )
                 load_column["related_columns"][col]["statement"] = load_column[
                     "related_columns"
                 ][col]["statement"] or selectinload(
@@ -410,7 +425,9 @@ class SQLAQueryBuilder(AbstractQueryBuilder[Select[tuple[T]]]):
                 load_column["related_columns"][col] = deep_merge(
                     load_column["related_columns"][col],
                     interface.query._load_columns_recursively(
-                        load_column["related_columns"][col]["statement"], [sub_col]
+                        load_column["related_columns"][col]["statement"],
+                        load_column["related_columns"][col]["statement_type"],
+                        [sub_col],
                     ),
                     rules={
                         "type": lambda x1, x2: LOAD_TYPE_MAPPING[x2]
@@ -427,8 +444,8 @@ class SQLAQueryBuilder(AbstractQueryBuilder[Select[tuple[T]]]):
                 load_column["related_columns"][col]["type"] = "all"
                 continue
 
-            # Skip if the sub column is not in the user column list or if it is a relation
-            if sub_col not in interface.get_user_column_list() or interface.is_relation(
+            # Skip if the sub column is not in the column list or if it is a relation
+            if sub_col not in interface.get_column_list() or interface.is_relation(
                 sub_col
             ):
                 continue
@@ -437,3 +454,11 @@ class SQLAQueryBuilder(AbstractQueryBuilder[Select[tuple[T]]]):
             load_column["related_columns"][col]["type"] = "some"
 
         return load_column
+
+    def _convert_id_into_dict(self, id):
+        # Cast the id into the right type based on the pk column type
+        pk_dict = super()._convert_id_into_dict(id)
+        for pk in pk_dict:
+            col_type = self.datamodel.list_columns[pk].type.python_type
+            pk_dict[pk] = col_type(pk_dict[pk])
+        return pk_dict

fastapi_rtk/backends/sqla/filters.py

@@ -617,6 +617,22 @@ class SQLAFilterConverter:
                 FilterIn,
             ],
         ),
+        (
+            "is_files",
+            [
+                FilterTextContains,
+                # TODO: Make compatible filters
+                # FilterEqual,
+                # FilterNotEqual,
+                # FilterStartsWith,
+                # FilterNotStartsWith,
+                # FilterEndsWith,
+                # FilterNotEndsWith,
+                # FilterContains,
+                # FilterNotContains,
+                # FilterIn,
+            ],
+        ),
         (
             "is_integer",
             [

fastapi_rtk/backends/sqla/interface.py

@@ -255,7 +255,12 @@ class SQLAInterface(AbstractInterface[ModelType, Session | AsyncSession, Column]
                     unique_order_columns.update(
                         [f"{col_name}.{sub_col}" for sub_col in sub_order_columns]
                     )
-            elif self.is_property(col_name) and not self.is_hybrid_property(col_name):
+            elif (
+                self.is_property(col_name)
+                and not self.is_hybrid_property(col_name)
+                or self.is_files(col_name)
+                or self.is_images(col_name)
+            ):
                 continue
 
             # Allow the column to be used for ordering by default
@@ -353,14 +358,12 @@ class SQLAInterface(AbstractInterface[ModelType, Session | AsyncSession, Column]
             ]
         elif self.is_file(col) or self.is_image(col):
             value_type = fastapi.UploadFile
+            annotated_str_type = typing.Annotated[
+                str | None, BeforeValidator(lambda x: None if x == "null" else x)
+            ]
             if self.is_files(col) or self.is_images(col):
-                value_type = list[value_type | str]
-            return (
-                value_type
-                | typing.Annotated[
-                    str | None, BeforeValidator(lambda x: None if x == "null" else x)
-                ]
-            )
+                value_type = list[value_type | annotated_str_type]
+            return value_type | annotated_str_type
         elif self.is_date(col):
             return date
         elif self.is_datetime(col):

fastapi_rtk/backends/sqla/model.py

@@ -125,16 +125,18 @@ class Model(sqlalchemy.ext.asyncio.AsyncAttrs, BasicModel, DeclarativeBase):
     def get_pk_attrs(cls):
         return [col.name for col in cls.__mapper__.primary_key]
 
-    async def load(self, cols: list[str] | str):
+    async def load(self, *cols: list[str] | str):
         """
-        Asynchronously load the specified columns for the current instance.
+        Asynchronously loads the specified columns of the model instance.
 
         Args:
-            cols (list[str] | str): A list of column names to load or a single column name.
+            *cols (list[str] | str): The columns to load. Can be a list of strings or individual string arguments.
         """
+        cols = [
+            item for col in cols for item in (col if isinstance(col, list) else [col])
+        ]
+
         async with AsyncTaskRunner() as runner:
-            if isinstance(cols, str):
-                cols = [cols]
             for col in cols:
                 runner.add_task(getattr(self.awaitable_attrs, col))
 

fastapi_rtk/bases/filter.py

@@ -51,7 +51,7 @@ class AbstractBaseOprFilter(AbstractBaseFilter[T]):
     """
 
     @abc.abstractmethod
-    def apply(self, statement, value) -> T:
+    def apply(self, statement: T, value) -> T:
         """
         Apply the filter to the given SQLAlchemy Select statement.
 

fastapi_rtk/const.py

@@ -76,7 +76,7 @@ DEFAULT_COOKIE_NAME = "dataTactics"
 DEFAULT_BASEDIR = "app"
 DEFAULT_STATIC_FOLDER = DEFAULT_BASEDIR + "/static"
 DEFAULT_TEMPLATE_FOLDER = DEFAULT_BASEDIR + "/templates"
-DEFAULT_PROFILER_FOLDER = DEFAULT_STATIC_FOLDER + "/profiles"
+DEFAULT_PROFILER_FOLDER = DEFAULT_STATIC_FOLDER + "/profiler"
 DEFAULT_LANG_FOLDER = DEFAULT_BASEDIR + "/lang"
 DEFAULT_LANGUAGES = "en,de"
 DEFAULT_TRANSLATIONS_KEY = "translations"

fastapi_rtk/utils/self_dependencies.py

@@ -1,6 +1,6 @@
 import fastapi
 
-__al__ = ["SelfDepends", "SelfType"]
+__all__ = ["SelfDepends", "SelfType"]
 
 
 class BaseSelf:

{fastapi_rtk-1.0.6.dist-info → fastapi_rtk-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 1.0.6
+Version: 1.0.8
 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.6.dist-info → fastapi_rtk-1.0.8.dist-info}/RECORD

@@ -1,8 +1,8 @@
 fastapi_rtk/__init__.py,sha256=acLIihNMCZI3prFTq0cru1-k3kPjSZb2hhcqNrW7xJo,6203
-fastapi_rtk/_version.py,sha256=mqMuQB3aqJVPrHHqJMLjqiMKUiJjozc7EPLcX5DpKHg,22
+fastapi_rtk/_version.py,sha256=NND_6JDYnYnGzN3-RTpS5F7wzv62vDf7hAxiyTSBJfE,22
 fastapi_rtk/apis.py,sha256=6X_Lhl98m7lKrDRybg2Oe24pLFLJ29eCOQSwCAvpKhY,172
 fastapi_rtk/config.py,sha256=9PZF9E5i1gxmnsZEprZZKxVHSk0dFEklJSplX9NEqdo,14036
-fastapi_rtk/const.py,sha256=huvh4Zor77fgUkhU4-x6LgkOglSxeKXOlXdhnai_5CQ,4905
+fastapi_rtk/const.py,sha256=sEj_cYeerj9pVwbCu0k5Sy1EYpdr1EHzUjqqbnporgc,4905
 fastapi_rtk/db.py,sha256=nAPIibCCyaGm7Kw9updiVx5LWASkdfX01GxG5Gp12hM,24505
 fastapi_rtk/decorators.py,sha256=HqAFSiO0l5_M0idWs0IcY24FdzbAcDQDQoifM_WgZAQ,14515
 fastapi_rtk/dependencies.py,sha256=H31uMZRA0FdZZXmzIVS2j9gBAovJDYdb_5ZgmrKd9qc,6070
@@ -21,7 +21,7 @@ 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=PQwR_ya4rrzlZlHDl8lr3z7y1SH8mRbgiVRX2TrjsGk,104924
+fastapi_rtk/api/model_rest_api.py,sha256=R-zdfDK6QiVb8u6EBTpZt7cqvH4kP86udNMxdJRiphQ,105254
 fastapi_rtk/auth/__init__.py,sha256=iX7O41NivBYDfdomEaqm4lUx9KD17wI4g3EFLF6kUTw,336
 fastapi_rtk/auth/auth.py,sha256=MZmuueioiMbSHjd_F3frKEqCA3yjtanRWyKOy6CnOd0,20994
 fastapi_rtk/auth/hashers/__init__.py,sha256=uBThFj2VPPSMSioxYTktNiM4-mVgtDAjTpKA3ZzWxxs,110
@@ -45,11 +45,11 @@ fastapi_rtk/backends/generic/model.py,sha256=olRvHD57CCKnZoyia7EcvecZfXjN-ku17gx
 fastapi_rtk/backends/generic/session.py,sha256=J8OJSuGcFkZiOg7SJIbkKnMUlo_njQjRJ1vNl4k8Ve4,19053
 fastapi_rtk/backends/sqla/__init__.py,sha256=p4TRI65-R6TM6G_-OAnwYV7Hk9WVkKsnhN2sFta1-cU,1795
 fastapi_rtk/backends/sqla/column.py,sha256=KutGcyFr3ZeHFTL8c313I4CNxosGq54neLLB7N53GZs,240
-fastapi_rtk/backends/sqla/db.py,sha256=hnE1jQFZai96IaQ7jWqAsiEK0PXnGpMgvgZIGSlPBsM,17245
+fastapi_rtk/backends/sqla/db.py,sha256=kVipLr8C1XoeNV65IJpB-XGKde13nb_YDG-h5R8dfAs,18469
 fastapi_rtk/backends/sqla/exceptions.py,sha256=rRtvgXyDwGSbjvJIPJIOjOBYytvNv9VXkZOBy6p2J80,61
-fastapi_rtk/backends/sqla/filters.py,sha256=H2eholy7VTfVwcBTAV0BWO6NXJYA-eDp_YvptLFKO3E,20927
-fastapi_rtk/backends/sqla/interface.py,sha256=9I2JiShqmyakfgdXE-DA5TW35xdvMs_-pDDccKnX5cA,27678
-fastapi_rtk/backends/sqla/model.py,sha256=GqWJyb4uq7AK58_zZw5jx4BQ6xWi5thwNqr8WGfnJ6o,7099
+fastapi_rtk/backends/sqla/filters.py,sha256=bqdt3ojlF_elAj7TJxkVq4WgkrNeV0LTR6Ojkc1H5R0,21395
+fastapi_rtk/backends/sqla/interface.py,sha256=mnlCxSvWIuTrVzE8KMjZyI7Tdhk041MUF3F2ZLdhYs8,27824
+fastapi_rtk/backends/sqla/model.py,sha256=N0fxuAHbw_RCfFPRw-cjWQdBEanfogLRXOUEPqZ1Qac,7168
 fastapi_rtk/backends/sqla/session.py,sha256=di52RhRWzUchcquWMU9KKd0F1N5te1GfAtcfCnekiwI,412
 fastapi_rtk/backends/sqla/extensions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_rtk/backends/sqla/extensions/audit/__init__.py,sha256=CaVc9fV584PVazvGGMOKwX4xC3OvIae9kXBx6xQAj5g,131
@@ -61,7 +61,7 @@ fastapi_rtk/backends/sqla/extensions/geoalchemy2/geometry_converter.py,sha256=sc
 fastapi_rtk/bases/__init__.py,sha256=v3tMVuX20UbvjI_mTWpDAePWAA38e3pjlYEiICgY4j8,440
 fastapi_rtk/bases/db.py,sha256=D27BhF89J0OaLHjALDCa85eNf35lBaTz6VV7EDa4wuM,18711
 fastapi_rtk/bases/file_manager.py,sha256=d1ZZaY-OgDxjSWQ49DNQNSDHKznzr-03wki_eR2iU2A,8230
-fastapi_rtk/bases/filter.py,sha256=b9DNgW9M6pLv0eMTnaGUaYpPX1ZSloo6OCvdxGpCNNE,1837
+fastapi_rtk/bases/filter.py,sha256=XmWTcLaIcBj9pKF1PMAKdwSnZNpdT8Df3uLeUIOGUDE,1840
 fastapi_rtk/bases/interface.py,sha256=Cq9Duxa3w-tw342P424h88fc0_X1DoxCdTa3rAN-6jM,45380
 fastapi_rtk/bases/model.py,sha256=nUZf0AVs0Mzqh2u_ALiRNYN1bfOU9PzYLvEFHDQ57Y0,1692
 fastapi_rtk/bases/session.py,sha256=Q92cRW0nI5IYSsBXLkTJjK5ztMSBNRt-olMwxTIeel0,173
@@ -119,15 +119,15 @@ fastapi_rtk/utils/multiple_async_contexts.py,sha256=-juAliUeG4XI1J-p31KknsJvzvM5
 fastapi_rtk/utils/prettify_dict.py,sha256=VKve-52fE9usIzflD3mNtvql_p5F2jq9HYBTJF_1MX0,662
 fastapi_rtk/utils/pydantic.py,sha256=c4TGu6fP5qmsMJcEerhgq3R1iTpJn_1oA91d43GaVlo,2408
 fastapi_rtk/utils/run_utils.py,sha256=2aieVAGp4e7vByzkwnmXk5c-crLl-Ia1rwdHl6LRQ34,6237
-fastapi_rtk/utils/self_dependencies.py,sha256=ZTpJZFFnh3MhhS5PwsgJ9TeVgcV6gwSS962c7udLzds,4101
+fastapi_rtk/utils/self_dependencies.py,sha256=SjX8BOC3UvuLxfElo1MMgugCX8ZEgsCgLy0g011a4UU,4102
 fastapi_rtk/utils/smartdefaultdict.py,sha256=UdA_N1eQ3TooE9_ci0O_5QKUjGkQfo-c2BwEX5OkXfY,645
 fastapi_rtk/utils/sqla.py,sha256=To4PhsO5orPJVqjdLh5C9y_xPgiy8-zhrJdSqhR_tsc,690
 fastapi_rtk/utils/timezone.py,sha256=62S0pPWuDFFXxV1YTFCsc4uKiSP_Ba36Fv7S3gYjfhs,570
 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.6.dist-info/METADATA,sha256=M9gJt_FXPypoq_6Q-U2L6mE9m-9Y_MZpqcorsYAy9iI,1270
-fastapi_rtk-1.0.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-fastapi_rtk-1.0.6.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
-fastapi_rtk-1.0.6.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
-fastapi_rtk-1.0.6.dist-info/RECORD,,
+fastapi_rtk-1.0.8.dist-info/METADATA,sha256=BtLiGBfKiNshhahz5dAFunO6FJip5cxTRFkWZ4_zibI,1270
+fastapi_rtk-1.0.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fastapi_rtk-1.0.8.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
+fastapi_rtk-1.0.8.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
+fastapi_rtk-1.0.8.dist-info/RECORD,,