fastapi-rtk 1.0.2__tar.gz → 1.0.3__tar.gz

{fastapi_rtk-1.0.2 → fastapi_rtk-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 1.0.2
+Version: 1.0.3
 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.2 → fastapi_rtk-1.0.3}/fastapi_rtk/bases/db.py

@@ -55,9 +55,15 @@ class DBQueryParams(typing.TypedDict):
     where_in: tuple[str, list[typing.Any]] | None
     where_id: PRIMARY_KEY | None
     where_id_in: list[PRIMARY_KEY] | None
-    filters: list[FilterSchema] | None
+    filters: (
+        list[FilterSchema | dict[str, typing.Any] | tuple[str, str, typing.Any] | list]
+        | None
+    )
     filter_classes: list[tuple[str, AbstractBaseFilter, typing.Any]] | None
-    opr_filters: list[OprFilterSchema] | None
+    opr_filters: (
+        list[OprFilterSchema | dict[str, typing.Any] | tuple[str, typing.Any] | list]
+        | None
+    )
     opr_filter_classes: list[tuple[AbstractBaseFilter, typing.Any]] | None
     global_filter: tuple[list[str], str] | None
 
@@ -182,6 +188,12 @@ class AbstractQueryBuilder(abc.ABC, typing.Generic[T]):
                 )
             elif step == "filters" and params.get("filters"):
                 for filter in params["filters"]:
+                    if isinstance(filter, dict):
+                        filter = FilterSchema(**filter)
+                    elif isinstance(filter, (list, tuple)):
+                        filter = FilterSchema(
+                            col=filter[0], opr=filter[1], value=filter[2]
+                        )
                     statement = await safe_call(self.apply_filter(statement, filter))
             elif step == "filter_classes" and params.get("filter_classes"):
                 for filter_class in params["filter_classes"]:
@@ -190,6 +202,12 @@ class AbstractQueryBuilder(abc.ABC, typing.Generic[T]):
                     )
             elif step == "opr_filters" and params.get("opr_filters"):
                 for opr_filter in params["opr_filters"]:
+                    if isinstance(opr_filter, dict):
+                        opr_filter = OprFilterSchema(**opr_filter)
+                    elif isinstance(opr_filter, (list, tuple)):
+                        opr_filter = OprFilterSchema(
+                            opr=opr_filter[0], value=opr_filter[1]
+                        )
                     statement = await safe_call(
                         self.apply_opr_filter(statement, opr_filter)
                     )

fastapi_rtk-1.0.3/fastapi_rtk/version.py

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

fastapi_rtk-1.0.2/fastapi_rtk/version.py

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