muffin-rest 10.0.0__tar.gz → 11.0.0__tar.gz

{muffin_rest-10.0.0 → muffin_rest-11.0.0}/PKG-INFO

@@ -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 → muffin_rest-11.0.0}/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-11.0.0/muffin_rest/marshmallow.py

@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Optional, Union
+
+from marshmallow import Schema, ValidationError
+
+from muffin_rest.errors import APIError
+
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+
+async def load_data(data: Union[Mapping, list], schema: Optional[Schema] = None, **params):
+    if schema is None:
+        return data
+
+    try:
+        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-10.0.0 → muffin_rest-11.0.0}/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 → muffin_rest-11.0.0}/pyproject.toml

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

muffin_rest-10.0.0/muffin_rest/marshmallow.py

@@ -1,26 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Mapping
-from typing import TYPE_CHECKING, Optional, Union, cast
-
-from marshmallow import Schema, ValidationError
-
-from muffin_rest.errors import APIError
-
-if TYPE_CHECKING:
-    from asgi_tools import Request
-
-
-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
-
-    if schema is None:
-        return data
-
-    try:
-        return schema.load(cast(Union[Mapping, list], data), many=isinstance(data, list), **params)
-    except ValidationError as err:
-        raise APIError.BAD_REQUEST("Bad request data", errors=err.messages) from err