maleo-foundation 0.2.47__py3-none-any.whl → 0.2.49__py3-none-any.whl

maleo_foundation/utils/controller.py

@@ -1,7 +1,7 @@
 import inspect
 from fastapi import status
 from functools import wraps
-from typing import Awaitable, Callable, Dict, List
+from typing import Awaitable, Callable, Dict, List, Union
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.models.responses import BaseResponses
 from maleo_foundation.models.transfers.parameters.general \
@@ -53,33 +53,37 @@ class BaseControllerUtils:
                 if not isinstance(result.content, Dict):
                     return result
 
-                #* Process the fields if needed
-                if (result.success
+                #* Recursive function to apply expansion processors
+                def recursive_expand(data:Union[Dict, List], expand:BaseTypes.OptionalListOfStrings):
+                    if isinstance(data, list):
+                        for idx, item in enumerate(data):
+                            data[idx] = recursive_expand(item, expand)
+                        return data
+                    elif isinstance(data, Dict):
+                        #* Apply each processor to current dict
+                        for processor in field_expansion_processors or []:
+                            raw_parameters = {"data": data, "expand": expand}
+                            parameters = (
+                                BaseGeneralParametersTransfers
+                                .FieldExpansionProcessor
+                                .model_validate(raw_parameters)
+                            )
+                            data = processor(parameters)
+                        for key in data.keys():
+                            if isinstance(data[key], (Dict, List)):
+                                data[key] = recursive_expand(data[key], expand)
+                        return data
+                    else:
+                        return data
+
+                #* Process expansions recursively if needed
+                if (
+                    result.success
                     and result.content.get("data", None) is not None
                     and field_expansion_processors is not None
                 ):
                     data = result.content["data"]
-                    if isinstance(data, List):
-                        for idx, dt in enumerate(data):
-                            for processor in field_expansion_processors:
-                                raw_parameters = {"data": dt, "expand": expand}
-                                parameters = (
-                                    BaseGeneralParametersTransfers
-                                    .FieldExpansionProcessor
-                                    .model_validate(raw_parameters)
-                                )
-                                dt = processor(parameters)
-                                data[idx] = dt
-                    elif isinstance(data, Dict):
-                        raw_parameters = {"data": data, "expand": expand}
-                        parameters = (
-                            BaseGeneralParametersTransfers
-                            .FieldExpansionProcessor
-                            .model_validate(raw_parameters)
-                        )
-                        for processor in field_expansion_processors:
-                            data = processor(parameters)
-                    result.content["data"] = data
+                    result.content["data"] = recursive_expand(data, expand)
                     result.process_response()
 
                 return result

{maleo_foundation-0.2.47.dist-info → maleo_foundation-0.2.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.2.47
+Version: 0.2.49
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.2.47.dist-info → maleo_foundation-0.2.49.dist-info}/RECORD

@@ -99,7 +99,7 @@ maleo_foundation/models/transfers/results/service/controllers/__init__.py,sha256
 maleo_foundation/models/transfers/results/service/controllers/rest.py,sha256=wCuFyOTQkuBs2cqjPsWnPy0XIsCfMqGByhrSy57qp7Y,1107
 maleo_foundation/utils/__init__.py,sha256=SRPEVoqjZoO6W8rtF_Ti8VIangg6Auwm6eHbZMdOthY,520
 maleo_foundation/utils/client.py,sha256=F5X9TUxWQgeOHjwsMpPoSRhZANQYZ_iFv0RJDTUVhrw,2820
-maleo_foundation/utils/controller.py,sha256=JppDEjXu4Ktlwr-0N497AEyihlRQbbn_ttOcQVGVwXw,4322
+maleo_foundation/utils/controller.py,sha256=XhCcRy-OxJzv0xkZmVEBOkYqbaAckHaMaW6ND6Be-_c,4520
 maleo_foundation/utils/exceptions.py,sha256=kDLTWiUauvc-fSKrEyxlGvIi2NtZIAhJ9bV3OXnpTyo,6253
 maleo_foundation/utils/extractor.py,sha256=SZXVYDHWGaA-Dd1BUydwF2HHdZqexEielS4CjL0Ceng,814
 maleo_foundation/utils/logging.py,sha256=W5Fhk_xAXVqSujaY8mv3hRH4wlQSpUn4ReuMoiKcQa4,7759
@@ -117,7 +117,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=SKsqPuFnAiCcYLf24CxKnMybhVHpgqnq1gGSlThqjts,994
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.2.47.dist-info/METADATA,sha256=TqcnGxmaqaccse8mzjdZL6ZgeGztSPQpDCTe6ozPyNQ,3598
-maleo_foundation-0.2.47.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-maleo_foundation-0.2.47.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.47.dist-info/RECORD,,
+maleo_foundation-0.2.49.dist-info/METADATA,sha256=8U6ht0Me4xfpRVvEEqRlbdAyee_2wiIEXtPifCoQSBY,3598
+maleo_foundation-0.2.49.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+maleo_foundation-0.2.49.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.49.dist-info/RECORD,,