PyPI - dynamicforms-fastapi-viewsets - Versions diffs - 0.14.2__tar.gz → 0.15.0__tar.gz - Mend

@@ -5,8 +5,10 @@ from enum import Enum
 from typing import Annotated, Any, final, Generic, get_args, get_origin, Union
 from fastapi import APIRouter, Header, Query
+from fastapi.exceptions import RequestValidationError
 from pydantic import BaseModel, ConfigDict, create_model
 from pydantic.alias_generators import to_camel
+from starlette.exceptions import HTTPException
 from typing_extensions import TypeVar
 from fastapi_viewsets.conf import settings
@@ -23,6 +25,7 @@ from fastapi_viewsets.cursor import (
     make_predicate,
     position_of,
 )
+from fastapi_viewsets.error_responses import ApiErrorBody, error_body
 from fastapi_viewsets.exceptions import CursorRequestError, UnsupportedListShapeError
 from fastapi_viewsets.filters import filters_from, FilterSet
 from fastapi_viewsets.list_query import (
@@ -95,18 +98,29 @@ class ImplMixin(Generic[K, T], ABC):
         raise NotImplementedError("Method 'perform_bulk_update' must be implemented.")
     @abstractmethod
-    async def perform_destroy(self, context: Context, pk: K) -> dict[K, Any]:
+    async def perform_destroy(self, context: Context, pk: K) -> dict[K, None]:
         """
-        Subclasses should implement this method to perform the actual destruction.
+        Destroys record `pk` and returns `{pk: None}`; raises `NotFoundError` for a missing record.
         """
         raise NotImplementedError("Method 'perform_destroy' must be implemented.")
-    @abstractmethod
-    async def perform_bulk_destroy(self, context: Context, pk: list[K]) -> list[dict[K, Any]]:
+    async def perform_bulk_destroy(self, context: Context, pk: list[K]) -> dict[K, ApiErrorBody | None]:
         """
-        Subclasses should implement this method to perform the actual bulk destruction.
+        Destroys each key with `perform_destroy`, independently of the others: None for a destroyed key, the
+        `ApiErrorBody` of an `HTTPException` or `RequestValidationError` its destruction raised. Any other
+        exception propagates. A repeated key is destroyed once.
         """
-        raise NotImplementedError("Method 'perform_bulk_destroy' must be implemented.")
+        results: dict[K, ApiErrorBody | None] = {}
+        for one in pk:
+            if one in results:
+                continue
+            try:
+                await self.perform_destroy(context, one)
+            except (HTTPException, RequestValidationError) as error:
+                results[one] = ApiErrorBody.model_validate(error_body(error))
+            else:
+                results[one] = None
+        return results
 ###################################################################################################
@@ -649,14 +663,15 @@ class BulkUpdateMixin(UpdateMixin[K, T], BulkOnlyUpdateMixin[K, T]):
 ###################################################################################################
 class DestroyMixin(Generic[K, T], ABC):
     """
-    Destroy a model instance. Return the destroyed key and any additional data about its destruction
+    Destroy a model instance.
     """
     __router = APIRouter()
     @final
     @__router.delete("/{pk}", responses=NOT_FOUND_RESPONSE)
-    async def destroy(self: "ImplMixin[K, T] | DestroyMixin[K, T]", context: Context, pk: K) -> dict[K, Any]:
+    async def destroy(self: "ImplMixin[K, T] | DestroyMixin[K, T]", context: Context, pk: K) -> dict[K, None]:
+        """Destroy one record. Answers `{pk: null}`; 404 `fastapi-viewsets.not_found` for a missing record."""
         return await self.perform_destroy(context, pk)
@@ -671,7 +686,12 @@ class BulkOnlyDestroyMixin(Generic[K, T], ABC):
     @__router.delete("bulk")
     async def bulk_destroy(
         self: "ImplMixin[K, T] | BulkOnlyDestroyMixin[K, T]", context: Context, pk: list[K]
-    ) -> list[dict[K, Any]]:
+    ) -> dict[K, ApiErrorBody | None]:
+        """
+        Destroy the records of the keys in the body, each independently of the others. Answers 200 with an
+        object keyed by pk: `null` for a destroyed record, the `ApiErrorBody` of the failure otherwise
+        (`fastapi-viewsets.not_found` for a missing record). A failed key does not stop the others.
+        """
         return await self.perform_bulk_destroy(context, pk)

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynamicforms-fastapi-viewsets
-Version: 0.14.2
+Version: 0.15.0
 Summary: Django REST Framework-style viewsets for FastAPI, with optional Celery-backed async execution and a Vue/TypeScript client counterpart.
 Keywords: fastapi,viewsets,rest,dynamicforms,celery,django-rest-framework
 Author: Jure Erznožnik

