muffin-rest 10.0.0__py3-none-any.whl → 11.0.0__py3-none-any.whl

muffin_rest/handler.py

@@ -8,6 +8,7 @@ from typing import (
     Generic,
     Iterable,
     Literal,
+    Mapping,
     Optional,
     Sequence,
     Union,
@@ -222,14 +223,22 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
         schema_options.setdefault("exclude", query.get("schema_exclude", ()))
         return self.meta.Schema(**schema_options)
 
+    async def load_data(self, request: Request):
+        """Load data from request and create/update a resource."""
+        try:
+            data = await request.data(raise_errors=True)
+        except (ValueError, TypeError) as err:
+            raise APIError.BAD_REQUEST(str(err)) from err
+
+        return data
+
     async def load(
         self, request: Request, resource: Optional[TVResource] = None, **schema_options
     ) -> TVData[TVResource]:
         """Load data from request and create/update a resource."""
         schema = self.get_schema(request, resource=resource, **schema_options)
-        return cast(
-            TVData[TVResource], await load_data(request, schema, partial=resource is not None)
-        )
+        data = cast(Union[Mapping, list], await self.load_data(request))
+        return cast(TVData[TVResource], await load_data(data, schema, partial=resource is not None))
 
     @overload
     async def dump(  # type: ignore[misc]

muffin_rest/marshmallow.py

@@ -1,26 +1,20 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
-from typing import TYPE_CHECKING, Optional, Union, cast
+from typing import TYPE_CHECKING, Optional, Union
 
 from marshmallow import Schema, ValidationError
 
 from muffin_rest.errors import APIError
 
 if TYPE_CHECKING:
-    from asgi_tools import Request
+    from collections.abc import Mapping
 
 
-async def load_data(request: Request, schema: Optional[Schema] = None, **params):
-    try:
-        data = await request.data(raise_errors=True)
-    except (ValueError, TypeError) as err:
-        raise APIError.BAD_REQUEST(str(err)) from err
-
+async def load_data(data: Union[Mapping, list], schema: Optional[Schema] = None, **params):
     if schema is None:
         return data
 
     try:
-        return schema.load(cast(Union[Mapping, list], data), many=isinstance(data, list), **params)
+        return schema.load(data, many=isinstance(data, list), **params)
     except ValidationError as err:
         raise APIError.BAD_REQUEST("Bad request data", errors=err.messages) from err

muffin_rest/peewee/handler.py

@@ -43,15 +43,13 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
     async def prepare_collection(
         self: PWRESTBase[TVAIOModel],
         _: Request,
-    ) -> AIOModelSelect[TVAIOModel]:
-        ...
+    ) -> AIOModelSelect[TVAIOModel]: ...
 
     @overload
     async def prepare_collection(
         self: PWRESTBase[pw.Model],
         _: Request,
-    ) -> pw.ModelSelect:
-        ...
+    ) -> pw.ModelSelect: ...
 
     # NOTE: there is not a default sorting for peewee (conflict with muffin-admin)
     async def prepare_collection(self, _: Request):
@@ -81,14 +79,12 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
     @overload
     async def paginate(
         self: PWRESTBase[TVAIOModel], _: Request, *, limit: int = 0, offset: int = 0
-    ) -> tuple[AIOModelSelect[TVAIOModel], int | None]:
-        ...
+    ) -> tuple[AIOModelSelect[TVAIOModel], int | None]: ...
 
     @overload
     async def paginate(
         self: PWRESTBase[pw.Model], _: Request, *, limit: int = 0, offset: int = 0
-    ) -> tuple[pw.ModelSelect, int | None]:
-        ...
+    ) -> tuple[pw.ModelSelect, int | None]: ...
 
     async def paginate(self, _: Request, *, limit: int = 0, offset: int = 0):
         """Paginate the collection."""
@@ -136,9 +132,7 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
                 return
 
             model_pk = cast(pw.Field, meta.model_pk)
-            resources = await meta.manager.fetchall(
-                self.collection.where(model_pk << data),
-            )
+            resources = await meta.manager.fetchall(self.collection.where(model_pk << data))  # type: ignore[]
 
         if not resources:
             raise APIError.NOT_FOUND()
