django-ninja-aio-crud 0.7.1__tar.gz → 0.7.3__tar.gz

django_ninja_aio_crud-0.7.3/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Giuseppe Casillo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{django_ninja_aio_crud-0.7.1 → django_ninja_aio_crud-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: django-ninja-aio-crud
-Version: 0.7.1
+Version: 0.7.3
 Summary: Django Ninja AIO CRUD - Rest Framework
 Author: Giuseppe Casillo
 Requires-Python: >=3.10
@@ -22,6 +22,7 @@ Classifier: Framework :: Django
 Classifier: Framework :: AsyncIO
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Classifier: Topic :: Internet :: WWW/HTTP
+License-File: LICENSE
 Requires-Dist: django-ninja >=1.3.0
 Requires-Dist: joserfc >=1.0.0
 Requires-Dist: orjson >= 3.10.7

{django_ninja_aio_crud-0.7.1 → django_ninja_aio_crud-0.7.3}/ninja_aio/__init__.py

@@ -1,6 +1,6 @@
 """Django Ninja AIO CRUD - Rest Framework"""
 
-__version__ = "0.7.1"
+__version__ = "0.7.3"
 
 from .api import NinjaAIO
 

{django_ninja_aio_crud-0.7.1 → django_ninja_aio_crud-0.7.3}/ninja_aio/models.py

@@ -16,7 +16,7 @@ from django.db.models.fields.related_descriptors import (
 )
 
 from .exceptions import SerializeError
-from .types import S_TYPES, REL_TYPES, F_TYPES, SCHEMA_TYPES, ModelSerializerMeta
+from .types import S_TYPES, F_TYPES, SCHEMA_TYPES, ModelSerializerMeta
 
 
 class ModelUtil:
@@ -277,6 +277,17 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
                     custom_fields=reverse_rels + customs,
                     exclude=excludes,
                 )
+            case "Related":
+                fields, customs = cls.get_related_schema_data()
+                if not fields and not customs:
+                    return None
+                return create_schema(
+                    model=cls,
+                    name=f"{cls._meta.model_name}SchemaRelated",
+                    fields=fields,
+                    custom_fields=customs,
+                )
+
         fields = cls.get_fields(s_type)
         optionals = cls.get_optional_fields(s_type)
         customs = cls.get_custom_fields(s_type) + optionals
@@ -335,75 +346,35 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
         pass
 
     @classmethod
