muffin-rest 9.2.0__py3-none-any.whl → 9.4.0__py3-none-any.whl

muffin_rest/filters.py

@@ -1,17 +1,20 @@
 """Support API filters."""
+
 from __future__ import annotations
 
 import operator
 from typing import TYPE_CHECKING, Any, Callable, ClassVar, Iterable, Mapping, Optional  # py39
 
 import marshmallow as ma
-from asgi_tools._compat import json_loads  # type: ignore[]
+from asgi_tools._compat import json_loads
 
 from .utils import Mutate, Mutator
 
 if TYPE_CHECKING:
     from muffin import Request
 
+    from muffin_rest.types import TFilterOps, TFilterValue
+
     from .types import TVCollection
 
 FILTERS_PARAM = "where"
@@ -87,7 +90,7 @@ class Filter(Mutate):
 
         return ops, collection
 
-    async def filter(self, collection, *ops: tuple[Callable, Any], **_) -> Any:
+    async def filter(self, collection, *ops: TFilterValue) -> Any:
         """Apply the filter to collection."""
 
         def validator(obj):
@@ -95,12 +98,22 @@ class Filter(Mutate):
 
         return [item for item in collection if validator(item)]
 
-    def parse(self, data: Mapping):
+    def get_simple_value(self, ops: TFilterOps) -> Any:
+        """Get simple value from filter's data.
+
+        In case of simple filter, return the value.
+        """
+        if not ops:
+            return None
+
+        return ops[0][1]
+
+    def parse(self, data: Mapping) -> TFilterOps:
         """Parse operator and value from filter's data."""
         value = data.get(self.name, ma.missing)
         return tuple(self._parse(value))
 
-    def _parse(self, value):
+    def _parse(self, value) -> Iterable[TFilterValue]:
         deserialize = self.schema_field.deserialize
         if isinstance(value, dict):
             for op, val in value.items():

muffin_rest/mongo/filters.py

@@ -1,8 +1,9 @@
 """Support filters for Mongo."""
 
-from typing import Any, Callable, ClassVar
+from typing import ClassVar
 
 from muffin_rest.filters import Filter, Filters
+from muffin_rest.types import TFilterValue
 
 
 class MongoFilter(Filter):
@@ -21,7 +22,7 @@ class MongoFilter(Filter):
         "$ends": lambda _, v: ("$regex", f"{ v }$"),
     }
 
-    async def filter(self, collection, *ops: tuple[Callable, Any], **_):
+    async def filter(self, collection, *ops: TFilterValue):
         """Apply the filter."""
         return collection.find({self.field: dict(op(self.name, v) for op, v in ops)})
 

muffin_rest/peewee/filters.py

@@ -1,9 +1,10 @@
 """Support filters for Peewee ORM."""
+
 from __future__ import annotations
 
 import operator
 from functools import reduce
-from typing import Any, Callable, ClassVar, Union, cast
+from typing import TYPE_CHECKING, ClassVar, Union, cast
 
 from peewee import ColumnBase, Field, ModelSelect
 
@@ -11,6 +12,9 @@ from muffin_rest.filters import Filter, Filters
 
 from .utils import get_model_field_by_name
 
+if TYPE_CHECKING:
+    from muffin_rest.types import TFilterValue
+
 
 class PWFilter(Filter):
     """Support Peewee."""
@@ -33,9 +37,7 @@ class PWFilter(Filter):
 
     list_ops = (*Filter.list_ops, "$between")
 
-    async def filter(
-        self, collection: ModelSelect, *ops: tuple[Callable, Any], **kwargs
-    ) -> ModelSelect:
+    async def filter(self, collection: ModelSelect, *ops: TFilterValue) -> ModelSelect:
         """Apply the filters to Peewee QuerySet.."""
         column = self.field
         if isinstance(column, ColumnBase):

muffin_rest/sqlalchemy/filters.py

@@ -2,13 +2,15 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Union, cast
+from typing import TYPE_CHECKING, Any, ClassVar, Union, cast
 
 from sqlalchemy import Column
 
 from muffin_rest.filters import Filter, Filters
 
 if TYPE_CHECKING:
