muffin-rest 9.0.0__tar.gz → 9.1.1__tar.gz

{muffin_rest-9.0.0 → muffin_rest-9.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin-rest
-Version: 9.0.0
+Version: 9.1.1
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
 Home-page: https://github.com/klen/muffin-rest
 License: MIT
@@ -26,11 +26,11 @@ Provides-Extra: sqlalchemy
 Provides-Extra: yaml
 Requires-Dist: apispec (>=6,<7)
 Requires-Dist: marshmallow (>=3,<4)
-Requires-Dist: marshmallow-peewee (>=4,<5) ; extra == "peewee"
+Requires-Dist: marshmallow-peewee ; extra == "peewee"
 Requires-Dist: marshmallow-sqlalchemy ; extra == "sqlalchemy"
 Requires-Dist: muffin (>=0,<1)
-Requires-Dist: muffin-databases (>=0.5.0,<0.6.0) ; extra == "sqlalchemy"
-Requires-Dist: muffin-peewee-aio (>=0,<1) ; extra == "peewee"
+Requires-Dist: muffin-databases ; extra == "sqlalchemy"
+Requires-Dist: muffin-peewee-aio ; extra == "peewee"
 Requires-Dist: pyyaml ; extra == "yaml"
 Requires-Dist: sqlalchemy ; extra == "sqlalchemy"
 Project-URL: Repository, https://github.com/klen/muffin-rest

{muffin_rest-9.0.0 → muffin_rest-9.1.1}/muffin_rest/peewee/handler.py

@@ -92,18 +92,18 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
 
     async def paginate(self, _: Request, *, limit: int = 0, offset: int = 0):
         """Paginate the collection."""
-        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 = None
         if self.meta.limit_total:
-            count = await self.meta.manager.count(self.collection)
+            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]
 
-        return (
-            cast(pw.ModelSelect, self.collection.offset(offset).limit(limit)),  # type: ignore[misc]
-            count,
-        )
+            count = await self.meta.manager.count(cqs)
+
+        else:
+            count = None
+
+        return self.collection.offset(offset).limit(limit), count
 
     async def get(self, request, *, resource: Optional[TVModel] = None) -> Any:
         """Get resource or collection of resources."""

{muffin_rest-9.0.0 → muffin_rest-9.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "muffin-rest"
-version = "9.0.0"
+version = "9.1.1"
 description = "The package provides enhanced support for writing REST APIs with Muffin framework"
 readme = "README.rst"
 homepage = "https://github.com/klen/muffin-rest"
@@ -31,9 +31,9 @@ muffin = "^0"
 
 # Optional dependencies
 pyyaml = { version = "*", optional = true }
-muffin-peewee-aio = { version = "^0", optional = true }
-marshmallow-peewee = { version = "^4", optional = true }
-muffin-databases = { version = "^0.5.0", optional = true }
+muffin-peewee-aio = { version = "*", optional = true }
+marshmallow-peewee = { version = "*", optional = true }
+muffin-databases = { version = "*", optional = true }
 marshmallow-sqlalchemy = { version = "*", optional = true }
 sqlalchemy = { version = "*", optional = true }
 
@@ -44,10 +44,10 @@ sqlalchemy = ["muffin-databases", "marshmallow-sqlalchemy", "sqlalchemy"]
 
 [tool.poetry.group.tests.dependencies]
 aiosqlite = "*"
-marshmallow-peewee = "^4.0.3"
+marshmallow-peewee = "*"
 marshmallow-sqlalchemy = "*"
-muffin-databases = "^0.5.0"
-muffin-mongo = "^0.5.1"
+muffin-databases = "*"
+muffin-mongo = "*"
 muffin-peewee-aio = "*"
 pytest = "*"
 pytest-aio = { version = "*", extras = ["curio", "trio"] }
@@ -63,7 +63,7 @@ pre-commit = "*"
 [tool.poetry.group.example.dependencies]
 uvicorn = "*"
 muffin-peewee-aio = "*"
-marshmallow-peewee = "^4.0.3"
+marshmallow-peewee = "*"
 
 
 [tool.pytest.ini_options]