django-ninja-aio-crud 2.14.0__py3-none-any.whl → 2.15.1__py3-none-any.whl

{django_ninja_aio_crud-2.14.0.dist-info → django_ninja_aio_crud-2.15.1.dist-info}/METADATA

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

{django_ninja_aio_crud-2.14.0.dist-info → django_ninja_aio_crud-2.15.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ninja_aio/__init__.py,sha256=cdoKMOyGNe8UDjxTJQBqIMhJ_-OLa8J5FBMGB-6C-6E,120
+ninja_aio/__init__.py,sha256=UFEs6cNB-kwFYmp9hCdjKOccadx3Y4iBVqJZQgpgOag,120
 ninja_aio/api.py,sha256=tuC7vdvn7s1GkCnSFy9Kn1zv0glZfYptRQVvo8ZRtGQ,2429
-ninja_aio/auth.py,sha256=4sWdFPjKiQgUL1d_CSGDblVjnY5ptP6LQha6XXdluJA,9157
+ninja_aio/auth.py,sha256=f4yk45fLi36Qctu0A0zgHTFedb9yk3ewq5rOMpoPYIE,9035
 ninja_aio/exceptions.py,sha256=_3xFqfFCOfrrMhSA0xbMqgXy8R0UQjhXaExrFvaDAjY,3891
 ninja_aio/parsers.py,sha256=e_4lGCPV7zs-HTqtdJTc8yQD2KPAn9njbL8nF_Mmgkc,153
 ninja_aio/renders.py,sha256=CW0xDa05Xna-UvL0MZqZeDEgueEaUassV_nG7Rh1-cw,1824
@@ -14,7 +14,7 @@ ninja_aio/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ninja_aio/helpers/api.py,sha256=O2nGvP3VSsG-AReQRn90yDH8vS3kMKh125j-ikwgGoQ,20987
 ninja_aio/helpers/query.py,sha256=Lqv4nrWYr543tC5K-SEcBottLID8cb83aDc26i2Wxj4,5053
 ninja_aio/models/__init__.py,sha256=L3UQnQAlKoI3F7jinadL-Nn55hkPvnSRPYW0JtnbWFo,114
-ninja_aio/models/serializers.py,sha256=Bv5Guqc_OuOGPos6A8HD0EdfGJZI_NQ9mmHhKb8jyZI,42114
+ninja_aio/models/serializers.py,sha256=fwuEQrBcybCNBHPo1i-EHXIX8F4Fd52iduZf_Cl9wE4,42823
 ninja_aio/models/utils.py,sha256=lAXtc3YY7_n4f0jIacX4DSXhUOzMy7y5MsBnInNxtfk,32874
 ninja_aio/schemas/__init__.py,sha256=dHILiYBKMb51lDcyQdiXRw_0nzqM7Lu81UX2hv7kEfo,837
 ninja_aio/schemas/api.py,sha256=dGUpJXR1iAf93QNR4kYj1uqIkTjiMfXultCotY6GtaQ,361
@@ -24,7 +24,7 @@ ninja_aio/schemas/helpers.py,sha256=h4zQRf21NVLMQbIVH-psAE4FICUBc857EqngblEy7og,
 ninja_aio/views/__init__.py,sha256=DEzjWA6y3WF0V10nNF8eEurLNEodgxKzyFd09AqVp3s,148
 ninja_aio/views/api.py,sha256=AAqkj0xT8J3PmJvsbluZ33cfrmrXJHiV9ARe2BqnfQ8,22492
 ninja_aio/views/mixins.py,sha256=Zl6J8gbVagwT85bzDuKyJTk3iFxxFgX0YgYkjiUxZGg,17040
-django_ninja_aio_crud-2.14.0.dist-info/licenses/LICENSE,sha256=yrDAYcm0gRp_Qyzo3GQa4BjYjWRkAhGC8QRva__RYq0,1073
-django_ninja_aio_crud-2.14.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-django_ninja_aio_crud-2.14.0.dist-info/METADATA,sha256=M2D8ZIAziKDs1Xo2AibR1QzcTXXe2Tlxeh3h7CYi6bo,9964
-django_ninja_aio_crud-2.14.0.dist-info/RECORD,,
+django_ninja_aio_crud-2.15.1.dist-info/licenses/LICENSE,sha256=yrDAYcm0gRp_Qyzo3GQa4BjYjWRkAhGC8QRva__RYq0,1073
+django_ninja_aio_crud-2.15.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+django_ninja_aio_crud-2.15.1.dist-info/METADATA,sha256=uc2HGzkCM18x7vvzkykDsBxtm_nwVKKMpwVk-yFaQq8,9964
+django_ninja_aio_crud-2.15.1.dist-info/RECORD,,

ninja_aio/__init__.py

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

ninja_aio/auth.py

@@ -107,11 +107,6 @@ class AsyncJwtBearer(HttpBearer):
         """
         try:
             self.dcd = jwt.decode(token, self.jwt_public, algorithms=self.algorithms)
-        except ValueError:
-            # raise AuthError(", ".join(exc.args), 401)
-            return False
-
-        try:
             self.validate_claims(self.dcd.claims)
         except errors.JoseError:
             return False

ninja_aio/models/serializers.py

@@ -46,8 +46,23 @@ def _extract_pk(v: Any) -> Any:
     return v
 
 
-# Annotated type for extracting PK from model instances during serialization
-PkFromModel = Annotated[int, BeforeValidator(_extract_pk)]
+class PkFromModel:
+    """Subscriptable type for extracting PK from model instances during serialization.
+
+    Usage:
+        PkFromModel[int]   -> for integer PKs
+        PkFromModel[str]   -> for string PKs
+        PkFromModel[UUID]  -> for UUID PKs
+        PkFromModel        -> defaults to int (backwards compatible)
+    """
+
+    _default = Annotated[int, BeforeValidator(_extract_pk)]
+
+    def __class_getitem__(cls, pk_type: type) -> type:
+        return Annotated[pk_type, BeforeValidator(_extract_pk)]
+
+    def __new__(cls):
+        return cls._default
 
 
 class BaseSerializer:
@@ -290,9 +305,8 @@ class BaseSerializer:
         """
         # Auto-resolve ModelSerializer with readable fields
         if isinstance(rel_model, ModelSerializerMeta):
-            if rel_model.get_fields("read") or rel_model.get_custom_fields("read"):
-                return rel_model.generate_related_s()
-            return None
+            has_readable_fields = rel_model.get_fields("read") or rel_model.get_custom_fields("read")
+            return rel_model.generate_related_s() if has_readable_fields else None
 
         # Resolve from explicit serializer mapping
         rel_serializers = cls._get_relations_serializers() or {}
@@ -415,12 +429,14 @@ class BaseSerializer:
 
         # Handle relations_as_id for reverse relations
         if field_name in relations_as_id:
+            from ninja_aio.models.utils import ModelUtil
+            pk_field_type = ModelUtil(rel_model).pk_field_type
             if many:
                 # For many relations, use PkFromModel to extract PKs from model instances
-                return (field_name, list[PkFromModel], Field(default_factory=list))
+                return (field_name, list[PkFromModel[pk_field_type]], Field(default_factory=list))
             else:
                 # For single reverse relations (ReverseOneToOne), extract pk
-                return (field_name, PkFromModel | None, None)
+                return (field_name, PkFromModel[pk_field_type] | None, None)
 
         schema = cls._resolve_relation_schema(field_name, rel_model)
         if not schema:
@@ -455,15 +471,16 @@ class BaseSerializer:
 
         # Handle relations_as_id: serialize as the raw FK ID
         if field_name in relations_as_id:
+            from ninja_aio.models.utils import ModelUtil
+            pk_field_type = ModelUtil(rel_model).pk_field_type
             # Use PkFromModel to extract pk from the related instance during serialization
-            return (field_name, PkFromModel | None, None)
+            return (field_name, PkFromModel[pk_field_type] | None, None)
 
         # Special case: ModelSerializer with no readable fields should be skipped entirely
-        if isinstance(rel_model, ModelSerializerMeta):
-            if not (
-                rel_model.get_fields("read") or rel_model.get_custom_fields("read")
-            ):
-                return None
+        if isinstance(rel_model, ModelSerializerMeta) and not (
+            rel_model.get_fields("read") or rel_model.get_custom_fields("read")
+        ):
+            return None
 
         schema = cls._resolve_relation_schema(field_name, rel_model)
         if not schema: