django-ninja-aio-crud 0.6.1__tar.gz → 0.6.2__tar.gz

{django_ninja_aio_crud-0.6.1 → django_ninja_aio_crud-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-ninja-aio-crud
-Version: 0.6.1
+Version: 0.6.2
 Summary: Django Ninja AIO CRUD - Rest Framework
 Author: Giuseppe Casillo
 Requires-Python: >=3.10
@@ -100,7 +100,7 @@ class Foo(ModelSerializer):
     fields = ["name", "bar"]
 ```
 
-- ReadSerializer, CreateSerializer, UpdateSerializer are used to define which fields would be included in runtime schemas creation. You can also specify custom fields and handle their function by overriding custom_actions ModelSerializer's method(custom fields are only available for Create and Update serializers).
+- ReadSerializer, CreateSerializer, UpdateSerializer are used to define which fields would be included in runtime schemas creation. You can also specify custom fields and handle their function by overriding custom_actions ModelSerializer's method.
 
 ```python
 # models.py
@@ -184,6 +184,35 @@ class Foo(ModelSerializer):
     excludes = ["id", "name"]
     optionals = [("bar", str), ("active", bool)]
 ```
+- If you want to add into ReadSerializer model properties you must define them as customs.
+```python
+# models.py
+from django.db import models
+from ninja_aio.models import ModelSerializer
+
+
+class Foo(ModelSerializer):
+  name = models.CharField(max_length=30)
+  bar = models.CharField(max_length=30, default="")
+  active = models.BooleanField(default=False)
+
+  @propetry
+  def full_name(self):
+    return f"{self.name} example_full_name"
+
+  class ReadSerializer:
+    excludes = ["bar"]
+    customs = [("full_name", str, "")]
+
+  class CreateSerializer:
+    fields = ["name"]
+    optionals = [("bar", str), ("active", bool)]
+
+  class UpdateSerializer:
+    excludes = ["id", "name"]
+    optionals = [("bar", str), ("active", bool)]
+```
+
 
 
 ### APIViewSet

{django_ninja_aio_crud-0.6.1 → django_ninja_aio_crud-0.6.2}/README.md

@@ -69,7 +69,7 @@ class Foo(ModelSerializer):
     fields = ["name", "bar"]
 ```
 
-- ReadSerializer, CreateSerializer, UpdateSerializer are used to define which fields would be included in runtime schemas creation. You can also specify custom fields and handle their function by overriding custom_actions ModelSerializer's method(custom fields are only available for Create and Update serializers).
+- ReadSerializer, CreateSerializer, UpdateSerializer are used to define which fields would be included in runtime schemas creation. You can also specify custom fields and handle their function by overriding custom_actions ModelSerializer's method.
 
 ```python
 # models.py
@@ -153,6 +153,35 @@ class Foo(ModelSerializer):
     excludes = ["id", "name"]
     optionals = [("bar", str), ("active", bool)]
 ```
+- If you want to add into ReadSerializer model properties you must define them as customs.
+```python
+# models.py
+from django.db import models
+from ninja_aio.models import ModelSerializer
+
+
+class Foo(ModelSerializer):
+  name = models.CharField(max_length=30)
+  bar = models.CharField(max_length=30, default="")
+  active = models.BooleanField(default=False)
+
+  @propetry
+  def full_name(self):
+    return f"{self.name} example_full_name"
+
+  class ReadSerializer:
+    excludes = ["bar"]
+    customs = [("full_name", str, "")]
+
+  class CreateSerializer:
+    fields = ["name"]
+    optionals = [("bar", str), ("active", bool)]
+
+  class UpdateSerializer:
+    excludes = ["id", "name"]
+    optionals = [("bar", str), ("active", bool)]
+```
+
 
 
 ### APIViewSet

{django_ninja_aio_crud-0.6.1 → django_ninja_aio_crud-0.6.2}/ninja_aio/__init__.py

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

{django_ninja_aio_crud-0.6.1 → django_ninja_aio_crud-0.6.2}/ninja_aio/auth.py

@@ -1,8 +1,8 @@
-from joserfc import jwt, jwk, errors
+from joserfc import jwt, jwk
 from django.http.request import HttpRequest
 from ninja.security.http import HttpBearer
 
-from .exceptions import AuthError, parse_jose_error
+from .exceptions import AuthError
 
 
 class AsyncJwtBearer(HttpBearer):
@@ -16,15 +16,7 @@ class AsyncJwtBearer(HttpBearer):
 
     def validate_claims(self, claims: jwt.Claims):
         jwt_claims = self.get_claims()
-
-        try:
-            jwt_claims.validate(claims)
-        except (
-            errors.InvalidClaimError,
-            errors.MissingClaimError,
-            errors.ExpiredTokenError,
-        ) as exc:
-            raise AuthError(**parse_jose_error(exc), status_code=401)
+        jwt_claims.validate(claims)
 
     async def auth_handler(self, request: HttpRequest):
         """
@@ -35,8 +27,6 @@ class AsyncJwtBearer(HttpBearer):
     async def authenticate(self, request: HttpRequest, token: str):
         try:
             self.dcd = jwt.decode(token, self.jwt_public, algorithms=self.algorithms)
-        except errors.BadSignatureError as exc:
-            raise AuthError(**parse_jose_error(exc), status_code=401)
         except ValueError as exc:
             raise AuthError(", ".join(exc.args), 401)
 

{django_ninja_aio_crud-0.6.1 → django_ninja_aio_crud-0.6.2}/ninja_aio/exceptions.py

@@ -53,8 +53,16 @@ def _pydantic_validation_error(
     return api.create_response(request, error.error, status=error.status_code)
 
 
+def _jose_error(
+    request: HttpRequest, exc: JoseError, api: type[NinjaAPI]
+) -> HttpResponse:
+    error = BaseException(**parse_jose_error(exc), status_code=401)
+    return api.create_response(request, error.error, status=error.status_code)
+
+
 def set_api_exception_handlers(api: type[NinjaAPI]) -> None:
     api.add_exception_handler(BaseException, partial(_default_error, api=api))
+    api.add_exception_handler(JoseError, partial(_jose_error, api=api))
     api.add_exception_handler(
         ValidationError, partial(_pydantic_validation_error, api=api)
     )

{django_ninja_aio_crud-0.6.1 → django_ninja_aio_crud-0.6.2}/ninja_aio/models.py

@@ -122,7 +122,10 @@ class ModelUtil:
             try:
                 field_obj = getattr(self.model, k).field
             except AttributeError:
-                field_obj = getattr(self.model, k).related
+                try:
+                    field_obj = getattr(self.model, k).related
+                except AttributeError:
+                    pass
             if isinstance(v, dict) and (
                 isinstance(field_obj, models.ForeignKey)
                 or isinstance(field_obj, models.OneToOneField)
@@ -196,6 +199,7 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
     class ReadSerializer:
         fields: list[str] = []
         excludes: list[str] = []
+        customs: list[tuple[str, type, Any]] = []
 
     class UpdateSerializer:
         fields: list[str] = []
@@ -257,15 +261,15 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
             case "Patch":
                 s_type = "update"
             case "Out":
-                fields, reverse_rels, excludes = cls.get_schema_out_data()
-                if not fields and not reverse_rels and not excludes:
+                fields, reverse_rels, excludes, customs = cls.get_schema_out_data()
+                if not fields and not reverse_rels and not excludes and not customs:
                     return None
                 return create_schema(
                     model=cls,
                     name=f"{cls._meta.model_name}SchemaOut",
                     depth=depth,
                     fields=fields,
-                    custom_fields=reverse_rels,
+                    custom_fields=reverse_rels + customs,
                     exclude=excludes,
                 )
         fields = cls.get_fields(s_type)
@@ -367,25 +371,36 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
         reverse_rels = []
         for f in cls.get_fields("read"):
             field_obj = getattr(cls, f)
-            if isinstance(field_obj, ManyToManyDescriptor):
-                rel_obj: ModelSerializer = field_obj.field.related_model
-                if field_obj.reverse:
-                    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, ReverseManyToOneDescriptor):
-                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 = field_obj.related.related_model
-                rel_data = cls.get_reverse_relation_schema(rel_obj, "one", f)
+            if isinstance(
+                field_obj,
+                (
+                    ManyToManyDescriptor,
+                    ReverseManyToOneDescriptor,
+                    ReverseOneToOneDescriptor,
+                ),
+            ):
+                if isinstance(field_obj, ManyToManyDescriptor):
+                    rel_obj: ModelSerializer = field_obj.field.related_model
+                    if field_obj.reverse:
+                        rel_obj = field_obj.field.model
+                    rel_type = "many"
+                elif isinstance(field_obj, ReverseManyToOneDescriptor):
+                    rel_obj = field_obj.field.model
+                    rel_type = "many"
+                else:  # ReverseOneToOneDescriptor
+                    rel_obj = field_obj.related.related_model
+                    rel_type = "one"
+
+                rel_data = cls.get_reverse_relation_schema(rel_obj, rel_type, f)
                 reverse_rels.append(rel_data)
                 continue
             fields.append(f)
-        return fields, reverse_rels, cls.get_excluded_fields("read")
+        return (
+            fields,
+            reverse_rels,
+            cls.get_excluded_fields("read"),
+            cls.get_custom_fields("read"),
+        )
 
     @classmethod
     def is_custom(cls, field: str):