jararaca 0.2.22__py3-none-any.whl → 0.2.24__py3-none-any.whl

jararaca/persistence/base.py

@@ -23,6 +23,8 @@ from sqlalchemy import DateTime, Result, Select, delete, func, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
+from jararaca.persistence.sort_filter import FilterModel, SortModel
+
 IDENTIFIABLE_SCHEMA_T = TypeVar("IDENTIFIABLE_SCHEMA_T")
 logger = logging.getLogger(__name__)
 
@@ -205,6 +207,8 @@ class CRUDOperations(Generic[IDENTIFIABLE_T]):
 class PaginatedFilter(BaseModel):
     page: Annotated[int, Field(gt=-1)] = 1
     page_size: int = 10
+    sort_models: list[SortModel] = []
+    filter_model: list[FilterModel] = []
 
 
 class QueryInjector(Protocol):

jararaca/persistence/sort_filter.py

@@ -94,6 +94,12 @@ class SortFilterRunner:
                 case _:
                     raise ValueError(f"Unsupported string operator: {filter.operator}")
         elif field_type in [date, datetime]:
+            match filter.operator:
+                case "isEmpty":
+                    return query.filter(field == None)  # noqa
+                case "isNotEmpty":
+                    return query.filter(field != None)  # noqa
+
             __value = (
                 filter.value[0] if isinstance(filter.value, list) else filter.value
             )
@@ -114,10 +120,7 @@ class SortFilterRunner:
                     return query.filter(field < value)
                 case "onOrBefore":
                     return query.filter(field <= value)
-                case "isEmpty":
-                    return query.filter(field == None)  # noqa
-                case "isNotEmpty":
-                    return query.filter(field != None)  # noqa
+
                 case _:
                     raise ValueError(
                         f"Unsupported data/datetime operator: {filter.operator}"

{jararaca-0.2.22.dist-info → jararaca-0.2.24.dist-info}/METADATA

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

{jararaca-0.2.22.dist-info → jararaca-0.2.24.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=D5zXLTKIzLtXRt3Pi1it1wvVnp_hiJ32ELtRpqX8hgM,1837
+pyproject.toml,sha256=V0xrNYqY4Io-o3Ow1QZda7yc-8GG_qmCAEtrGcJEs8A,1837
 jararaca/__init__.py,sha256=fBLWY_hpImDrzD-81avNasZxAbZ8IImAkS3kl83_3Kc,13757
 jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/cli.py,sha256=fh7lp7rf5xbV5VaoSYWWehktel6BPcOXMjW7cw4wKms,5693
@@ -23,12 +23,12 @@ jararaca/observability/decorators.py,sha256=XffBinFXdiNkY6eo8_1nkr_GapM0RUGBg0ai
 jararaca/observability/interceptor.py,sha256=GHkuGKFWftN7MDjvYeGFGEPnuJETNhtxRK6yuPrCrpU,1462
 jararaca/observability/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/observability/providers/otel.py,sha256=LgfoITdoQTCxKebfLcEfwMiG992wlWY_0AUTd2fo8hY,6065
-jararaca/persistence/base.py,sha256=dfZWM-ztN-JEzw8-or7g13XyJ4LwmfbF2d53YFT4dyg,12446
+jararaca/persistence/base.py,sha256=rj_BeUiF_AiiLg0dMJcPzcxraukiL6tw3NNzymsg7wI,12594
 jararaca/persistence/exports.py,sha256=Ghx4yoFaB4QVTb9WxrFYgmcSATXMNvrOvT8ybPNKXCA,62
 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=gG9tXJTNwQE5kqk5zP9kWe-cxCz3EypJmy5LC2v8Mlc,6769
+jararaca/persistence/sort_filter.py,sha256=bUxUkFZ_W1Vuc0TyDzhA41P7Zjb-USWzcTD9kAimRq4,6806
 jararaca/presentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/presentation/decorators.py,sha256=eL2YCgMSr19m4YCri5PQU46NRxf0QxsqDnz6MqKu0YQ,8389
 jararaca/presentation/hooks.py,sha256=WBbU5DG3-MAm2Ro2YraQyYG_HENfizYfyShL2ktHi6k,1980
@@ -57,8 +57,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=rvTlSGDffyxSwqoHDLxdXApwXDw0v8Tq6nOWPO033nQ,28382
-jararaca-0.2.22.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.2.22.dist-info/METADATA,sha256=kvq6B6CNCf70VC7LQtrrzmP-fI5RUvXY5TZpBT1I-DI,8552
-jararaca-0.2.22.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-jararaca-0.2.22.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.2.22.dist-info/RECORD,,
+jararaca-0.2.24.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.2.24.dist-info/METADATA,sha256=gywpebDMPl2EqEG4YJIA2LqBvFDxOZ3l-4Md1Zyxb_k,8552
+jararaca-0.2.24.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+jararaca-0.2.24.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.2.24.dist-info/RECORD,,

pyproject.toml

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