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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-ninja-aio-crud
-Version: 0.7.3
+Version: 0.7.5
 Summary: Django Ninja AIO CRUD - Rest Framework
 Author: Giuseppe Casillo
 Requires-Python: >=3.10

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

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

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

@@ -7,6 +7,7 @@ from ninja.orm import create_schema
 from django.db import models
 from django.http import HttpRequest
 from django.core.exceptions import ObjectDoesNotExist
+from asgiref.sync import sync_to_async
 from django.db.models.fields.related_descriptors import (
     ReverseManyToOneDescriptor,
     ReverseOneToOneDescriptor,
@@ -19,6 +20,10 @@ from .exceptions import SerializeError
 from .types import S_TYPES, F_TYPES, SCHEMA_TYPES, ModelSerializerMeta
 
 
+async def agetattr(obj, name: str, default=None):
+    return await sync_to_async(getattr)(obj, name, default)
+
+
 class ModelUtil:
     def __init__(self, model: type["ModelSerializer"] | models.Model):
         self.model = model
@@ -103,7 +108,7 @@ class ModelUtil:
                     continue
                 if self.model.is_optional(k) and v is None:
                     continue
-            field_obj = getattr(self.model, k).field
+            field_obj = (await agetattr(self.model, k)).field
             if isinstance(field_obj, models.BinaryField):
                 try:
                     payload |= {k: base64.b64decode(v)}
@@ -125,10 +130,10 @@ class ModelUtil:
         payload = data.model_dump()
         for k, v in payload.items():
             try:
-                field_obj = getattr(self.model, k).field
+                field_obj = (await agetattr(self.model, k)).field
             except AttributeError:
                 try:
-                    field_obj = getattr(self.model, k).related
+                    field_obj = (await agetattr(self.model, k)).related
                 except AttributeError:
                     pass
             if isinstance(v, dict) and (
@@ -141,7 +146,7 @@ class ModelUtil:
                 )
                 if isinstance(field_obj, models.ForeignKey):
                     for rel_k, rel_v in v.items():
-                        field_rel_obj = getattr(rel, rel_k)
+                        field_rel_obj = await agetattr(rel, rel_k)
                         if isinstance(field_rel_obj, models.ForeignKey):
                             olds_k.append({rel_k: rel_v})
                     for obj in olds_k:
@@ -348,9 +353,9 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
     @classmethod
     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:
+        custom_f = {name: (value, default) for name, value, default  in cls.get_custom_fields("read")}
+        _related_fields = []
+        for f in fields + list(custom_f.keys()):
             field_obj = getattr(cls, f)
             if not isinstance(
                 field_obj,
@@ -362,18 +367,14 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
                     ForwardOneToOneDescriptor,
                 ),
             ):
-                related_fields.append(f)
+                _related_fields.append(f)
 
-        if not related_fields:
+        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)
-
+        
+        custom_related_fields = [(f, *custom_f[f]) for f in _related_fields if f in custom_f]
+        related_fields = [f for f in _related_fields if f not in custom_f]
         return related_fields, custom_related_fields
 
     @classmethod