muffin-rest 10.1.0__tar.gz → 11.0.1__tar.gz

{muffin_rest-10.1.0 → muffin_rest-11.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: muffin-rest
-Version: 10.1.0
+Version: 11.0.1
 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.1.0 → muffin_rest-11.0.1}/muffin_rest/peewee/handler.py

@@ -43,18 +43,16 @@ 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):
+    async def prepare_collection(self, _: Request):  # type: ignore[override]
         """Initialize Peeewee QuerySet for a binded to the resource model."""
         return self.meta.model.select()
 
@@ -81,16 +79,14 @@ 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):
+    async def paginate(self, _: Request, *, limit: int = 0, offset: int = 0):  # type: ignore[override]
         """Paginate the collection."""
         if self.meta.limit_total:
             cqs = cast(pw.ModelSelect, self.collection.order_by())
@@ -118,9 +114,9 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
         meta = self.meta
         manager = meta.manager
         if issubclass(meta.model, AIOModel):
-            await resource.save()
+            await resource.save(force_insert=not update)
         else:
-            await manager.save(resource)
+            await manager.save(resource, force_insert=not update)
 
         return resource
 
@@ -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.1.0 → muffin_rest-11.0.1}/pyproject.toml

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