maleo-foundation 0.2.65__py3-none-any.whl → 0.2.67__py3-none-any.whl

maleo_foundation/expanded_types/general.py

@@ -24,4 +24,26 @@ class BaseGeneralExpandedTypes:
                 BaseTypes.ListOrDictOfAny
             ]
         ]
+    ]
+
+    #* Modification processor related types
+    FieldModificationProcessor = Callable[
+        [BaseGeneralParametersTransfers.FieldModificationProcessor],
+        BaseTypes.ListOrDictOfAny
+    ]
+
+    ListOfFieldModificationProcessor = List[
+        Callable[
+            [BaseGeneralParametersTransfers.FieldModificationProcessor],
+            BaseTypes.ListOrDictOfAny
+        ]
+    ]
+
+    OptionalListOfFieldModificationProcessor = Optional[
+        List[
+            Callable[
+                [BaseGeneralParametersTransfers.FieldModificationProcessor],
+                BaseTypes.ListOrDictOfAny
+            ]
+        ]
     ]

maleo_foundation/managers/client/google/storage.py

@@ -53,7 +53,8 @@ class GoogleCloudStorage(GoogleClientManager):
         location:str,
         content_type:Optional[str]=None,
         make_public:bool=False,
-        expiration:timedelta=timedelta(minutes=15)
+        expiration:timedelta=timedelta(minutes=15),
+        root_location_override:BaseTypes.OptionalString=None
     ) -> str:
         """
         Upload a file to Google Cloud Storage.
@@ -67,7 +68,10 @@ class GoogleCloudStorage(GoogleClientManager):
         Returns:
             str: The public URL or blob path depending on `make_public`.
         """
-        blob = self._bucket.blob(f"{self._root_location}/{location}")
+        if root_location_override is None or (isinstance(root_location_override, str) and len(root_location_override) <= 0):
+            blob = self._bucket.blob(f"{self._root_location}/{location}")
+        else:
+            blob = self._bucket.blob(f"{root_location_override}/{location}")
         blob.upload_from_string(content, content_type=content_type)
 
         if make_public:
@@ -84,7 +88,8 @@ class GoogleCloudStorage(GoogleClientManager):
     def generate_signed_url(
         self,
         location:str,
-        expiration:timedelta=timedelta(minutes=15)
+        expiration:timedelta=timedelta(minutes=15),
+        root_location_override:BaseTypes.OptionalString=None
     ) -> str:
         """
         generate signed URL of a file in the bucket based on its location.
@@ -99,7 +104,10 @@ class GoogleCloudStorage(GoogleClientManager):
         Raises:
             ValueError: If the file does not exist
         """
-        blob = self._bucket.blob(blob_name=f"{self._root_location}/{location}")
+        if root_location_override is None or (isinstance(root_location_override, str) and len(root_location_override) <= 0):
+            blob = self._bucket.blob(blob_name=f"{self._root_location}/{location}")
+        else:
+            blob = self._bucket.blob(blob_name=f"{root_location_override}/{location}")
         if not blob.exists():
             raise ValueError(f"File '{location}' did not exists.")
 

maleo_foundation/models/transfers/parameters/general.py

@@ -8,6 +8,8 @@ class BaseGeneralParametersTransfers:
         BaseParameterSchemas.Data
     ): pass
 
+    class FieldModificationProcessor(BaseParameterSchemas.Data): pass
+
     class GetSingleQuery(BaseParameterSchemas.OptionalListOfStatuses): pass
 
     class BaseGetSingle(

maleo_foundation/utils/controller.py

@@ -61,13 +61,14 @@ class BaseControllerUtils:
                         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)
+                        parameters = (
+                            BaseGeneralParametersTransfers
+                            .FieldExpansionProcessor(
+                                data=data,
+                                expand=expand
                             )
+                        )
+                        for processor in field_expansion_processors or []:
                             data = processor(parameters)
                         for key in data.keys():
                             if isinstance(data[key], (Dict, List)):
@@ -86,6 +87,61 @@ class BaseControllerUtils:
                     result.content["data"] = recursive_expand(data, expand)
                     result.process_response()
 
