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

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

@@ -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 → maleo_foundation-0.2.50}/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-0.2.48 → maleo_foundation-0.2.50}/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-0.2.48 → maleo_foundation-0.2.50}/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 → maleo_foundation-0.2.50}/maleo_foundation.egg-info/PKG-INFO

@@ -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 → maleo_foundation-0.2.50}/pyproject.toml

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