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

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

@@ -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 → muffin_rest-5.1.8}/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-5.1.6 → muffin_rest-5.1.8}/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-5.1.6 → muffin_rest-5.1.8}/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 → muffin_rest-5.1.8}/pyproject.toml

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