@@ -151,7 +145,9 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
             for res in resources:
                 await meta.manager.delete_instance(res, recursive=meta.delete_recursive)
 
-    async def delete(self, request: Request, resource: Optional[TVModel] = None):
+        return resource.get_id() if resource else [r.get_id() for r in resources]
+
+    async def delete(self, request: Request, resource: Optional[TVModel] = None):  # type: ignore[override]
         return await self.remove(request, resource)
 
     def get_schema(

{muffin_rest-10.0.0.dist-info → muffin_rest-11.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: muffin-rest
-Version: 10.0.0
+Version: 11.0.0
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
 License: MIT
 Keywords: rest,api,muffin,asgi,asyncio,trio

{muffin_rest-10.0.0.dist-info → muffin_rest-11.0.0.dist-info}/RECORD

@@ -2,9 +2,9 @@ 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=hc-fhBODwrgJM_CvXNtTVH6jIOkjLog8En0iKKYXAGU,5947
-muffin_rest/handler.py,sha256=p3YQZRF2XgoBrf3r2QNVECqjTilYk5ZXFQ53GiJpZAA,10450
+muffin_rest/handler.py,sha256=xRKUMzR2zISva0SbXS-piQ3Xq3d1zu-rZg6H2K7Oy0I,10824
 muffin_rest/limits.py,sha256=Fnlu4Wj3B-BzpahLK-rDbd1GEd7CEQ3zxyOD0vee7GE,2007
-muffin_rest/marshmallow.py,sha256=jWsZeMj3KslbGGgzEMo8-e5eeuGhmqFolL0mIEquylc,789
+muffin_rest/marshmallow.py,sha256=UeHxZLtETlrheDAlMZn7Xv_7vWPxvJQo-sj05nql9gM,574
 muffin_rest/mongo/__init__.py,sha256=SiYSbX6ySJl43fw9aGREIs8ZsS8Qk_ieizoPOj4DjJc,4656
 muffin_rest/mongo/filters.py,sha256=yIxIDVqMn6SoDgVhCqiTxYetw0hoaf_3jIvX2Vnizok,964
 muffin_rest/mongo/schema.py,sha256=y4OEPQnlV_COTIIQ3cKmpqDpD2r18eAWn0rijQldWm0,1205
@@ -15,7 +15,7 @@ muffin_rest/openapi.py,sha256=0QU7qrfBjGl0vl378SJC5boZZI2ogddl45fS9WL4Axw,8751
 muffin_rest/options.py,sha256=38y7AasyAghXNffxX-3xgqLbWDQ1RxAhg77ze7c0Mu0,2232
 muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
 muffin_rest/peewee/filters.py,sha256=p813eJqyTkAhmS3C1P8rWFWb9Tl33OtADjgLctqKnns,2475
-muffin_rest/peewee/handler.py,sha256=Tk20ChTGkhzSF0K1-TFruPfXJyHfJE_fDKcQqGQeoAU,5297
+muffin_rest/peewee/handler.py,sha256=otADwlTnNkook7fNo26yNKtpTV_0OBGKT2IY0QzfdSA,5361
 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=m27-g6BI7qdSWGym4fWALBJa2ZpWR0_m0nlrDx7iTCo,566
 muffin_rest/utils.py,sha256=c08E4HJ4SLYC-91GKPEbsyKTZ4sZbTN4qDqJbNg_HTE,2076
-muffin_rest-10.0.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-10.0.0.dist-info/METADATA,sha256=zVOQR6PAyL4QD4P8S1HPS3g5CPMfCpR3S-EGKCnsBpg,4147
-muffin_rest-10.0.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-muffin_rest-10.0.0.dist-info/RECORD,,
+muffin_rest-11.0.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-11.0.0.dist-info/METADATA,sha256=SNFRlceJDr6y9Hghj_a8GGlHz3Bmg-uwjUkzjDMmVAo,4147
+muffin_rest-11.0.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+muffin_rest-11.0.0.dist-info/RECORD,,

{muffin_rest-10.0.0.dist-info → muffin_rest-11.0.0.dist-info}/WHEEL

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