@@ -286,13 +286,10 @@ class DjangoORMViewSet(ImplMixin[K, T], Generic[K, T]):
                 instance.save()
         return [self.to_record(rows[pk]) for pk in records]
-    async def perform_destroy(self, context: Context, pk: K) -> dict:
+    async def perform_destroy(self, context: Context, pk: K) -> dict[K, None]:
         instance = await self._get_or_404(context, pk)
         await instance.adelete()
-        return {"id": pk}
-    async def perform_bulk_destroy(self, context: Context, pk: list[K]) -> list[dict]:
-        return [await self.perform_destroy(context, one) for one in pk]
+        return {pk: None}
     # -----------------------------------------------------------------------

@@ -66,17 +66,10 @@ class AsyncCollectionViewSet(
             results.append(await self.container_update(pk, data, partial))
         return results
-    async def perform_destroy(self, _context: Context, pk: K) -> dict[K, Any]:
+    async def perform_destroy(self, _context: Context, pk: K) -> dict[K, None]:
         await self.container_delete(pk)
         return {pk: None}
-    async def perform_bulk_destroy(self, _context: Context, pk: list[K]) -> list[dict[K, Any]]:
-        results = []
-        for p in pk:
-            await self.container_delete(p)
-            results.append({p: None})
-        return results
 class CollectionViewSet(AsyncCollectionViewSet[K, T]):
     def __init__(self, container: ReadableCollection[T] | MutableCollection[K, T], pk_field: str = "id"):

@@ -241,12 +241,19 @@ class ChangeEvents(Middleware):
         return name
     def changes_for(self, execution: ActionExecution, op: str, result: Any) -> list[Change]:
-        """One change per pk of the `pk` argument for `deleted`, else per returned record (`ViewSetResult.body`)."""
+        """
+        For `deleted`, one change per pk of the `pk` argument; of a bulk, only the pks the result maps to None
+        (destroyed). Otherwise one per returned record. A `ViewSetResult` contributes its `body`.
+        """
         bulk = execution.action in _BULK_ACTIONS
+        body = result.body if isinstance(result, ViewSetResult) else result
         if op == "deleted":
             pk = _argument(execution, "pk")
-            return [Change(pk=one) for one in (pk if bulk else [pk])]
-        body = result.body if isinstance(result, ViewSetResult) else result
+            if not bulk:
+                return [Change(pk=pk)]
+            if isinstance(body, Mapping):
+                return [Change(pk=one) for one in dict.fromkeys(pk) if one in body and body[one] is None]
+            return [Change(pk=one) for one in pk]
         field = self.pk_field_for(execution)
         return [Change(pk=_read_pk(execution, record, field)) for record in (body if bulk else [body])]

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 [project]
 name = "dynamicforms-fastapi-viewsets"
-version = "0.14.2"
+version = "0.15.0"
 description = "Django REST Framework-style viewsets for FastAPI, with optional Celery-backed async execution and a Vue/TypeScript client counterpart."
 readme = "README.md"
 license = "MIT"

dynamicforms-fastapi-viewsets 0.14.2__tar.gz → 0.15.0__tar.gz

dynamicforms-fastapi-viewsets 0.14.2tar.gz → 0.15.0tar.gz