muffin-rest 13.1.0__py3-none-any.whl → 13.1.1__py3-none-any.whl

muffin_rest/filters.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import operator
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Iterable, Mapping
+from typing import TYPE_CHECKING, Any, Callable, ClassVar, Iterable, Mapping, cast
 
 import marshmallow as ma
 from asgi_tools._compat import json_loads
@@ -90,13 +90,13 @@ class Filter(Mutate):
 
         return ops, collection
 
-    async def filter(self, collection, *ops: TFilterValue) -> Any:
+    async def filter(self, collection: TVCollection, *ops: TFilterValue) -> TVCollection:
         """Apply the filter to collection."""
 
         def validator(obj):
             return all(op(get_value(obj, self.name), val) for op, val in ops)
 
-        return [item for item in collection if validator(item)]
+        return cast("TVCollection", [item for item in collection if validator(item)])
 
     def get_simple_value(self, ops: TFilterOps) -> Any:
         """Get simple value from filter's data.

muffin_rest/peewee/filters.py

@@ -6,7 +6,7 @@ import operator
 from functools import reduce
 from typing import TYPE_CHECKING, ClassVar, cast
 
-from peewee import ColumnBase, Field, ModelSelect
+from peewee import ColumnBase, Field
 
 from muffin_rest.filters import Filter, Filters
 
@@ -39,11 +39,13 @@ class PWFilter(Filter):
 
     list_ops = (*Filter.list_ops, "$between")
 
-    async def filter(self, collection: ModelSelect, *ops: TFilterValue) -> ModelSelect:
+    async def filter(self, collection, *ops: TFilterValue):
         """Apply the filters to Peewee QuerySet.."""
         column = self.field
+
         if isinstance(column, ColumnBase):
             collection = collection.where(*[op(column, val) for op, val in ops])
+
         return collection
 
 

{muffin_rest-13.1.0.dist-info → muffin_rest-13.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: muffin-rest
-Version: 13.1.0
+Version: 13.1.1
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
 Keywords: rest,api,muffin,asgi,asyncio,trio
 Author: Kirill Klenov

{muffin_rest-13.1.0.dist-info → muffin_rest-13.1.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 muffin_rest/__init__.py,sha256=JnwsHQNDmJpOqETeIjjPheG891T5WQ0JBaiEV72Wcmg,1242
 muffin_rest/api.py,sha256=bdbXMPiZi5yXf7_u3XB_gaGDHZKzDPqnnFnrwHoO1Rs,3799
 muffin_rest/errors.py,sha256=Todg7CrCE1ufOsyyARI2Bv-RqNPH4Rl1p-Tkpq7VYrA,1151
-muffin_rest/filters.py,sha256=BMjH9Yai1dywvXWSR1pBMxYWE16TLKV9kB3PHNfTaRY,5928
+muffin_rest/filters.py,sha256=5-tBwUtHu1wOgTEPkYC_IN0fzbWu8jpYYLSfdXTlXgQ,5979
 muffin_rest/handler.py,sha256=Ob7viBiCf8ju7XEyCMw1mG3tbWnGhgPAnCO-XtKTOEc,10723
 muffin_rest/limits.py,sha256=X6qwuQPUdKJiPRgiKLY2NquXZlrpbx7BYHH3njw9ros,2168
 muffin_rest/marshmallow.py,sha256=-MyMKiaMTfiWw4y-4adpfoQd05HV1vEKqSXJh8eD3xg,548
@@ -14,7 +14,7 @@ muffin_rest/mongo/utils.py,sha256=NEfg_BLn15BbpM7-XomfgM2fwkcNb_QBzw2r51EGbJE,39
 muffin_rest/openapi.py,sha256=mFJ2K-I6K2WD2QoZL8ozmtLqGd3pCHv3s9VKNUK5NbY,8656
 muffin_rest/options.py,sha256=Mzv0mq6YylL6cNtad9JhEhkmA4RgmDsu-On2hn5VEiw,2208
 muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
-muffin_rest/peewee/filters.py,sha256=T_Gspasump_4Jn1dy-sE-wHpfqH94lB4K2moVtARrX8,2427
+muffin_rest/peewee/filters.py,sha256=Y5DUZ4BrenVB3iWENAQ7ZUbyVdPzWn-qzCNNIq0YS0E,2388
 muffin_rest/peewee/handler.py,sha256=iDEgPPxSC-Y11MTcSl-Hs9iNWgOeQv-mU1tx-6OAe5E,5360
 muffin_rest/peewee/openapi.py,sha256=Jp_wtKNRCCjpaElJGxPtF5JYIv_hlx9S2LYT0FcxamI,1119
 muffin_rest/peewee/options.py,sha256=iLZ4ORF8T6i9aUNU2C5F-TAwwd7hW80N6wC9FztvT_o,1428
@@ -33,6 +33,6 @@ muffin_rest/sqlalchemy/types.py,sha256=Exm-zAQCtPAwXvYcCTtPRqSa-wTEWRcH_v2YSsJkB
 muffin_rest/swagger.html,sha256=2uGLu_KpkYf925KnDKHBJmV9pm6OHn5C3BWScESsUS8,1736
 muffin_rest/types.py,sha256=5NY9gPTIptv6U2Qab2xMXlS_jZuTuR0bquFFwWRURcA,510
 muffin_rest/utils.py,sha256=71hDcTVUClNN6l8bfxzCBy4IbiO2vo0b5EeMEj61n_w,2119
-muffin_rest-13.1.0.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-muffin_rest-13.1.0.dist-info/METADATA,sha256=x7P0mJbUe-UDcqHp-AeayK_BRWHbIQ_Q3nDrtsuF3RE,4982
-muffin_rest-13.1.0.dist-info/RECORD,,
+muffin_rest-13.1.1.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+muffin_rest-13.1.1.dist-info/METADATA,sha256=UWCjQTEgOM55e868Ew82njofDd2kB1yV4ZVVlhPasL0,4982
+muffin_rest-13.1.1.dist-info/RECORD,,