muffin-rest 5.1.4__tar.gz → 5.1.6__tar.gz

{muffin_rest-5.1.4 → muffin_rest-5.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin-rest
-Version: 5.1.4
+Version: 5.1.6
 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-5.1.4 → muffin_rest-5.1.6}/muffin_rest/peewee/filters.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 import operator
 from typing import Any, Callable, Tuple, Type, Union, cast
 
-from peewee import Field, ModelSelect
+from peewee import ColumnBase, Field, ModelSelect
 
 from muffin_rest.filters import Filter, Filters
 
@@ -37,7 +37,7 @@ class PWFilter(Filter):
 
     def query(self, qs: ModelSelect, column: Field, *ops: Tuple, **_) -> ModelSelect:
         """Filter a query."""
-        if isinstance(column, Field):
+        if isinstance(column, ColumnBase):
             return cast(ModelSelect, qs.where(*[op(column, val) for op, val in ops]))
 
         return qs

{muffin_rest-5.1.4 → muffin_rest-5.1.6}/muffin_rest/peewee/sorting.py

@@ -47,7 +47,7 @@ class PWSorting(Sorting):
             name = obj
             field = meta.pop("field", None) or name
             if isinstance(field, str):
-                field = get_model_field_by_name(handler, field)
+                field = get_model_field_by_name(handler, field, stacklevel=6)
 
         if field:
             sort = self.MUTATE_CLASS(name, field=field, **meta)

{muffin_rest-5.1.4 → muffin_rest-5.1.6}/muffin_rest/peewee/utils.py

@@ -8,7 +8,7 @@ if TYPE_CHECKING:
     from peewee import Field
 
 
-def get_model_field_by_name(handler, name: str) -> Optional[Field]:
+def get_model_field_by_name(handler, name: str, stacklevel=5) -> Optional[Field]:
     """Get model field by name."""
     fields = handler.meta.model._meta.fields
     candidate = fields.get(name)
@@ -22,6 +22,6 @@ def get_model_field_by_name(handler, name: str) -> Optional[Field]:
     warn(
         f"{handler.__qualname__} {handler.meta.model} has no field {name}",
         category=RuntimeWarning,
-        stacklevel=5,
+        stacklevel=stacklevel,
     )
     return None

{muffin_rest-5.1.4 → muffin_rest-5.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "muffin-rest"
-version = "5.1.4"
+version = "5.1.6"
 description = "The package provides enhanced support for writing REST APIs with Muffin framework"
 readme = "README.rst"
 homepage = "https://github.com/klen/muffin-rest"