fastapi-rtk 1.0.7__tar.gz → 1.0.8__tar.gz

{fastapi_rtk-1.0.7 → fastapi_rtk-1.0.8}/PKG-INFO

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

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

{fastapi_rtk-1.0.7 → fastapi_rtk-1.0.8}/fastapi_rtk/api/model_rest_api.py

@@ -2328,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 []
                         )

{fastapi_rtk-1.0.7 → fastapi_rtk-1.0.8}/fastapi_rtk/backends/sqla/db.py

@@ -454,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-1.0.7 → fastapi_rtk-1.0.8}/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-1.0.7 → fastapi_rtk-1.0.8}/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-1.0.7/fastapi_rtk/_version.py

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