maleo-foundation 0.2.47__tar.gz → 0.2.48__tar.gz

{maleo_foundation-0.2.47 → maleo_foundation-0.2.48}/PKG-INFO

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

maleo_foundation-0.2.48/maleo_foundation/utils/controller.py

@@ -0,0 +1,124 @@
+import inspect
+from fastapi import status
+from functools import wraps
+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 \
+    import BaseGeneralParametersTransfers
+from maleo_foundation.models.transfers.results.service.controllers.rest \
+    import BaseServiceRESTControllerResults
+from maleo_foundation.expanded_types.general import BaseGeneralExpandedTypes
+
+class BaseControllerUtils:
+    @staticmethod
+    def field_expansion_handler(
+        expandable_fields_dependencies_map:BaseTypes.OptionalStringToListOfStringDict = None,
+        field_expansion_processors:BaseGeneralExpandedTypes.OptionalListOfFieldExpansionProcessor = None
+    ):
+        """
+        Decorator to handle expandable fields validation and processing.
+        
+        Args:
+            expandable_fields_dependencies_map: Dictionary where keys are dependency fields and values are lists of dependent fields
+            field_expansion_processors: List of processor functions that handle that field's data
+        """
+        def decorator(func:Callable[..., Awaitable[BaseServiceRESTControllerResults]]):
+            @wraps(func)
+            async def wrapper(*args, **kwargs):
+                sig = inspect.signature(func)
+                bound = sig.bind(*args, **kwargs)
+                bound.apply_defaults()
+
+                parameters = bound.arguments.get("parameters")
+                expand:BaseTypes.OptionalListOfStrings = getattr(parameters, 'expand', None)
+
+                #* Validate expandable fields dependencies
+                if expand is not None and expandable_fields_dependencies_map is not None:
+                    for dependency, dependents in expandable_fields_dependencies_map.items():
+                        if dependency not in expand:
+                            for dependent in dependents:
+                                if dependent in expand:
+                                    other = f"'{dependency}' must also be expanded if '{dependent}' is expanded"
+                                    content = BaseResponses.InvalidExpand(other=other).model_dump()
+                                    return BaseServiceRESTControllerResults(
+                                        success=False,
+                                        content=content,
+                                        status_code=status.HTTP_400_BAD_REQUEST
+                                    )
+
+                #* Call the original function
+                result = await func(*args, **kwargs)
+
+                if not isinstance(result.content, Dict):
+                    return result
+
+                #* Recursive function to apply expansion processors
+                def recursive_expand(data:Union[Dict, List], expand:List[str]):
+                    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)
+
+                        #* Now recursively apply to nested fields if they are in expand
+                        for key in expand:
+                            if key in data and isinstance(data[key], (dict, list)):
+                                #* Recursively expand nested field with same expand
+                                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
+                    and expand is not None
+                ):
+                    data = result.content["data"]
+                    result.content["data"] = recursive_expand(data, expand)
+
+                # #* Process the fields 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.process_response()
+
+                return result
+            return wrapper
+        return decorator

{maleo_foundation-0.2.47 → maleo_foundation-0.2.48}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.2.47 → maleo_foundation-0.2.48}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.2.47"
+version = "0.2.48"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }

maleo_foundation-0.2.47/maleo_foundation/utils/controller.py

@@ -1,87 +0,0 @@
-import inspect
-from fastapi import status
-from functools import wraps
-from typing import Awaitable, Callable, Dict, List
-from maleo_foundation.types import BaseTypes
-from maleo_foundation.models.responses import BaseResponses
-from maleo_foundation.models.transfers.parameters.general \
-    import BaseGeneralParametersTransfers
-from maleo_foundation.models.transfers.results.service.controllers.rest \
-    import BaseServiceRESTControllerResults
-from maleo_foundation.expanded_types.general import BaseGeneralExpandedTypes
-
-class BaseControllerUtils:
-    @staticmethod
-    def field_expansion_handler(
-        expandable_fields_dependencies_map:BaseTypes.OptionalStringToListOfStringDict = None,
-        field_expansion_processors:BaseGeneralExpandedTypes.OptionalListOfFieldExpansionProcessor = None
-    ):
-        """
-        Decorator to handle expandable fields validation and processing.
-        
-        Args:
-            expandable_fields_dependencies_map: Dictionary where keys are dependency fields and values are lists of dependent fields
-            field_expansion_processors: List of processor functions that handle that field's data
-        """
-        def decorator(func:Callable[..., Awaitable[BaseServiceRESTControllerResults]]):
-            @wraps(func)
-            async def wrapper(*args, **kwargs):
-                sig = inspect.signature(func)
-                bound = sig.bind(*args, **kwargs)
-                bound.apply_defaults()
-
-                parameters = bound.arguments.get("parameters")
-                expand:BaseTypes.OptionalListOfStrings = getattr(parameters, 'expand', None)
-
-                #* Validate expandable fields dependencies
-                if expand is not None and expandable_fields_dependencies_map is not None:
-                    for dependency, dependents in expandable_fields_dependencies_map.items():
-                        if dependency not in expand:
-                            for dependent in dependents:
-                                if dependent in expand:
-                                    other = f"'{dependency}' must also be expanded if '{dependent}' is expanded"
-                                    content = BaseResponses.InvalidExpand(other=other).model_dump()
-                                    return BaseServiceRESTControllerResults(
-                                        success=False,
-                                        content=content,
-                                        status_code=status.HTTP_400_BAD_REQUEST
-                                    )
-
-                #* Call the original function
-                result = await func(*args, **kwargs)
-
-                if not isinstance(result.content, Dict):
-                    return result
-
-                #* Process the fields 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.process_response()
-
-                return result
-            return wrapper
-        return decorator