-    def get_forward_relation_schema(cls, obj: type["ModelSerializer"], field: str):
-        cls_f = []
-        for rel_f in obj.ReadSerializer.fields:
-            rel_f_obj = getattr(obj, rel_f)
-            if isinstance(
-                rel_f_obj,
+    def get_related_schema_data(cls):
+        fields = cls.get_fields("read")
+        custom_f = [f[0] for f in cls.get_custom_fields("read")]
+        related_fields = []
+        for f in fields + custom_f:
+            field_obj = getattr(cls, f)
+            if not isinstance(
+                field_obj,
                 (
                     ManyToManyDescriptor,
                     ReverseManyToOneDescriptor,
                     ReverseOneToOneDescriptor,
+                    ForwardManyToOneDescriptor,
+                    ForwardOneToOneDescriptor,
                 ),
             ):
-                if isinstance(rel_f_obj, ManyToManyDescriptor):
-                    rel_obj: ModelSerializer = rel_f_obj.field.related_model
-                    if rel_f_obj.reverse:
-                        rel_obj = rel_f_obj.field.model
-                elif isinstance(rel_f_obj, ReverseManyToOneDescriptor):
-                    rel_obj = rel_f_obj.field.model
-                else:  # ReverseOneToOneDescriptor
-                    rel_obj = rel_f_obj.related.related_model
-                if not rel_obj == cls:
-                    continue
-                cls_f.append(rel_f)
-                obj.ReadSerializer.fields.remove(rel_f)
-        rel_schema = obj.generate_read_s(depth=0)
-        rel_data = (
-            field,
-            rel_schema | None,
-            None,
-        )
-        if len(cls_f) > 0:
-            obj.ReadSerializer.fields.append(*cls_f)
-        return rel_data
+                related_fields.append(f)
 
-    @classmethod
-    def get_reverse_relation_schema(
-        cls, obj: type["ModelSerializer"], rel_type: type[REL_TYPES], field: str
-    ):
-        cls_f = []
-        for rel_f in obj.ReadSerializer.fields:
-            rel_f_obj = getattr(obj, rel_f)
-            if (
-                isinstance(
-                    rel_f_obj.field,
-                    (
-                        models.ForeignKey,
-                        models.OneToOneField,
-                    ),
-                )
-                and rel_f_obj.field.related_model == cls
-            ):
-                cls_f.append(rel_f)
-                obj.ReadSerializer.fields.remove(rel_f)
-                continue
-            if isinstance(rel_f_obj.field, models.ManyToManyField):
-                cls_f.append(rel_f)
-                obj.ReadSerializer.fields.remove(rel_f)
-
-        rel_schema = obj.generate_read_s(depth=0)
-        if rel_type == "many":
-            rel_schema = list[rel_schema]
-        rel_data = (
-            field,
-            rel_schema | None,
-            None,
-        )
-        if len(cls_f) > 0:
-            obj.ReadSerializer.fields.append(*cls_f)
-        return rel_data
+        if not related_fields:
+            return None, None
+
+        custom_related_fields = []
+        for f in related_fields:
+            for custom in cls.get_custom_fields("read"):
+                if f == custom[0]:
+                    custom_related_fields.append(custom)
+                    related_fields.remove(f)
+
+        return related_fields, custom_related_fields
 
     @classmethod
     def get_schema_out_data(cls):
@@ -431,19 +402,32 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
                 else:  # ReverseOneToOneDescriptor
                     rel_obj = field_obj.related.related_model
                     rel_type = "one"
-
-                if not rel_obj.get_fields("read") and not rel_obj.get_custom_fields("read"):
+                if not isinstance(rel_obj, ModelSerializerMeta):
+                    continue
+                if not rel_obj.get_fields("read") and not rel_obj.get_custom_fields(
+                    "read"
+                ):
                     continue
-                rel_data = cls.get_reverse_relation_schema(rel_obj, rel_type, f)
+                rel_schema = (
+                    rel_obj.generate_related_s()
+                    if rel_type != "many"
+                    else list[rel_obj.generate_related_s()]
+                )
+                rel_data = (f, rel_schema | None, None)
                 reverse_rels.append(rel_data)
                 continue
             if isinstance(
                 field_obj, (ForwardOneToOneDescriptor, ForwardManyToOneDescriptor)
             ):
                 rel_obj = field_obj.field.related_model
-                if not rel_obj.get_fields("read") and not rel_obj.get_custom_fields("read"):
+                if not isinstance(rel_obj, ModelSerializerMeta):
+                    fields.append(f)
                     continue
-                rel_data = cls.get_forward_relation_schema(rel_obj, f)
+                if not rel_obj.get_fields("read") and not rel_obj.get_custom_fields(
+                    "read"
+                ):
+                    continue
+                rel_data = (f, rel_obj.generate_related_s() | None, None)
                 rels.append(rel_data)
                 continue
             fields.append(f)
@@ -467,7 +451,7 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
         ) or cls._is_special_field("update", field, "optionals")
 
     @classmethod
-    def get_custom_fields(cls, s_type: type[S_TYPES]):
+    def get_custom_fields(cls, s_type: type[S_TYPES]) -> list[tuple]:
         return cls._get_fields(s_type, "customs")
 
     @classmethod
@@ -496,3 +480,7 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
     @classmethod
     def generate_update_s(cls) -> Schema:
         return cls._generate_model_schema("Patch")
+
+    @classmethod
+    def generate_related_s(cls) -> Schema:
+        return cls._generate_model_schema("Related")

{django_ninja_aio_crud-0.7.1 → django_ninja_aio_crud-0.7.3}/ninja_aio/types.py

@@ -3,11 +3,11 @@ from typing import Literal
 from django.db.models import Model
 
 S_TYPES = Literal["read", "create", "update"]
-REL_TYPES = Literal["many", "one"]
 F_TYPES = Literal["fields", "customs", "optionals", "excludes"]
-SCHEMA_TYPES = Literal["In", "Out", "Patch"]
+SCHEMA_TYPES = Literal["In", "Out", "Patch", "Related"]
 VIEW_TYPES = Literal["list", "retrieve", "create", "update", "delete", "all"]
 
+
 class ModelSerializerType(type):
     def __repr__(self):
         return self.__name__