base-api-utils 1.1.110.dev1__tar.gz → 1.1.111__tar.gz

{base_api_utils-1.1.110.dev1/src/base_api_utils.egg-info → base_api_utils-1.1.111}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.110.dev1
+Version: 1.1.111
 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 → base_api_utils-1.1.111}/pyproject.toml

@@ -7,7 +7,7 @@ where = ["src"]
 
 [project]
 name = "base-api-utils"
-version = "1.1.110.dev1"
+version = "1.1.111"
 dependencies = [
     "boto3",
     "celery",

base_api_utils-1.1.111/src/base_api_utils/serializers/v2/__init__.py

@@ -0,0 +1,7 @@
+from .abstract_serializer import AbstractSerializer
+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-1.1.110.dev1 → base_api_utils-1.1.111}/src/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:
@@ -116,9 +104,6 @@ class Many2OneExpandSerializer(IExpandSerializer):
             mapping.verify_relation,
         )
 
-        if attr not in fields:
-            return
-
         if do_expand:
             fields[attr] = mapping.serializer(
                 many=True,
@@ -127,7 +112,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-1.1.111/src/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 → base_api_utils-1.1.111/src/base_api_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.110.dev1
+Version: 1.1.111
 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 → base_api_utils-1.1.111}/src/base_api_utils.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ src/base_api_utils/serializers/v2/abstract_serializer.py
 src/base_api_utils/serializers/v2/base_model_serializer.py
 src/base_api_utils/serializers/v2/expands.py
 src/base_api_utils/serializers/v2/query_params.py
+src/base_api_utils/serializers/v2/spectacular.py
 src/base_api_utils/services/__init__.py
 src/base_api_utils/services/abstract_domain_events_service.py
 src/base_api_utils/services/abstract_event_dispatcher.py

base_api_utils-1.1.110.dev1/src/base_api_utils/serializers/v2/__init__.py

@@ -1,2 +0,0 @@
-from .abstract_serializer import AbstractSerializer
-from .base_model_serializer import BaseModelSerializer