+    from muffin_rest.types import TFilterValue
+
     from .types import TVCollection
 
 
@@ -29,17 +31,15 @@ class SAFilter(Filter):
 
     list_ops = (*Filter.list_ops, "$between")
 
-    async def filter(
-        self, collection: TVCollection, *ops: tuple[Callable, Any], **kwargs
-    ) -> TVCollection:
+    async def filter(self, collection: TVCollection, *ops: TFilterValue) -> TVCollection:
         """Apply the filters to SQLAlchemy Select."""
         column = self.field
         if ops and column is not None:
-            return self.query(collection, column, *ops, **kwargs)
+            return self.query(collection, column, *ops)
 
         return collection
 
-    def query(self, select: TVCollection, column: Column, *ops, **_) -> TVCollection:
+    def query(self, select: TVCollection, column: Column, *ops: TFilterValue) -> TVCollection:
         """Filter a select."""
         return select.where(*[op(column, val) for op, val in ops])
 

muffin_rest/types.py

@@ -19,3 +19,6 @@ TAuth = Callable[[Request], Awaitable]
 TVAuth = TypeVar("TVAuth", bound=TAuth)
 TVHandler = TypeVar("TVHandler", bound=type["RESTBase"])
 TSchemaRes = dict[str, Any]
+
+TFilterValue = tuple[Callable, Any]
+TFilterOps = tuple[TFilterValue, ...]

