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

{dynamicforms_fastapi_viewsets-0.14.1 → dynamicforms_fastapi_viewsets-0.15.0}/PKG-INFO

@@ -1,18 +1,14 @@
-Metadata-Version: 2.5
+Metadata-Version: 2.4
 Name: dynamicforms-fastapi-viewsets
-Version: 0.14.1
+Version: 0.15.0
 Summary: Django REST Framework-style viewsets for FastAPI, with optional Celery-backed async execution and a Vue/TypeScript client counterpart.
-Project-URL: Homepage, https://github.com/dynamicforms/fastapi-viewsets
-Project-URL: Repository, https://github.com/dynamicforms/fastapi-viewsets
-Project-URL: Issues, https://github.com/dynamicforms/fastapi-viewsets/issues
-Project-URL: Documentation, https://docs.velis.si/dynamicforms/fastapi-viewsets/
-Author-email: Jure Erznožnik <jure.erznoznik@gmail.com>
-License: MIT
+Keywords: fastapi,viewsets,rest,dynamicforms,celery,django-rest-framework
+Author: Jure Erznožnik
+Author-email: Jure Erznožnik <jure.erznoznik@velis.si>
+License-Expression: MIT
 License-File: LICENSE
-Keywords: celery,django-rest-framework,dynamicforms,fastapi,rest,viewsets
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -21,36 +17,24 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Typing :: Typed
-Requires-Python: >=3.10
 Requires-Dist: fastapi>=0.100
 Requires-Dist: pydantic>=2.11
 Requires-Dist: typing-extensions>=4.10
+Requires-Dist: celery>=5.3 ; extra == 'celery'
+Requires-Dist: redis>=5.0 ; extra == 'celery'
+Requires-Dist: django>=4.2 ; extra == 'django'
+Requires-Dist: asgiref>=3.6 ; extra == 'django'
+Requires-Dist: pyjwt>=2.8 ; extra == 'jwt'
+Requires-Dist: muxws[starlette]>=0.4.2 ; extra == 'muxws'
+Requires-Python: >=3.10
+Project-URL: Homepage, https://github.com/dynamicforms/fastapi-viewsets
+Project-URL: Repository, https://github.com/dynamicforms/fastapi-viewsets
+Project-URL: Issues, https://github.com/dynamicforms/fastapi-viewsets/issues
+Project-URL: Documentation, https://docs.velis.si/dynamicforms/fastapi-viewsets/
 Provides-Extra: celery
-Requires-Dist: celery>=5.3; extra == 'celery'
-Requires-Dist: redis>=5.0; extra == 'celery'
-Provides-Extra: dev
-Requires-Dist: asgiref; extra == 'dev'
-Requires-Dist: celery; extra == 'dev'
-Requires-Dist: coverage; extra == 'dev'
-Requires-Dist: django; extra == 'dev'
-Requires-Dist: gevent; extra == 'dev'
-Requires-Dist: httpx2; extra == 'dev'
-Requires-Dist: muxws[starlette,websockets]>=0.4.2; extra == 'dev'
-Requires-Dist: pyjwt; extra == 'dev'
-Requires-Dist: pytest; extra == 'dev'
-Requires-Dist: pytest-asyncio; extra == 'dev'
-Requires-Dist: pytest-cov; extra == 'dev'
-Requires-Dist: python-multipart; extra == 'dev'
-Requires-Dist: redis; extra == 'dev'
-Requires-Dist: ruff; extra == 'dev'
-Requires-Dist: uvicorn; extra == 'dev'
 Provides-Extra: django
-Requires-Dist: asgiref>=3.6; extra == 'django'
-Requires-Dist: django>=4.2; extra == 'django'
 Provides-Extra: jwt
-Requires-Dist: pyjwt>=2.8; extra == 'jwt'
 Provides-Extra: muxws
-Requires-Dist: muxws[starlette]>=0.4.2; extra == 'muxws'
 Description-Content-Type: text/markdown
 
 # DynamicForms FastAPI Viewsets

{dynamicforms_fastapi_viewsets-0.14.1 → dynamicforms_fastapi_viewsets-0.15.0}/fastapi_viewsets/__init__.py

@@ -1,5 +1,7 @@
-__version__ = "0.14.1"
+from importlib.metadata import version
 
 from .error_namespace import ERROR_NAMESPACE, ERROR_NAMESPACE_PYDANTIC
 
+__version__ = version("dynamicforms-fastapi-viewsets")
+
 __all__ = ["ERROR_NAMESPACE", "ERROR_NAMESPACE_PYDANTIC", "__version__"]

{dynamicforms_fastapi_viewsets-0.14.1 → dynamicforms_fastapi_viewsets-0.15.0}/fastapi_viewsets/backends/django_orm.py

@@ -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}
 
     # -----------------------------------------------------------------------
 

{dynamicforms_fastapi_viewsets-0.14.1 → dynamicforms_fastapi_viewsets-0.15.0}/fastapi_viewsets/collection_viewset.py

@@ -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"):

{dynamicforms_fastapi_viewsets-0.14.1 → dynamicforms_fastapi_viewsets-0.15.0}/fastapi_viewsets/events/changes.py

@@ -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])]
 

{dynamicforms_fastapi_viewsets-0.14.1 → dynamicforms_fastapi_viewsets-0.15.0}/fastapi_viewsets/mixins.py

@@ -1,10 +1,14 @@
+import functools
+
 from abc import ABC, abstractmethod
 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
@@ -21,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 (
@@ -39,6 +44,15 @@ K = TypeVar("K")
 TFilter = TypeVar("TFilter", default=None)
 
 
+@functools.cache
+def _item_type(cls: type) -> Any:
+    """The viewset's list item type `T`; `Any` when unbound. A page of it encodes as the declared result."""
+    from fastapi_viewsets.decorators.route_viewset import build_type_map
+
+    item = build_type_map(cls).get(T, Any)
+    return Any if isinstance(item, TypeVar) else item
+
+
 class ImplMixin(Generic[K, T], ABC):
     @abstractmethod
     async def perform_create(self, context: Context, data: T) -> T:
@@ -84,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
 
 
 ###################################################################################################
@@ -456,7 +481,7 @@ class ListMixin(Generic[T, TFilter], ABC):
         has_more_forward = has_more if not backwards else bool(query.cursor)
         has_previous = bool(query.cursor) if not backwards else has_more
 
-        return CursorPage[Any](
+        return CursorPage[_item_type(type(self))](
             results=results,
             limit=query.limit,
             has_more=has_more_forward,
@@ -487,7 +512,7 @@ class ListMixin(Generic[T, TFilter], ABC):
         page, has_more = await self.take_page(query, records)
         # Already converted if an in-memory stage had to land the source earlier; see land().
         results = page if not query.needs("conversion") else self._to_records(page)
-        return PaginatedList[Any](
+        return PaginatedList[_item_type(type(self))](
             results=results,
             offset=query.offset,
             limit=query.limit,
@@ -540,7 +565,6 @@ class ListMixin(Generic[T, TFilter], ABC):
         In-memory sort hook. The default is a stable multi-key sort using the cursor's comparison
         (`compare_in_order`), so NULL placement matches the cursor's.
         """
-        import functools
 
         def compare(a: T, b: T) -> int:
             for col in sort:
@@ -639,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)
 
 
@@ -661,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)
 
 

dynamicforms_fastapi_viewsets-0.15.0/pyproject.toml

@@ -0,0 +1,169 @@
+[build-system]
+requires = ["uv_build>=0.13.6,<0.14"]
+build-backend = "uv_build"
+
+[project]
+name = "dynamicforms-fastapi-viewsets"
+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"
+license-files = ["LICENSE"]
+requires-python = ">=3.10"
+keywords = [
+    "fastapi",
+    "viewsets",
+    "rest",
+    "dynamicforms",
+    "celery",
+    "django-rest-framework",
+]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Topic :: Internet :: WWW/HTTP",
+    "Typing :: Typed",
+]
+dependencies = [
+    "fastapi>=0.100",
+    "pydantic>=2.11",
+    "typing_extensions>=4.10",
+]
+
+[[project.authors]]
+name = "Jure Erznožnik"
+email = "jure.erznoznik@velis.si"
+
+[project.optional-dependencies]
+celery = [
+    "celery>=5.3",
+    "redis>=5.0",
+]
+muxws = ["muxws[starlette]>=0.4.2"]
+django = [
+    "django>=4.2",
+    "asgiref>=3.6",
+]
+jwt = ["PyJWT>=2.8"]
+
+[project.urls]
+Homepage = "https://github.com/dynamicforms/fastapi-viewsets"
+Repository = "https://github.com/dynamicforms/fastapi-viewsets"
+Issues = "https://github.com/dynamicforms/fastapi-viewsets/issues"
+Documentation = "https://docs.velis.si/dynamicforms/fastapi-viewsets/"
+
+[dependency-groups]
+dev = [
+    "coverage",
+    "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+    "httpx2",
+    "python-multipart",
+    "redis",
+    "celery",
+    "gevent",
+    "django",
+    "asgiref",
+    "PyJWT",
+    "muxws[starlette,websockets]>=0.4.2",
+    "ruff",
+    "uvicorn",
+]
+
+[tool.uv.build-backend]
+module-name = "fastapi_viewsets"
+module-root = ""
+source-include = ["LICENSE"]
+source-exclude = ["**/*_test.py"]
+
+[tool.publish]
+tests = "pytest"
+
+[tool.ruff]
+exclude = [
+    "dockertest",
+    "tests",
+    "docs",
+    "examples",
+    "scripts",
+    "setup.py",
+    "setup.cfg",
+    "README.md",
+    "LICENSE",
+    "MANIFEST.in",
+    "pyproject.toml",
+    "Pipfile",
+    "Pipfile.lock",
+    "ruff.egg-info",
+    "dist",
+    "build",
+    ".gitignore",
+    ".git",
+    ".idea",
+    ".vscode",
+    ".pytest_cache",
+    ".coverage",
+    ".ruff",
+    ".venv",
+    "*/migrations/*",
+]
+line-length = 120
+
+[tool.ruff.lint]
+select = [
+    "E",
+    "W",
+    "F",
+    "I",
+    "Q",
+    "B",
+    "UP",
+    "N",
+    "PT",
+    "S",
+    "C4",
+    "ARG",
+]
+ignore = [
+    "E731",
+    "E722",
+    "C408",
+]
+fixable = ["ALL"]
+unfixable = []
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[tool.ruff.lint.per-file-ignores]
+"*_test.py" = ["S101"]
+
+[tool.ruff.lint.isort]
+case-sensitive = false
+lines-between-types = 1
+combine-as-imports = true
+order-by-type = false
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
+
+[tool.pytest.ini_options]
+markers = ["celery_worker: runs a real Celery worker against the Redis named by FASTAPI_VIEWSETS_TEST_REDIS_URL"]
+filterwarnings = ["ignore:.*endpoints are unreachable:UserWarning"]
+
+[tool.coverage.run]
+omit = [
+    "demo/*",
+    "demo/**/*",
+    "demo.py",
+    "test_*.py",
+    "*_test.py",
+]

dynamicforms_fastapi_viewsets-0.14.1/pyproject.toml → dynamicforms_fastapi_viewsets-0.15.0/pyproject.toml.orig

@@ -1,22 +1,22 @@
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["uv_build>=0.13.6,<0.14"]
+build-backend = "uv_build"
 
 [project]
 name = "dynamicforms-fastapi-viewsets"
-dynamic = ["version"]
+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 = { text = "MIT" }
+license = "MIT"
+license-files = ["LICENSE"]
 authors = [
-    { name = "Jure Erznožnik", email = "jure.erznoznik@gmail.com" },
+    { name = "Jure Erznožnik", email = "jure.erznoznik@velis.si" },
 ]
 requires-python = ">=3.10"
 keywords = ["fastapi", "viewsets", "rest", "dynamicforms", "celery", "django-rest-framework"]
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
@@ -37,6 +37,8 @@ celery = ["celery>=5.3", "redis>=5.0"]
 muxws = ["muxws[starlette]>=0.4.2"]
 django = ["django>=4.2", "asgiref>=3.6"]
 jwt = ["PyJWT>=2.8"]
+
+[dependency-groups]
 dev = [
     "coverage",
     "pytest",
@@ -61,21 +63,11 @@ Repository = "https://github.com/dynamicforms/fastapi-viewsets"
 Issues = "https://github.com/dynamicforms/fastapi-viewsets/issues"
 Documentation = "https://docs.velis.si/dynamicforms/fastapi-viewsets/"
 
-[tool.hatch.version]
-path = "fastapi_viewsets/__init__.py"
-
-[tool.hatch.build.targets.wheel]
-packages = ["fastapi_viewsets"]
-
-[tool.hatch.build.targets.sdist]
-include = [
-    "/fastapi_viewsets",
-    "/README.md",
-    "/LICENSE",
-]
-exclude = [
-    "**/*_test.py",
-]
+[tool.uv.build-backend]
+module-name = "fastapi_viewsets"
+module-root = ""
+source-include = ["LICENSE"]
+source-exclude = ["**/*_test.py"]
 
 [tool.publish]
 tests = "pytest"
@@ -84,7 +76,7 @@ tests = "pytest"
 exclude = ['dockertest',
     'tests', 'docs', 'examples', 'scripts', 'setup.py', 'setup.cfg', 'README.md', 'LICENSE', 'MANIFEST.in',
     'pyproject.toml', 'Pipfile', 'Pipfile.lock', 'ruff.egg-info', 'dist', 'build', '.gitignore', '.git', '.idea',
-    '.vscode', '.pytest_cache', '.coverage', '.ruff', '*/migrations/*']
+    '.vscode', '.pytest_cache', '.coverage', '.ruff', '.venv', '*/migrations/*']
 line-length = 120
 
 [tool.ruff.lint]

dynamicforms_fastapi_viewsets-0.14.1/.gitignore

@@ -1,21 +0,0 @@
-.idea
-node_modules
-coverage
-dist
-/demo/test-results
-/demo/backend/demo.sqlite3
-
-/celerybeat-schedule.db
-/demo/backend/demo.sqlite3
-
-/docs/.vitepress/cache
-
-__pycache__/
-*.py[cod]
-*.egg-info/
-.eggs/
-build/
-.pytest_cache/
-.ruff_cache/
-.coverage
-coverage.json