+                return result
+            return wrapper
+        return decorator
+
+    @staticmethod
+    def field_modification_handler(
+        field_modification_processors:BaseGeneralExpandedTypes.OptionalListOfFieldModificationProcessor = 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_modification_processors: List of processor functions that handle that field's data
+        """
+        def decorator(func:Callable[..., Awaitable[BaseServiceRESTControllerResults]]):
+            @wraps(func)
+            async def wrapper(*args, **kwargs):
+                #* Call the original function
+                result = await func(*args, **kwargs)
+
+                if not isinstance(result.content, Dict):
+                    return result
+
+                #* Recursive function to apply modification processors
+                def recursive_modify(data:Union[Dict, List]):
+                    if isinstance(data, list):
+                        for idx, item in enumerate(data):
+                            data[idx] = recursive_modify(item)
+                        return data
+                    elif isinstance(data, Dict):
+                        #* Apply each processor to current dict
+                        parameters = (
+                            BaseGeneralParametersTransfers
+                            .FieldModificationProcessor(data=data)
+                        )
+                        for processor in field_modification_processors or []:
+                            data = processor(parameters)
+                        for key in data.keys():
+                            if isinstance(data[key], (Dict, List)):
+                                data[key] = recursive_modify(data[key])
+                        return data
+                    else:
+                        return data
+
+                #* Process modifications recursively if needed
+                if (
+                    result.success
+                    and result.content.get("data", None) is not None
+                    and field_modification_processors is not None
+                ):
+                    data = result.content["data"]
+                    result.content["data"] = recursive_modify(data)
+                    result.process_response()
+
                 return result
             return wrapper
         return decorator

{maleo_foundation-0.2.65.dist-info → maleo_foundation-0.2.67.dist-info}/METADATA

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

{maleo_foundation-0.2.65.dist-info → maleo_foundation-0.2.67.dist-info}/RECORD

@@ -21,7 +21,7 @@ maleo_foundation/client/services/hash/hmac.py,sha256=-L0sTv5tcmfu-UyBD_InpxFJ2w7
 maleo_foundation/client/services/hash/sha256.py,sha256=af08036kkEZ61IY_ktxwHmQnAACd6hWXYA_ZC9S1-tg,2142
 maleo_foundation/expanded_types/__init__.py,sha256=Jz2NoY9609QIM84UonmJU-10CMUR9t9fkk9ZFLnU7Js,384
 maleo_foundation/expanded_types/client.py,sha256=WvT911cDsfWtCCYVaDeQ90ba_eCYnzC-CRSXCHtLIuo,2414
-maleo_foundation/expanded_types/general.py,sha256=_nSG5jgMgA1ntjBdVjQqkg0h1WNytLsIqkUrsKDmrfU,832
+maleo_foundation/expanded_types/general.py,sha256=vPWcUI3KTsppiLx1QVmafkawmcM5B0clkj9hrLdJjkM,1463
 maleo_foundation/expanded_types/hash.py,sha256=QOH_HczGY7CRUZJ5gC84RunCAiUzNSt7DYXI7uqtwkM,416
 maleo_foundation/expanded_types/key.py,sha256=qopQcO6V82RxiCtixe--IBce5MRT4buOun4RSA-LLm0,573
 maleo_foundation/expanded_types/repository.py,sha256=hemtQGDqSQO8N4_y7pktXqBlrcDacs4EiUZ3hFk4n2o,2482
@@ -45,7 +45,7 @@ maleo_foundation/managers/client/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 maleo_foundation/managers/client/google/base.py,sha256=eIdd6C2BFIu4EyZ1j017VZaJn_nSTPGFftBwQmVAUDA,1366
 maleo_foundation/managers/client/google/parameter.py,sha256=Lnj7mQgxWQpsQwbmDRK5_bF01M1QpM5PS0eZP2q17yQ,1337
 maleo_foundation/managers/client/google/secret.py,sha256=Ski1CHYeA8vjSk2Oc2Pf4CfFrzT_RcA6NEZwza7gM7Y,4464
-maleo_foundation/managers/client/google/storage.py,sha256=TaOc2Dmj_CP0rpqrlBMQYAfqLSDkpgcIui1683PKR9Y,3796
+maleo_foundation/managers/client/google/storage.py,sha256=6pmpR44mOWhgad0ylyz0xoHCAfVo-AC3cT95tRKlNNM,4370
 maleo_foundation/middlewares/authentication.py,sha256=UL6kL65SvqrzemlIDopoO9N1C05eWlYMHVR2tiRsVEA,4821
 maleo_foundation/middlewares/base.py,sha256=0vHU0CJEj9s3slGE3fxCQwL0_hqXW-xvhu82WRVpkpg,14551
 maleo_foundation/middlewares/cors.py,sha256=9uvBvY2N6Vxa9RP_YtESxcWo6Doi6uS0lzAG9iLY7Uc,2288
@@ -68,7 +68,7 @@ maleo_foundation/models/transfers/general/signature.py,sha256=J9xQy2HjpCQOnES7RJ
 maleo_foundation/models/transfers/general/token.py,sha256=O_U6dQS7oMScJzqufl6Pe21pTxMsYhOzKH8aFLxjblQ,2895
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
 maleo_foundation/models/transfers/parameters/client.py,sha256=wI2-ML99yn5HR0AciFg2C9EQixrWjbIR8x_bDbqKeDM,4069
-maleo_foundation/models/transfers/parameters/general.py,sha256=opezjUBygMhYMz85uNShx7sIgTPS5Y7JvefhMkCXve4,708
+maleo_foundation/models/transfers/parameters/general.py,sha256=-nSIcn0thtodk-69Uwj6qdrX8zfe-PX-gWwD-_VCVyY,779
 maleo_foundation/models/transfers/parameters/key.py,sha256=ZhWcbPJZvl8AF_qlecG-4-9_Ym6EbU7nngRo3AtbScY,432
 maleo_foundation/models/transfers/parameters/service.py,sha256=-mCGqGYTuH4tKZXwtFrETlfyVx20Yc2wUfK0Nv4-wtY,6284
 maleo_foundation/models/transfers/parameters/signature.py,sha256=ysYkALwqNXn13HP8xUOnPlboL9pgFLmQ9f7OpZe9dDw,483
@@ -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=KoERe8U2ERGZeAKUNBPW_itk7g9YpH7v7_mD9_i050o,461
 maleo_foundation/utils/client.py,sha256=F5X9TUxWQgeOHjwsMpPoSRhZANQYZ_iFv0RJDTUVhrw,2820
-maleo_foundation/utils/controller.py,sha256=XhCcRy-OxJzv0xkZmVEBOkYqbaAckHaMaW6ND6Be-_c,4520
+maleo_foundation/utils/controller.py,sha256=D8uUfqkMpPw8M8Ykn8Uxn7dfRGwxmBxSP1h9xSkYw1I,6945
 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
@@ -118,7 +118,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.65.dist-info/METADATA,sha256=GDsEA14M9OdABexRKjRzPB_uS5Ee8nKZ34FLm8bNgfg,3598
-maleo_foundation-0.2.65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.2.65.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.65.dist-info/RECORD,,
+maleo_foundation-0.2.67.dist-info/METADATA,sha256=mk2x6WyixAkvIHf_OQrP6nn9gFYyljbP9k8Ly7i-6e8,3598
+maleo_foundation-0.2.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.2.67.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.67.dist-info/RECORD,,