{muffin_rest-9.2.0.dist-info → muffin_rest-9.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin-rest
-Version: 9.2.0
+Version: 9.4.0
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
 Home-page: https://github.com/klen/muffin-rest
 License: MIT

{muffin_rest-9.2.0.dist-info → muffin_rest-9.4.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 muffin_rest/__init__.py,sha256=NBZeOEJgQHtFFhVgd9d0fpApFRgU405sbm0cu1y1MOU,1242
 muffin_rest/api.py,sha256=zssoHjqTsa8UCAyxj6TxQVluYPX9Sigyiph6SRxBY6I,3870
 muffin_rest/errors.py,sha256=mxEBhNPo3pwpG2em6zaQonbfRgHFBJ3I8WunVYWDjvM,1163
-muffin_rest/filters.py,sha256=MARP_WsJslncahlgZLTImigl0RTxBtb0jmZbXfJ0c6Y,5637
+muffin_rest/filters.py,sha256=hc-fhBODwrgJM_CvXNtTVH6jIOkjLog8En0iKKYXAGU,5947
 muffin_rest/handler.py,sha256=3efL8-AbxR0oHEwySfWSyfRuxCWyJOwDaYAhUzg6f-0,10772
 muffin_rest/limits.py,sha256=pA5hnDQgrP-euDGjAoczlT_b7Dxzw5btQ-3okkHYKSA,1855
 muffin_rest/marshmallow.py,sha256=jWsZeMj3KslbGGgzEMo8-e5eeuGhmqFolL0mIEquylc,789
 muffin_rest/mongo/__init__.py,sha256=SiYSbX6ySJl43fw9aGREIs8ZsS8Qk_ieizoPOj4DjJc,4656
-muffin_rest/mongo/filters.py,sha256=4TgExaUhJiHkogiZLqjtT13A0O-Uvwfd5AesVfTY2Io,949
+muffin_rest/mongo/filters.py,sha256=yIxIDVqMn6SoDgVhCqiTxYetw0hoaf_3jIvX2Vnizok,964
 muffin_rest/mongo/schema.py,sha256=y4OEPQnlV_COTIIQ3cKmpqDpD2r18eAWn0rijQldWm0,1205
 muffin_rest/mongo/sorting.py,sha256=iJBnaFwE7g_JMwpGpQkoqSqbQK9XULx1K3skiRRgLgY,870
 muffin_rest/mongo/types.py,sha256=jaODScgwwYbzHis3DY4bPzU1ahiMJMSwquH5_Thi-Gg,200
@@ -14,7 +14,7 @@ muffin_rest/mongo/utils.py,sha256=mNkLM-D6gqOA9YW2Qdw0DvE2N4LRmxLAiPMKH9WLttM,39
 muffin_rest/openapi.py,sha256=0QU7qrfBjGl0vl378SJC5boZZI2ogddl45fS9WL4Axw,8751
 muffin_rest/options.py,sha256=reHbd2o-F6bKEKc8bznzj0TMY2vzjK6Yt1qOny7kt_w,2691
 muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
-muffin_rest/peewee/filters.py,sha256=oghjKwurNCyFUYT0r2TVu2Nd1SIalRsmbU4_RbaoXLs,2440
+muffin_rest/peewee/filters.py,sha256=p813eJqyTkAhmS3C1P8rWFWb9Tl33OtADjgLctqKnns,2475
 muffin_rest/peewee/handler.py,sha256=Tk20ChTGkhzSF0K1-TFruPfXJyHfJE_fDKcQqGQeoAU,5297
 muffin_rest/peewee/openapi.py,sha256=lDnLnoXi33p0YeFVwRgaVrndyrG2XL93RH-BzbxinOY,1105
 muffin_rest/peewee/options.py,sha256=TimJtErC9e8B7BRiEkHiBZd71_bZbYr-FE2PIlQvfH0,1455
@@ -27,13 +27,13 @@ muffin_rest/redoc.html,sha256=GtuHIMvTuSi8Ro6bgI-G8VB94AljMyfjcZseqtBmGCY,559
 muffin_rest/schemas.py,sha256=BW3dF82C6Q6STs4tZjej1x8Ii1rI3EZUJZR4mNNKmu4,875
 muffin_rest/sorting.py,sha256=7k7dxElnEGiwvdfDivzcoLnAOXqpQoK52H-ss79Gw0g,2813
 muffin_rest/sqlalchemy/__init__.py,sha256=9MSvOXWP6665LiA5O1Icl2V05bpz6Ex5sUHB9YWKLvE,6393
-muffin_rest/sqlalchemy/filters.py,sha256=oVz3he9P_KiYE4fM3Wjka2IUmhkf4gHDOVRzKlz0SA0,2484
+muffin_rest/sqlalchemy/filters.py,sha256=ejqjEZU0vqvnLwG0sX7QV3RjcXI0a2Ro_A34AAiGMEc,2489
 muffin_rest/sqlalchemy/sorting.py,sha256=YlFKpIet4TUy7fJ2UBLC8b9lAOwY66QBpPDDApbyh8M,1643
 muffin_rest/sqlalchemy/types.py,sha256=Exm-zAQCtPAwXvYcCTtPRqSa-wTEWRcH_v2YSsJkB6s,198
 muffin_rest/swagger.html,sha256=2uGLu_KpkYf925KnDKHBJmV9pm6OHn5C3BWScESsUS8,1736
-muffin_rest/types.py,sha256=lU0tAaDu9sKm-30RM1_qOx-hOYEkNRaA72LdWDvg72g,491
+muffin_rest/types.py,sha256=m27-g6BI7qdSWGym4fWALBJa2ZpWR0_m0nlrDx7iTCo,566
 muffin_rest/utils.py,sha256=c08E4HJ4SLYC-91GKPEbsyKTZ4sZbTN4qDqJbNg_HTE,2076
-muffin_rest-9.2.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-9.2.0.dist-info/METADATA,sha256=ZB8W02vkcIb8ZrwPQEGeF5MH7P9A2g9ZMfJ-943x1WE,4134
-muffin_rest-9.2.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-muffin_rest-9.2.0.dist-info/RECORD,,
+muffin_rest-9.4.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-9.4.0.dist-info/METADATA,sha256=7LF2JbYYQ4k9VusfwGZolZi9oY3rHNIIC3TQs03tUFM,4134
+muffin_rest-9.4.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+muffin_rest-9.4.0.dist-info/RECORD,,