muffin-rest 8.1.0__py3-none-any.whl → 9.1.1__py3-none-any.whl

muffin_rest/handler.py

@@ -29,7 +29,7 @@ from muffin_rest.types import TSchemaRes
 
 from .errors import HandlerNotBindedError
 from .options import RESTOptions
-from .types import TVData, TVResource
+from .types import TVCollection, TVData, TVResource
 
 
 class RESTHandlerMeta(HandlerMeta):
@@ -94,28 +94,26 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
 
     async def __call__(self, request: Request, *, method_name: Optional[str] = None, **_) -> Any:
         """Dispatch the given request by HTTP method."""
-        method = getattr(self, method_name or request.method.lower())
-        meta = self.meta
         self.auth = await self.authorize(request)
+
+        meta = self.meta
         if meta.rate_limit:
             await self.rate_limit(request)
 
         self.collection = await self.prepare_collection(request)
         resource = await self.prepare_resource(request)
-        if not (request.method == "GET" and resource is None):
+        method = getattr(self, method_name or request.method.lower())
+        if not (request.method == "GET" and resource is None and not method_name):
             return await method(request, resource=resource)
 
-        headers = None
-
         # Filter collection
-        if meta.filters:
-            self.collection, self.filters = await meta.filters.apply(request, self.collection)
+        self.collection, self.filters = await self.filter(request, self.collection)
 
         # Sort collection
-        if meta.sorting:
-            self.collection, self.sorting = await meta.sorting.apply(request, self.collection)
+        self.collection, self.sorting = await self.sort(request, self.collection)
 
         # Paginate the collection
+        headers = None
         if meta.limit:
             limit, offset = self.paginate_prepare_params(request)
             if limit and offset >= 0:
@@ -160,6 +158,21 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
         """Load a resource."""
         return request["path_params"].get(self.meta.name_id)
 
+    async def filter(self, request: Request, collection: TVCollection) -> tuple[TVCollection, Any]:
+        """Filter the collection."""
+        filters = self.meta.filters
+        if filters:
+            return await filters.apply(request, collection)
+
+        return collection, None
+
+    async def sort(self, request: Request, collection: TVCollection) -> tuple[TVCollection, Any]:
+        sorting = self.meta.sorting
+        if sorting:
+            return await sorting.apply(request, collection)
+
+        return collection, None
+
     # Paginate
     # --------
     def paginate_prepare_headers(self, limit, offset, total=None):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin-rest
-Version: 8.1.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
@@ -19,17 +19,18 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: WWW/HTTP
 Provides-Extra: peewee
 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-8.1.0.dist-info → muffin_rest-9.1.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ muffin_rest/__init__.py,sha256=NBZeOEJgQHtFFhVgd9d0fpApFRgU405sbm0cu1y1MOU,1242
 muffin_rest/api.py,sha256=zssoHjqTsa8UCAyxj6TxQVluYPX9Sigyiph6SRxBY6I,3870
 muffin_rest/errors.py,sha256=mxEBhNPo3pwpG2em6zaQonbfRgHFBJ3I8WunVYWDjvM,1163
 muffin_rest/filters.py,sha256=MARP_WsJslncahlgZLTImigl0RTxBtb0jmZbXfJ0c6Y,5637
-muffin_rest/handler.py,sha256=7DjPEtWmq7laWELKLJ6yZUwSdtxFIOps-699N_5_viQ,10277
+muffin_rest/handler.py,sha256=3efL8-AbxR0oHEwySfWSyfRuxCWyJOwDaYAhUzg6f-0,10772
 muffin_rest/limits.py,sha256=pA5hnDQgrP-euDGjAoczlT_b7Dxzw5btQ-3okkHYKSA,1855
 muffin_rest/marshmallow.py,sha256=jWsZeMj3KslbGGgzEMo8-e5eeuGhmqFolL0mIEquylc,789
 muffin_rest/mongo/__init__.py,sha256=SiYSbX6ySJl43fw9aGREIs8ZsS8Qk_ieizoPOj4DjJc,4656
@@ -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-8.1.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-8.1.0.dist-info/METADATA,sha256=nsCP8WeRU29Tdlfno68igQTZNIaZin39bWIfY2spMZI,4118
-muffin_rest-8.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-muffin_rest-8.1.0.dist-info/RECORD,,
+muffin_rest-9.1.1.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-9.1.1.dist-info/METADATA,sha256=wD6-ATvsx8N9AJQ4OB2Yz7dWAyLarB37eZsR5pAjcrk,4134
+muffin_rest-9.1.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+muffin_rest-9.1.1.dist-info/RECORD,,

{muffin_rest-8.1.0.dist-info → muffin_rest-9.1.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any