maleo-foundation 0.2.48__py3-none-any.whl → 0.2.50__py3-none-any.whl

maleo_foundation/models/schemas/result.py

@@ -14,10 +14,6 @@ class ResultMetadata(BaseModel):
     field_expansion:Optional[Union[str, Dict[str, FieldExpansionMetadata]]] = Field(None, description="Field expansion metadata")
 
 class BaseResultSchemas:
-    class BaseRow(BaseModel):
-        class Config:
-            from_attributes=True
-
     class Base(BaseModel):
         success:bool = Field(..., description="Success status")
         code:BaseTypes.OptionalString = Field(None, description="Optional result code")

maleo_foundation/models/transfers/results/service/repository.py

@@ -4,28 +4,17 @@ from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.models.schemas.result import BaseResultSchemas
 
 class BaseServiceRepositoryResultsTransfers:
-    class Row(
-        BaseGeneralSchemas.Status,
-        BaseGeneralSchemas.Timestamps,
-        BaseGeneralSchemas.Identifiers,
-        BaseResultSchemas.BaseRow
-    ): pass
-
     class Fail(BaseResultSchemas.Fail): pass
 
     class NotFound(BaseResultSchemas.NotFound): pass
 
     class NoData(BaseResultSchemas.NoData): pass
 
-    class SingleData(BaseResultSchemas.SingleData):
-        data:BaseServiceRepositoryResultsTransfers.Row
+    class SingleData(BaseResultSchemas.SingleData): pass
 
-    class UnpaginatedMultipleData(BaseResultSchemas.UnpaginatedMultipleData):
-        data:list[BaseServiceRepositoryResultsTransfers.Row]
+    class UnpaginatedMultipleData(BaseResultSchemas.UnpaginatedMultipleData): pass
 
     class PaginatedMultipleData(BaseResultSchemas.PaginatedMultipleData):
-        data:list[BaseServiceRepositoryResultsTransfers.Row]
-
         @model_validator(mode="before")
         @classmethod
         def calculate_pagination(cls, values: dict) -> dict:

maleo_foundation/utils/controller.py

@@ -54,12 +54,12 @@ class BaseControllerUtils:
                     return result
 
                 #* Recursive function to apply expansion processors
-                def recursive_expand(data:Union[Dict, List], expand:List[str]):
+                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):
+                    elif isinstance(data, Dict):
                         #* Apply each processor to current dict
                         for processor in field_expansion_processors or []:
                             raw_parameters = {"data": data, "expand": expand}
@@ -69,13 +69,9 @@ class BaseControllerUtils:
                                 .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
+                        for key in data.keys():
+                            if isinstance(data[key], (Dict, List)):
                                 data[key] = recursive_expand(data[key], expand)
-
                         return data
                     else:
                         return data
@@ -85,39 +81,10 @@ class BaseControllerUtils:
                     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()
+                    result.process_response()
 
                 return result
             return wrapper

{maleo_foundation-0.2.48.dist-info → maleo_foundation-0.2.50.dist-info}/METADATA

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

{maleo_foundation-0.2.48.dist-info → maleo_foundation-0.2.50.dist-info}/RECORD

@@ -58,7 +58,7 @@ maleo_foundation/models/schemas/general.py,sha256=PCnGRV_WL8xiBuECDlt7E0Mg_pEVrM
 maleo_foundation/models/schemas/hash.py,sha256=db2uyCeUzvF2zDCcbiZMh1MxIOGOGezOMOx-M1ta4zI,441
 maleo_foundation/models/schemas/key.py,sha256=7FZxVqTL5qRK48AXL1odrMNhAwhwtCwSkBUPsJwuBII,594
 maleo_foundation/models/schemas/parameter.py,sha256=K47z2NzmTEhUiOfRiRLyRPXoQurbWsKBL7ObXAxIWRY,2100
-maleo_foundation/models/schemas/result.py,sha256=MwjJVBwbAg3f4ibBhsN-256ZH9mGPenPv5sPEkB3Wao,3637
+maleo_foundation/models/schemas/result.py,sha256=uYVV5MHeK2aKEWmbmI8azDuD4_xG3MKmo3_wDAl5i6E,3551
 maleo_foundation/models/schemas/signature.py,sha256=-5ldTnJsjwqPRbHw7PFcLKITqEXJ_qKDdRHShK75NVA,620
 maleo_foundation/models/schemas/token.py,sha256=RYq8v1T_WZIu8lcjwyV6Pp7ZjFkr_lW9x6QyDmXBsfw,563
 maleo_foundation/models/transfers/__init__.py,sha256=oJLJ3Geeme6vBw7R2Dhvdvg4ziVvzEYAGJaP-tm_90w,299
@@ -94,12 +94,12 @@ maleo_foundation/models/transfers/results/encryption/aes.py,sha256=yx3hZNhge2lfj
 maleo_foundation/models/transfers/results/encryption/rsa.py,sha256=hlCtiT1TZwmMBEn-sgGs-WocNEmJ4qxWcHS5y9m7Voc,683
 maleo_foundation/models/transfers/results/service/__init__.py,sha256=qKCJTtuLJeda-xrRL99OVdZR91PLFK1JyYVItjreLbQ,410
 maleo_foundation/models/transfers/results/service/general.py,sha256=-4VE7mV103nQIRRxIy_dGIU6XDe_wiMgrCFJJ6eXUMM,1540
-maleo_foundation/models/transfers/results/service/repository.py,sha256=xz9RakOBEbtdGnnK0fM4KVZOL-AjRsaIE9J3TQqkIBo,1887
+maleo_foundation/models/transfers/results/service/repository.py,sha256=Ach5lLjEC4IB_fEJPMEYgwBWNKq-TYLzbsHuc6e1vsw,1543
 maleo_foundation/models/transfers/results/service/controllers/__init__.py,sha256=HZJWMy2dskzOCzLmp_UaL9rjbQ-sDMI7sd2bXb-4QOU,175
 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=n8_-BG3EJuQCKI5aHf-WMhpxNsnM2veeuvEZLtSVcv8,6242
+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.48.dist-info/METADATA,sha256=PwEMHPB56vLw8qCtJeywYE7td7_7d0gpnQbrMhEF5aI,3598
-maleo_foundation-0.2.48.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-maleo_foundation-0.2.48.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.48.dist-info/RECORD,,
+maleo_foundation-0.2.50.dist-info/METADATA,sha256=5SrHzYfi52N2hXsE5lHfWY5M1Ln0WOvsM4NYHpKGPt0,3598
+maleo_foundation-0.2.50.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+maleo_foundation-0.2.50.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.50.dist-info/RECORD,,