django-ninja-aio-crud 0.1.3__tar.gz → 0.1.4__tar.gz

{django_ninja_aio_crud-0.1.3 → django_ninja_aio_crud-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-ninja-aio-crud
-Version: 0.1.3
+Version: 0.1.4
 Summary: Django Ninja AIO CRUD - Rest Framework 
 Author: Giuseppe Casillo
 Requires-Python: >=3.10
@@ -300,11 +300,11 @@ BarAPI().add_views_to_route()
 
 - Foo Schemas
 
-![Swagger UI](ninja_aio/docs/images/foo-swagger.png)
+![Swagger UI](docs/images/foo-swagger.png)
 
 - Bar Schemas with reverse relation
 
-![Swagger UI](ninja_aio/docs/images/bar-swagger.png)
+![Swagger UI](docs/images/bar-swagger.png)
 
 ## 🔒 Authentication
 

{django_ninja_aio_crud-0.1.3 → django_ninja_aio_crud-0.1.4}/README.md

@@ -271,11 +271,11 @@ BarAPI().add_views_to_route()
 
 - Foo Schemas
 
-![Swagger UI](ninja_aio/docs/images/foo-swagger.png)
+![Swagger UI](docs/images/foo-swagger.png)
 
 - Bar Schemas with reverse relation
 
-![Swagger UI](ninja_aio/docs/images/bar-swagger.png)
+![Swagger UI](docs/images/bar-swagger.png)
 
 ## 🔒 Authentication
 

{django_ninja_aio_crud-0.1.3 → django_ninja_aio_crud-0.1.4}/ninja_aio/__init__.py

@@ -1,3 +1,3 @@
 """ Django Ninja AIO CRUD - Rest Framework """
 
-__version__ = "0.1.3"
+__version__ = "0.1.4"

{django_ninja_aio_crud-0.1.3 → django_ninja_aio_crud-0.1.4}/ninja_aio/models.py

@@ -87,20 +87,24 @@ class ModelSerializer(models.Model):
         for f in cls.ReadSerializer.fields:
             field_obj = getattr(cls, f)
             if isinstance(field_obj, ReverseManyToOneDescriptor):
-                reverse_rels.append(field_obj.field.__dict__.get("_related_name"))
+                reverse_rels.append(field_obj.field._related_name)
             if isinstance(field_obj, ReverseOneToOneDescriptor):
-                reverse_rels.append(
-                    list(field_obj.__dict__.values())[0].__dict__.get("related_name")
-                )
+                reverse_rels.append(list(field_obj[0].related_name))
         return reverse_rels
 
     @classmethod
     def get_reverse_relation_schema(
         cls, obj: type["ModelSerializer"], rel_type: type[REL_TYPES], field: str
     ):
-        for index, rel_f in enumerate(obj.ReadSerializer.fields):
-            if rel_f == cls._meta.model_name:
-                obj.ReadSerializer.fields.pop(index)
+        cls_f = []
+        for rel_f in obj.ReadSerializer.fields:
+            rel_f_obj = getattr(obj, rel_f).field
+            if (
+                isinstance(rel_f_obj, (models.ForeignKey, models.OneToOneField))
+                and rel_f_obj.related_model == cls
+            ):
+                cls_f.append(rel_f)
+                obj.ReadSerializer.fields.remove(rel_f)
                 break
         rel_schema = obj.generate_read_s(depth=0)
         if rel_type == "many":
@@ -110,7 +114,8 @@ class ModelSerializer(models.Model):
             rel_schema | None,
             None,
         )
-        obj.ReadSerializer.fields.append(cls._meta.model_name)
+        if len(cls_f) > 0:
+            obj.ReadSerializer.fields.append(*cls_f)
         return rel_data
 
     @classmethod
@@ -120,14 +125,12 @@ class ModelSerializer(models.Model):
         for f in cls.ReadSerializer.fields:
             field_obj = getattr(cls, f)
             if isinstance(field_obj, ReverseManyToOneDescriptor):
-                rel_obj: ModelSerializer = field_obj.field.__dict__.get("model")
+                rel_obj: ModelSerializer = field_obj.field.model
                 rel_data = cls.get_reverse_relation_schema(rel_obj, "many", f)
                 reverse_rels.append(rel_data)
                 continue
             if isinstance(field_obj, ReverseOneToOneDescriptor):
-                rel_obj: ModelSerializer = list(field_obj.__dict__.values())[
-                    0
-                ].__dict__.get("related_model")
+                rel_obj: ModelSerializer = list(field_obj)[0].related_model
                 rel_data = cls.get_reverse_relation_schema(rel_obj, "one", f)
                 reverse_rels.append(rel_data)
                 continue
@@ -149,9 +152,10 @@ class ModelSerializer(models.Model):
                 continue
             field_obj = getattr(cls, k).field
             if isinstance(field_obj, models.BinaryField):
-                if not v.endswith(b"=="):
-                    v = v + b"=="
-                payload |= {k: base64.b64decode(v)}
+                try:
+                    payload |= {k: base64.b64decode(v)}
+                except Exception as exc:
+                    raise SerializeError({k: ". ".join(exc.args)}, 400)
             if isinstance(field_obj, models.ForeignKey):
                 try:
                     rel: ModelSerializer = await field_obj.related_model.get_object(

{django_ninja_aio_crud-0.1.3 → django_ninja_aio_crud-0.1.4}/ninja_aio/renders.py

@@ -8,9 +8,11 @@ from ninja.renderers import BaseRenderer
 class ORJSONRenderer(BaseRenderer):
     media_type = "application/json"
 
-    def render(self, request: HttpRequest, data: dict | list, *, response_status):
-        if isinstance(data, list):
-            return orjson.dumps(self.render_list(data))
+    def render(self, request: HttpRequest, data: dict, *, response_status):
+        old_d = data
+        for k, v in old_d.items():
+            if isinstance(v, list):
+                data |= {k: self.render_list(v)}
         return orjson.dumps(self.render_dict(data))
 
     @classmethod
@@ -33,11 +35,9 @@ class ORJSONRenderer(BaseRenderer):
                     v |= {k_rel: base64.b64encode(v_rel).decode()}
                 data |= {k: v}
             if isinstance(v, list):
-                index_rel = 0
-                for f_rel in v:
+                for index_rel, f_rel in enumerate(v):
                     for k_rel, v_rel in f_rel.items():
                         if isinstance(v_rel, bytes):
                             v[index_rel] |= {k_rel: base64.b64encode(v_rel).decode()}
-                    index_rel += 1
                 data |= {k: v}
         return data