base-api-utils 1.1.110.dev1__py3-none-any.whl → 1.1.111.dev2__py3-none-any.whl

base_api_utils/serializers/v2/__init__.py

@@ -1,2 +1,7 @@
 from .abstract_serializer import AbstractSerializer
-from .base_model_serializer import BaseModelSerializer
+from .base_model_serializer import BaseModelSerializer
+
+try:
+    import base_api_utils.serializers.v2.spectacular  # noqa: F401
+except ImportError:
+    pass  # drf-spectacular not installed

base_api_utils/serializers/v2/expands.py

@@ -13,7 +13,6 @@ class ExpandMapping:
     original_attribute: str | None = None
     source: str | None = None
     verify_relation: bool = False
-    schema_override: type | None = None
 
     @property
     def source_kwargs(self) -> dict:
@@ -87,17 +86,6 @@ class One2ManyExpandSerializer(IExpandSerializer):
                 fields[fk] = serializers.IntegerField(read_only=True)
 
 
-class _IDListField(serializers.Field):
-    """Runtime: returns list of PKs. Schema: annotated externally via _spectacular_annotation."""
-    def to_representation(self, value):
-        if hasattr(value, 'all'):
-            return [item.pk for item in value.all()]
-        return [item.pk for item in value]
-
-    def to_internal_value(self, data):
-        return data
-
-
 class Many2OneExpandSerializer(IExpandSerializer):
     # to-many: keep same key; not expanded => list[int]; expanded => list[object]
     def apply(self, *, fields: dict, mapping: ExpandMapping, context: dict) -> None:
@@ -127,7 +115,8 @@ class Many2OneExpandSerializer(IExpandSerializer):
                 **mapping.source_kwargs,
             )
         else:
-            schema_cls = mapping.schema_override or mapping.serializer
-            id_field = _IDListField(read_only=True, **mapping.source_kwargs)
-            id_field._spectacular_annotation = {"field": schema_cls(many=True, read_only=True)}
-            fields[attr] = id_field
+            fields[attr] = serializers.PrimaryKeyRelatedField(
+                many=True,
+                read_only=True,
+                **mapping.source_kwargs,
+            )

base_api_utils/serializers/v2/spectacular.py

@@ -0,0 +1,54 @@
+from drf_spectacular.extensions import OpenApiSerializerExtension
+
+from .abstract_serializer import AbstractSerializer
+
+
+class ExpandMappingSerializerExtension(OpenApiSerializerExtension):
+    """Generate OpenAPI schemas with all expand_mappings expanded.
+
+    Without this extension, drf-spectacular calls get_fields() on our serializers
+    without request context, which collapses all relations to ID fields. This
+    extension builds a synthetic "all expanded" context so the schema shows
+    nested serializer types ($ref) instead of integer IDs.
+    """
+
+    target_class = AbstractSerializer
+    match_subclasses = True
+
+    def map_serializer(self, auto_schema, direction):
+        serializer = self.target
+        mappings = serializer._merged_expand_mappings()
+
+        # Leaf serializers (no expand_mappings) — delegate to default handling
+        if not mappings:
+            return auto_schema._map_serializer(serializer, direction, bypass_extensions=True)
+
+        # Build synthetic context with all relations expanded
+        expand_tree = {}
+        for attr, spec in mappings.items():
+            child_serializer_cls = spec["serializer"]
+            child_mappings = {}
+            # Build child expand tree from the child serializer's own mappings
+            if hasattr(child_serializer_cls, "_merged_expand_mappings"):
+                try:
+                    child_instance = child_serializer_cls(context={})
+                    child_mappings = child_instance._merged_expand_mappings()
+                except Exception:
+                    pass
+            expand_tree[attr] = {k: {} for k in child_mappings}
+
+        relations_tree = {attr: {} for attr in mappings}
+        # Also include any allowed_relations not covered by expand_mappings
+        for rel in serializer._merged_allowed_relations():
+            if rel not in relations_tree:
+                relations_tree[rel] = {}
+
+        context = {
+            "expand_tree": expand_tree,
+            "fields_tree": None,
+            "relations_tree": relations_tree,
+        }
+
+        # Create a new instance with the synthetic context
+        expanded = serializer.__class__(context=context)
+        return auto_schema._map_serializer(expanded, direction, bypass_extensions=True)

