muffin-rest 9.0.0__py3-none-any.whl → 9.2.0__py3-none-any.whl

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

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

@@ -15,7 +15,7 @@ muffin_rest/openapi.py,sha256=0QU7qrfBjGl0vl378SJC5boZZI2ogddl45fS9WL4Axw,8751
 muffin_rest/options.py,sha256=reHbd2o-F6bKEKc8bznzj0TMY2vzjK6Yt1qOny7kt_w,2691
 muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
 muffin_rest/peewee/filters.py,sha256=oghjKwurNCyFUYT0r2TVu2Nd1SIalRsmbU4_RbaoXLs,2440
-muffin_rest/peewee/handler.py,sha256=tfmRzCWCV41x_k9Ysma735MPsNOx-o4Bnp5hFIbSxu0,5354
+muffin_rest/peewee/handler.py,sha256=Tk20ChTGkhzSF0K1-TFruPfXJyHfJE_fDKcQqGQeoAU,5297
 muffin_rest/peewee/openapi.py,sha256=lDnLnoXi33p0YeFVwRgaVrndyrG2XL93RH-BzbxinOY,1105
 muffin_rest/peewee/options.py,sha256=TimJtErC9e8B7BRiEkHiBZd71_bZbYr-FE2PIlQvfH0,1455
 muffin_rest/peewee/schemas.py,sha256=w6jBziUp40mOOjkz_4RCXuY0x5ZDIe9Ob25k1FnZSfc,469
@@ -33,7 +33,7 @@ muffin_rest/sqlalchemy/types.py,sha256=Exm-zAQCtPAwXvYcCTtPRqSa-wTEWRcH_v2YSsJkB
 muffin_rest/swagger.html,sha256=2uGLu_KpkYf925KnDKHBJmV9pm6OHn5C3BWScESsUS8,1736
 muffin_rest/types.py,sha256=lU0tAaDu9sKm-30RM1_qOx-hOYEkNRaA72LdWDvg72g,491
 muffin_rest/utils.py,sha256=c08E4HJ4SLYC-91GKPEbsyKTZ4sZbTN4qDqJbNg_HTE,2076
-muffin_rest-9.0.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-9.0.0.dist-info/METADATA,sha256=3chS--H-C60xpvb9nBi6hlBfRCjEUOQ8Jd8gJGq11uM,4169
-muffin_rest-9.0.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-muffin_rest-9.0.0.dist-info/RECORD,,
+muffin_rest-9.2.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-9.2.0.dist-info/METADATA,sha256=ZB8W02vkcIb8ZrwPQEGeF5MH7P9A2g9ZMfJ-943x1WE,4134
+muffin_rest-9.2.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+muffin_rest-9.2.0.dist-info/RECORD,,