muffin-rest 13.1.0__tar.gz → 13.1.2__tar.gz

{muffin_rest-13.1.0 → muffin_rest-13.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: muffin-rest
-Version: 13.1.0
+Version: 13.1.2
 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 → muffin_rest-13.1.2}/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-13.1.0 → muffin_rest-13.1.2}/muffin_rest/handler.py

@@ -64,12 +64,12 @@ class RESTBase(Handler, Generic[TVResource], metaclass=RESTHandlerMeta):
     class Meta:
         """Tune the handler."""
 
-        # Resource filters
-        filters: Sequence[str | tuple[str, str] | Filter] = ()
-
         # Define allowed resource sorting params
         sorting: Sequence[str | tuple[str, dict] | Sort] = ()
 
+        # Resource filters
+        filters: Sequence[str | tuple[str, dict] | Filter] = ()
+
         # Serialize/Deserialize Schema class
         Schema: type[ma.Schema] | None = None
 

{muffin_rest-13.1.0 → muffin_rest-13.1.2}/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 → muffin_rest-13.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "muffin-rest"
-version = "13.1.0"
+version = "13.1.2"
 description = "The package provides enhanced support for writing REST APIs with Muffin framework"
 authors = [{ name = "Kirill Klenov", email = "horneds@gmail.com" }]
 requires-python = ">=3.10,<4"
@@ -114,7 +114,7 @@ ignore = [
 ]
 
 [tool.bumpversion]
-current_version = "13.1.0"
+current_version = "13.1.2"
 commit = false
 tag = false