muffin-rest 5.1.4__py3-none-any.whl → 5.1.6__py3-none-any.whl

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/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/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.dist-info → muffin_rest-5.1.6.dist-info}/METADATA

@@ -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.dist-info → muffin_rest-5.1.6.dist-info}/RECORD

@@ -12,14 +12,14 @@ muffin_rest/mongo/utils.py,sha256=RZdAiKaTsgaFz8WbIPI_sjjVDsF_VmPu5Agzp5mpbvY,39
 muffin_rest/openapi.py,sha256=XNhU4EffbKvFKr1HMCqFM-ZrukPqLyZwm3aJe2dNs40,8770
 muffin_rest/options.py,sha256=PcrGY1qq3exgOdeJp8tYYC2V83c5vVMQrARgUkxrNTM,1927
 muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
-muffin_rest/peewee/filters.py,sha256=I_oZa18j0hi0CnVM-U5IpkwkKZ24NYdx9XkdlDiFYZI,2315
+muffin_rest/peewee/filters.py,sha256=qjdzXx0rZOwDGGcVoso1QQL4hrSzUjqEdwdtt8vBhes,2332
 muffin_rest/peewee/handler.py,sha256=ipIcOmCgHpqWJevWHm9xxZ2GsZPUV7dc9QCmu7bvaLM,5325
 muffin_rest/peewee/openapi.py,sha256=ZZuh7nJVuK9cTJqtOJ_XASe9iJgter-xIjj9YJ8xszI,1111
 muffin_rest/peewee/options.py,sha256=02E8yOXHaHl0smKV8qI6er7YS3IcuroDPl7GR_YuLjo,1489
 muffin_rest/peewee/schemas.py,sha256=GYex652UOBoFBvpkqDupBe8kXJHIEBF2diZPjE-BXj4,1076
-muffin_rest/peewee/sorting.py,sha256=pwFYMjiSHmZU9jeoa4IXrlP-wzoFv3_LzoyTD1T2dlc,1834
+muffin_rest/peewee/sorting.py,sha256=7in0ICivfZbfNIacA3eo9o5cKdwNJZFp1Vl5mIqvQyk,1848
 muffin_rest/peewee/types.py,sha256=cgCXhpGHkImKwudA1lulZHz5oJswHH168AiW5MhZRCM,155
-muffin_rest/peewee/utils.py,sha256=-pabfX4BUHSQC76VpGHRk9Pu6zHFysxBNZaLs3h6tus,679
+muffin_rest/peewee/utils.py,sha256=wXeneVE1IZl1ROnY28re73H62Y1_tEmoEQYzPhuOyBI,702
 muffin_rest/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 muffin_rest/redoc.html,sha256=GtuHIMvTuSi8Ro6bgI-G8VB94AljMyfjcZseqtBmGCY,559
 muffin_rest/sorting.py,sha256=x-3UE9MMV7RzmNDTIgsM1RDVd42mPeq03LbkaaKuM4g,2803
@@ -30,7 +30,7 @@ muffin_rest/sqlalchemy/types.py,sha256=JnIw44XJ2ClWzOv-mTUrvFw1JPxAlvdX_jf7r4zau
 muffin_rest/swagger.html,sha256=2uGLu_KpkYf925KnDKHBJmV9pm6OHn5C3BWScESsUS8,1736
 muffin_rest/types.py,sha256=vy55ShzMcvs9zXjFpdjWlagv09dMrcmxb2-U4hTL3NM,521
 muffin_rest/utils.py,sha256=-nf6WCGFlVoOcBT-n6eiIpbZSmPY8ynm2UlMelgmn8o,2059
-muffin_rest-5.1.4.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-5.1.4.dist-info/METADATA,sha256=HuWflco9bR5lVnqXcC_tlNGL7EyQFpnQBTUVd26ouiA,4126
-muffin_rest-5.1.4.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-muffin_rest-5.1.4.dist-info/RECORD,,
+muffin_rest-5.1.6.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-5.1.6.dist-info/METADATA,sha256=OFek3VsTJNsILkrP6PZ394ng1bv6WWoYXYOvwr3VqmA,4126
+muffin_rest-5.1.6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+muffin_rest-5.1.6.dist-info/RECORD,,