base-api-utils 1.1.111.dev3__py3-none-any.whl → 1.1.111.dev5__py3-none-any.whl

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,6 +104,9 @@ class Many2OneExpandSerializer(IExpandSerializer):
             mapping.verify_relation,
         )
 
+        if attr not in fields:
+            return
+
         if do_expand:
             fields[attr] = mapping.serializer(
                 many=True,
@@ -124,9 +115,8 @@ class Many2OneExpandSerializer(IExpandSerializer):
                 **mapping.source_kwargs,
             )
         else:
-            if attr not in fields:
-                return
-            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

@@ -1,7 +1,5 @@
 from drf_spectacular.extensions import OpenApiSerializerExtension
 
-from .abstract_serializer import AbstractSerializer
-
 
 class ExpandMappingSerializerExtension(OpenApiSerializerExtension):
     """Generate OpenAPI schemas with all expand_mappings expanded.
@@ -12,7 +10,9 @@ class ExpandMappingSerializerExtension(OpenApiSerializerExtension):
     nested serializer types ($ref) instead of integer IDs.
     """
 
-    target_class = AbstractSerializer
+    target_class = (
+        "base_api_utils.serializers.v2.abstract_serializer.AbstractSerializer"
+    )
     match_subclasses = True
 
     def map_serializer(self, auto_schema, direction):

{base_api_utils-1.1.111.dev3.dist-info → base_api_utils-1.1.111.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.111.dev3
+Version: 1.1.111.dev5
 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.111.dev3.dist-info → base_api_utils-1.1.111.dev5.dist-info}/RECORD

@@ -46,9 +46,9 @@ base_api_utils/serializers/timestamp_field.py,sha256=uZXbJ7BnabJylSZPt_dQEUBuT_X
 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=DtZDInbyEmriLx7LOzd-dE0coly9IDCKY7uOSlO82v4,4562
+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/serializers/v2/spectacular.py,sha256=0A7QVyto_vbFFgU7KS-1kz8ui4SHKFOXRaN-LLQ2WeE,2279
 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
@@ -97,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.111.dev3.dist-info/licenses/LICENSE,sha256=JKqaWBs87qnqDsZ1EEF0gnWR2iSAh92F9TJ7tqg2OwQ,547
-base_api_utils-1.1.111.dev3.dist-info/METADATA,sha256=zNn0uurarmuOpYAj07AX5GOxBRUG49dtOwIjLRbVT98,2386
-base_api_utils-1.1.111.dev3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-base_api_utils-1.1.111.dev3.dist-info/top_level.txt,sha256=uRTtK_DlttSQ1sVajv2TKZy5XLVWawLxi2PUU-uCR7A,15
-base_api_utils-1.1.111.dev3.dist-info/RECORD,,
+base_api_utils-1.1.111.dev5.dist-info/licenses/LICENSE,sha256=JKqaWBs87qnqDsZ1EEF0gnWR2iSAh92F9TJ7tqg2OwQ,547
+base_api_utils-1.1.111.dev5.dist-info/METADATA,sha256=dWUyNy4P-MM8C3lQo-G9fJUSIqP6YGgLhKUHwXIWksc,2386
+base_api_utils-1.1.111.dev5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+base_api_utils-1.1.111.dev5.dist-info/top_level.txt,sha256=uRTtK_DlttSQ1sVajv2TKZy5XLVWawLxi2PUU-uCR7A,15
+base_api_utils-1.1.111.dev5.dist-info/RECORD,,