{base_api_utils-1.1.110.dev1.dist-info → base_api_utils-1.1.111.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.110.dev1
+Version: 1.1.111.dev2
 Summary: Django Rest Framework micro services common utilities
 Author-email: Román Gutierrez <roman@tipit.net>, Sebastian Marcet <sebastian@tipit.net>
 Project-URL: Homepage, https://github.com/fntechgit/base-api-utils

{base_api_utils-1.1.110.dev1.dist-info → base_api_utils-1.1.111.dev2.dist-info}/RECORD

@@ -43,11 +43,12 @@ base_api_utils/serializers/nullable_slug_related_field.py,sha256=drNIpKoDps2DOYR
 base_api_utils/serializers/serializers_registry.py,sha256=V4teS5tCNQ2WdzN-tYNJSMp4QK97lyO3TA5_xyPo2BY,758
 base_api_utils/serializers/task_result_serializer.py,sha256=oUqD9EDQr2oxyIpgZJ1lpSGKF5Vhhy25TOQUCGTPqFY,218
 base_api_utils/serializers/timestamp_field.py,sha256=uZXbJ7BnabJylSZPt_dQEUBuT_XL3khhGjzJ08ji-DY,682
-base_api_utils/serializers/v2/__init__.py,sha256=7PIk2k7whEtLNoHN-G7ScU4YgKmpvyEj-NC0dpuLnZI,106
+base_api_utils/serializers/v2/__init__.py,sha256=hOWxvmFSrKpkB19x3MPz37Pz1BjJqaymqs5Dt6m4_fA,241
 base_api_utils/serializers/v2/abstract_serializer.py,sha256=OwRfK9VIV4Y0ybB0j8xQawM-_ac1L1q8KXGDE45i6kY,6370
 base_api_utils/serializers/v2/base_model_serializer.py,sha256=S9AO0GXUcOvA6wCO88VoSSVFHBwe2fFAHZe4gmZKn6M,720
-base_api_utils/serializers/v2/expands.py,sha256=2wp34usPZ7Bvr-yhEgkTrV8D-uSJTDpruEVNSXzm4Bc,4555
+base_api_utils/serializers/v2/expands.py,sha256=ihfWTDeFusCrSBO6t89-lGCETiDjQf7CCewIqK6jOK0,4043
 base_api_utils/serializers/v2/query_params.py,sha256=6b6rnV0Ye37xWun72x7zHKtspWzn4tdf2gVaFEaqp9M,1821
+base_api_utils/serializers/v2/spectacular.py,sha256=sk9fpqS0CSwJXS2z03Jz0pAInzrb2MxWa8dpJUuqBbE,2264
 base_api_utils/services/__init__.py,sha256=9ftsKre12VuQTYCzSilvJ8gFJXaKtJ1L87hYPdVr-5k,708
 base_api_utils/services/abstract_domain_events_service.py,sha256=iD49zg8IKZ8t0OQ5i5rgJLmttksifR4eDSJpSwDxiJM,311
 base_api_utils/services/abstract_event_dispatcher.py,sha256=nX8N79vPtqxEezbVxxNEAl4cOxwwUM0mjc6T_-8CJRE,195
@@ -96,8 +97,8 @@ base_api_utils/views/base_view.py,sha256=A49KZr03qxjBQvCLLdtbg4s3f9Gn9C63gwcpme2
 base_api_utils/views/parent_children_crud.py,sha256=79vB044kmY9kefb6YxekPriO3FKYV85zn3PgCmSSKFw,3261
 base_api_utils/views/root_entity_crud.py,sha256=eIhZfjouNxYAVIfGPuEPp80b50hM2CAG_L0nh6-Gdjw,2830
 base_api_utils/views/tasks_result_view.py,sha256=__i1_uG73-YgL61ZMyldfcMTrpP3sTSLBnzEh-GD5Cs,1575
-base_api_utils-1.1.110.dev1.dist-info/licenses/LICENSE,sha256=JKqaWBs87qnqDsZ1EEF0gnWR2iSAh92F9TJ7tqg2OwQ,547
-base_api_utils-1.1.110.dev1.dist-info/METADATA,sha256=FkuH_KQZVPb2FGQx8QinnohrNqFO6o5aLNDBz_s0XnU,2386
-base_api_utils-1.1.110.dev1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-base_api_utils-1.1.110.dev1.dist-info/top_level.txt,sha256=uRTtK_DlttSQ1sVajv2TKZy5XLVWawLxi2PUU-uCR7A,15
-base_api_utils-1.1.110.dev1.dist-info/RECORD,,
+base_api_utils-1.1.111.dev2.dist-info/licenses/LICENSE,sha256=JKqaWBs87qnqDsZ1EEF0gnWR2iSAh92F9TJ7tqg2OwQ,547
+base_api_utils-1.1.111.dev2.dist-info/METADATA,sha256=tghLynehfJjZ0oJNaL3rhB_2CP1CKO4EPz6jN4dDrX8,2386
+base_api_utils-1.1.111.dev2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+base_api_utils-1.1.111.dev2.dist-info/top_level.txt,sha256=uRTtK_DlttSQ1sVajv2TKZy5XLVWawLxi2PUU-uCR7A,15
+base_api_utils-1.1.111.dev2.dist-info/RECORD,,