django-ninja-aio-crud 2.3.2__py3-none-any.whl → 2.5.0__py3-none-any.whl

ninja_aio/views/api.py

@@ -17,7 +17,8 @@ from ninja_aio.schemas import (
 )
 from ninja_aio.helpers.api import ManyToManyAPI
 from ninja_aio.types import ModelSerializerMeta, VIEW_TYPES
-from ninja_aio.decorators import unique_view, decorate_view
+from ninja_aio.decorators import unique_view, decorate_view, aatomic
+from ninja_aio.models import serializers
 
 ERROR_CODES = frozenset({400, 401, 404})
 
@@ -221,6 +222,7 @@ class APIViewSet(API):
     """
 
     model: ModelSerializer | Model
+    serializer_class: serializers.Serializer | None = None
     schema_in: Schema | None = None
     schema_out: Schema | None = None
     schema_update: Schema | None = None
@@ -239,6 +241,8 @@ class APIViewSet(API):
     m2m_relations: list[M2MRelationSchema] = []
     m2m_auth: list | None = NOT_SET
     extra_decorators: DecoratorsSchema = DecoratorsSchema()
+    model_verbose_name: str = ""
+    model_verbose_name_plural: str = ""
 
     def __init__(
         self,
@@ -251,14 +255,20 @@ class APIViewSet(API):
         self.error_codes = ERROR_CODES
         self.model = model or self.model
         self.model_util = (
-            ModelUtil(self.model)
+            ModelUtil(self.model, serializer_class=self.serializer_class)
             if not isinstance(self.model, ModelSerializerMeta)
             else self.model.util
         )
         self.schema_out, self.schema_in, self.schema_update = self.get_schemas()
         self.path_schema = self._generate_path_schema()
         self.filters_schema = self._generate_filters_schema()
-        self.model_verbose_name = self.model._meta.verbose_name.capitalize()
+        self.model_verbose_name = (
+            self.model_verbose_name or self.model._meta.verbose_name.capitalize()
+        )
+        self.model_verbose_name_plural = (
+            self.model_verbose_name_plural
+            or self.model._meta.verbose_name_plural.capitalize()
+        )
         self.router_tag = self.router_tag or self.model_verbose_name
         self.router_tags = self.router_tags or tags or [self.router_tag]
         self.router = Router(tags=self.router_tags)
@@ -355,16 +365,31 @@ class APIViewSet(API):
         Compute and return (schema_out, schema_in, schema_update).
 
         - If model is a ModelSerializer (ModelSerializerMeta), auto-generate read/create/update schemas.
-        - Otherwise, return the schemas already set on the viewset (may be None).
-        """
-        if not isinstance(self.model, ModelSerializerMeta):
-            return self.schema_out, self.schema_in, self.schema_update
-        return (
-            self.schema_out or self.model.generate_read_s(),
-            self.schema_in or self.model.generate_create_s(),
-            self.schema_update or self.model.generate_update_s(),
+        - Otherwise, use existing schemas or generate from serializer_class if provided.
+        """
+        # ModelSerializer case: prefer explicitly set schemas, otherwise generate from the model
+        if isinstance(self.model, ModelSerializerMeta):
+            return (
+                self.schema_out or self.model.generate_read_s(),
+                self.schema_in or self.model.generate_create_s(),
+                self.schema_update or self.model.generate_update_s(),
+            )
+
+        # Non-ModelSerializer: start from provided schemas
+        schema_out, schema_in, schema_update = (
+            self.schema_out,
+            self.schema_in,
+            self.schema_update,
         )
 
+        # If a serializer_class is available, generate from it
+        if self.serializer_class:
+            schema_in = schema_in or self.serializer_class.generate_create_s()
+            schema_out = schema_out or self.serializer_class.generate_read_s()
+            schema_update = schema_update or self.serializer_class.generate_update_s()
+
+        return (schema_out, schema_in, schema_update)
+
     async def query_params_handler(
         self, queryset: QuerySet[ModelSerializer], filters: dict
     ):
@@ -383,11 +408,11 @@ class APIViewSet(API):
         @self.router.post(
             self.path,
             auth=self.post_view_auth(),
-            summary=f"Create {self.model._meta.verbose_name.capitalize()}",
+            summary=f"Create {self.model_verbose_name}",
             description=self.create_docs,
             response={201: self.schema_out, self.error_codes: GenericMessageSchema},
         )
-        @decorate_view(unique_view(self), *self.extra_decorators.create)
+        @decorate_view(aatomic, unique_view(self), *self.extra_decorators.create)
         async def create(request: HttpRequest, data: self.schema_in):  # type: ignore
             return 201, await self.model_util.create_s(request, data, self.schema_out)
 
@@ -401,7 +426,7 @@ class APIViewSet(API):
         @self.router.get(
             self.get_path,
             auth=self.get_view_auth(),
-            summary=f"List {self.model._meta.verbose_name_plural.capitalize()}",
+            summary=f"List {self.model_verbose_name_plural}",
             description=self.list_docs,
             response={
                 200: List[self.schema_out],
@@ -436,7 +461,7 @@ class APIViewSet(API):
         @self.router.get(
             self.get_path_retrieve,
             auth=self.get_view_auth(),
-            summary=f"Retrieve {self.model._meta.verbose_name.capitalize()}",
+            summary=f"Retrieve {self.model_verbose_name}",
             description=self.retrieve_docs,
             response={200: self.schema_out, self.error_codes: GenericMessageSchema},
         )
@@ -461,11 +486,11 @@ class APIViewSet(API):
         @self.router.patch(
             self.path_retrieve,
             auth=self.patch_view_auth(),
-            summary=f"Update {self.model._meta.verbose_name.capitalize()}",
+            summary=f"Update {self.model_verbose_name}",
             description=self.update_docs,
             response={200: self.schema_out, self.error_codes: GenericMessageSchema},
         )
-        @decorate_view(unique_view(self), *self.extra_decorators.update)
+        @decorate_view(aatomic, unique_view(self), *self.extra_decorators.update)
         async def update(
             request: HttpRequest,
             data: self.schema_update,  # type: ignore
@@ -485,11 +510,11 @@ class APIViewSet(API):
         @self.router.delete(
             self.path_retrieve,
             auth=self.delete_view_auth(),
-            summary=f"Delete {self.model._meta.verbose_name.capitalize()}",
+            summary=f"Delete {self.model_verbose_name}",
             description=self.delete_docs,
             response={204: None, self.error_codes: GenericMessageSchema},
         )
-        @decorate_view(unique_view(self), *self.extra_decorators.delete)
+        @decorate_view(aatomic, unique_view(self), *self.extra_decorators.delete)
         async def delete(request: HttpRequest, pk: Path[self.path_schema]):  # type: ignore
             return 204, await self.model_util.delete_s(request, self._get_pk(pk))