jararaca 0.2.32__py3-none-any.whl → 0.2.34__py3-none-any.whl

jararaca/persistence/sort_filter.py

@@ -69,6 +69,8 @@ class FilterRuleApplier:
         if field is None:
             raise ValueError(f"Unsupported field: {filter.field}")
         field_type = field.property.columns[0].type.python_type
+        if not filter.value:  # Is empty string or empty list
+            return query
 
         if field_type is str:
             match filter.operator:
@@ -138,14 +140,29 @@ class FilterRuleApplier:
                 case _:
                     raise ValueError(f"Unsupported bool operator: {filter.operator}")
         elif field_type is int:
-            __value = (
-                filter.value[0] if isinstance(filter.value, list) else filter.value
-            )
-            if not re.match(r"^-?\d+$", __value):
+
+            if isinstance(filter.value, list):
+                match filter.operator:
+                    case "isAnyOf":
+                        if not len(filter.value):
+                            return query
+
+                        number_values = [
+                            int(v) for v in filter.value if re.match(r"^-?\d+$", v)
+                        ]
+                        return query.filter(field.in_(number_values))
+                    case _:
+                        raise ValueError(
+                            f"Unsupported int operator: {filter.operator} for list"
+                        )
+
+            if not re.match(r"^-?\d+$", filter.value):
                 raise ValueError(
-                    f"Unsupported value type for int field: {type(__value)}"
+                    f"Invalid integer value: {filter.value} for field {field}"
                 )
-            number_value = int(__value)
+
+            number_value = int(filter.value)
+
             match filter.operator:
                 case "=":
                     return query.filter(field == number_value)
@@ -163,18 +180,10 @@ class FilterRuleApplier:
                     return query.filter(field == None)  # noqa
                 case "isNotEmpty":
                     return query.filter(field != None)  # noqa
-                case "isAnyOf":
-                    if not isinstance(filter.value, list):
-                        raise ValueError(
-                            f"Unsupported value type for isAnyOf operator: {type(filter.value)}"
-                        )
-
-                    number_values = [
-                        int(v) for v in filter.value if re.match(r"^-?\d+$", v)
-                    ]
-                    return query.filter(field.in_(number_values))
                 case _:
-                    raise ValueError(f"Unsupported int operator: {filter.operator}")
+                    raise ValueError(
+                        f"Unsupported int operator: {filter.operator} for single value"
+                    )
 
         raise ValueError(f"Unsupported field type: {field_type}")
 

{jararaca-0.2.32.dist-info → jararaca-0.2.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jararaca
-Version: 0.2.32
+Version: 0.2.34
 Summary: A simple and fast API framework for Python
 Home-page: https://github.com/LuscasLeo/jararaca
 Author: Lucas S

{jararaca-0.2.32.dist-info → jararaca-0.2.34.dist-info}/RECORD

@@ -1,6 +1,6 @@
 LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 README.md,sha256=mte30I-ZEJJp-Oax-OganNgl6G9GaCZPL6JVFAvZGz4,7034
-pyproject.toml,sha256=nco-vWu7KyNTRSj1yP_qjFqw3B-lzHJ8aCecPhkhN2o,1837
+pyproject.toml,sha256=O8OpHnqXbYMG-InzkdIrT2ZVKOksD0_gi_3FS7f4n-k,1837
 jararaca/__init__.py,sha256=h1lYQMmB8TATPG0GXjIzLZWHbWFhvkAFu-yBjm2W18g,13875
 jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/cli.py,sha256=fh7lp7rf5xbV5VaoSYWWehktel6BPcOXMjW7cw4wKms,5693
@@ -28,7 +28,7 @@ jararaca/persistence/exports.py,sha256=Ghx4yoFaB4QVTb9WxrFYgmcSATXMNvrOvT8ybPNKX
 jararaca/persistence/interceptors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/persistence/interceptors/aiosqa_interceptor.py,sha256=H6ZjOdosYGCZUzKjugiXQwJkAbnsL4HnkZLOEQhULEc,1986
 jararaca/persistence/session.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/persistence/sort_filter.py,sha256=A5UsXUuo-vBasZZN0M4C_vGfUVgmhgoGoJzcFc6JkBw,9029
+jararaca/persistence/sort_filter.py,sha256=agggpN0YvNjUr6wJjy69NkaqxoDDW13ys9B3r85OujA,9226
 jararaca/persistence/utilities.py,sha256=v9ckhzti3GKWQrng2I03EO-dxGRGp-sLoVnVNf_UFU4,12478
 jararaca/presentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/presentation/decorators.py,sha256=eL2YCgMSr19m4YCri5PQU46NRxf0QxsqDnz6MqKu0YQ,8389
@@ -58,8 +58,8 @@ jararaca/tools/app_config/decorators.py,sha256=-ckkMZ1dswOmECdo1rFrZ15UAku--txaN
 jararaca/tools/app_config/interceptor.py,sha256=nfFZiS80hrbnL7-XEYrwmp2rwaVYBqxvqu3Y-6o_ov4,2575
 jararaca/tools/metadata.py,sha256=7nlCDYgItNybentPSSCc2MLqN7IpBd0VyQzfjfQycVI,1402
 jararaca/tools/typescript/interface_parser.py,sha256=_dPBRKs_67eiQ8cPWp8q1uGbIPxZ30dypfoqhbBAL_Y,28790
-jararaca-0.2.32.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.2.32.dist-info/METADATA,sha256=X27cj2J9B40gzbZEZaWq0Sktjo_z1Dtx-cwG2350Bp4,8552
-jararaca-0.2.32.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-jararaca-0.2.32.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.2.32.dist-info/RECORD,,
+jararaca-0.2.34.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.2.34.dist-info/METADATA,sha256=JjpbgUBOIgNOHWb4nlxfEwulqXDSpewChL8EekIoxys,8552
+jararaca-0.2.34.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+jararaca-0.2.34.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.2.34.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.2.32"
+version = "0.2.34"
 description = "A simple and fast API framework for Python"
 authors = ["Lucas S <me@luscasleo.dev>"]
 readme = "README.md"