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

muffin_rest/peewee/handler.py

@@ -95,6 +95,7 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
         cqs = cast(pw.ModelSelect, self.collection.order_by())
         if cqs._group_by:  # type: ignore[misc]
             cqs._returning = cqs._group_by  # type: ignore[misc]
+            cqs._having = None  # type: ignore[misc]
         count = await self.meta.manager.count(cqs)
 
         return (

muffin_rest/peewee/schemas.py

@@ -17,7 +17,10 @@ class EnumField(ma.fields.Field):
         if value is None:
             return None
 
-        return value.value
+        try:
+            return value.value
+        except AttributeError:
+            raise ma.ValidationError(f"{obj}: {attr} value is invalid: {value}") from None
 
     def _deserialize(self, value, attr, data, **kwargs):
         try:

muffin_rest/peewee/sorting.py

@@ -17,9 +17,11 @@ if TYPE_CHECKING:
 class PWSort(Sort):
     """Sorter for Peewee."""
 
-    async def apply(self, collection: TVCollection, *, desc: bool = False, **_) -> TVCollection:
+    async def apply(self, collection: TVCollection, *, desc: bool = False) -> TVCollection:
         """Sort the collection."""
-        return collection.order_by_extend(self.field if not desc else self.field.desc())
+        return collection.order_by_extend(
+            self.field.asc(nulls="LAST") if not desc else self.field.desc(nulls="LAST")
+        )
 
 
 class PWSorting(Sorting):

{muffin_rest-5.1.6.dist-info → muffin_rest-5.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin-rest
-Version: 5.1.6
+Version: 5.1.8
 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.6.dist-info → muffin_rest-5.1.8.dist-info}/RECORD

@@ -13,11 +13,11 @@ 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=qjdzXx0rZOwDGGcVoso1QQL4hrSzUjqEdwdtt8vBhes,2332
-muffin_rest/peewee/handler.py,sha256=ipIcOmCgHpqWJevWHm9xxZ2GsZPUV7dc9QCmu7bvaLM,5325
+muffin_rest/peewee/handler.py,sha256=y7FnayK2lTDMYG2lnrgBEDBUuXd3ZEAd4VXQXuNxWCM,5378
 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=7in0ICivfZbfNIacA3eo9o5cKdwNJZFp1Vl5mIqvQyk,1848
+muffin_rest/peewee/schemas.py,sha256=6xaNxKFpdXjoiPFI9yc0tBN7B535A2IFLRE9x6unrZM,1215
+muffin_rest/peewee/sorting.py,sha256=mQlHH1u4MY_vzIFwQy-aLHXiDuUWJ_fAn4qs-X6Vodw,1895
 muffin_rest/peewee/types.py,sha256=cgCXhpGHkImKwudA1lulZHz5oJswHH168AiW5MhZRCM,155
 muffin_rest/peewee/utils.py,sha256=wXeneVE1IZl1ROnY28re73H62Y1_tEmoEQYzPhuOyBI,702
 muffin_rest/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.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,,
+muffin_rest-5.1.8.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-5.1.8.dist-info/METADATA,sha256=bjqZvSOrDnhx1JAN__YW_KOhJQKSJ34zbdomUDPC8bE,4126
+muffin_rest-5.1.8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+muffin_rest-5.1.8.dist-info/RECORD,,