maleo-foundation 0.1.92__py3-none-any.whl → 0.1.94__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -177,21 +177,30 @@ class ServiceManager:
         return self._maleo_credentials
 
     def _load_configs(self) -> None:
+        #* Load static configurations
         static_configurations_path = Path(self._settings.STATIC_CONFIGURATIONS_PATH)
         if static_configurations_path.exists() and static_configurations_path.is_file():
-            static_configurations = YAMLLoader.load(self._settings.STATIC_CONFIGURATIONS_PATH)
+            static_configurations = YAMLLoader.load_from_path(self._settings.STATIC_CONFIGURATIONS_PATH)
         else:
-            static_configurations = self._secret_manager.get(f"maleo-static-config-{self._settings.ENVIRONMENT}")
+            data = self._secret_manager.get(f"maleo-static-config-{self._settings.ENVIRONMENT}")
+            static_configurations = YAMLLoader.load_from_string(data)
         static_configs = StaticConfigurations.model_validate(static_configurations)
+
+        #* Load runtime configurations
         runtime_configurations_path = Path(self._settings.RUNTIME_CONFIGURATIONS_PATH)
         if runtime_configurations_path.exists() and runtime_configurations_path.is_file():
-            runtime_configurations = YAMLLoader.load(self._settings.RUNTIME_CONFIGURATIONS_PATH)
+            runtime_configurations = YAMLLoader.load_from_path(self._settings.RUNTIME_CONFIGURATIONS_PATH)
         else:
-            runtime_configurations = self._secret_manager.get(f"{self._settings.SERVICE_KEY}-runtime-config-{self._settings.ENVIRONMENT}")
+            data = self._secret_manager.get(f"{self._settings.SERVICE_KEY}-runtime-config-{self._settings.ENVIRONMENT}")
+            runtime_configurations = YAMLLoader.load_from_string(data)
         runtime_configs = RuntimeConfigurations.model_validate(runtime_configurations)
+
+        #* Load database configurations
         password = self._secret_manager.get(name=f"maleo-db-password-{self._settings.ENVIRONMENT}")
         host = self._secret_manager.get(name=f"maleo-db-host-{self._settings.ENVIRONMENT}")
         database = DatabaseConfigurations(password=password, host=host, database=runtime_configs.database)
+
+        #* Load whole configurations
         merged_configs = BaseMergers.deep_merge(static_configs.model_dump(), runtime_configs.model_dump(exclude={"database"}), {"database": database.model_dump()})
         self._configs = Configurations.model_validate(merged_configs)
 

maleo_foundation/utils/loaders/json.py

@@ -4,11 +4,15 @@ from pathlib import Path
 
 class JSONLoader:
     @staticmethod
-    def load(path:Union[Path, str]) -> Union[Dict[str, Any], List[Any]]:
+    def load_from_path(path:Union[Path, str]) -> Union[Dict[str, Any], List[Any]]:
         file_path = Path(path)
 
         if not file_path.is_file():
             raise FileNotFoundError(f"File not found: {file_path}")
 
         with open(file_path, 'r') as f:
-            return json.load(f)
+            return json.load(f)
+
+    @staticmethod
+    def load_from_string(string:str) -> Dict:
+        return json.loads(string)

maleo_foundation/utils/loaders/yaml.py

@@ -4,11 +4,15 @@ from typing import Dict, Union
 
 class YAMLLoader:
     @staticmethod
-    def load(path:Union[Path, str]) -> Dict:
+    def load_from_path(path:Union[Path, str]) -> Dict:
         file_path = Path(path)
 
         if not file_path.exists() or not file_path.is_file():
             raise FileNotFoundError(f"File not found: {file_path}")
 
         with file_path.open("r") as f:
-            return yaml.safe_load(f)
+            return yaml.safe_load(f)
+
+    @staticmethod
+    def load_from_string(string:str) -> Dict:
+        return yaml.safe_load(string)

{maleo_foundation-0.1.92.dist-info → maleo_foundation-0.1.94.dist-info}/METADATA

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

{maleo_foundation-0.1.92.dist-info → maleo_foundation-0.1.94.dist-info}/RECORD

@@ -32,7 +32,7 @@ maleo_foundation/expanded_types/encryption/rsa.py,sha256=MuhB_DGrjnsl4t96W4pKuCt
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=Pn5EZ-c1Hy6-BihN7KokHJWmBIt3Ty96fZ0zF-srtF4,5208
 maleo_foundation/managers/middleware.py,sha256=ODIQU1Hpu-Xempjjo_VRbVtxiD5oi74mNuoWuDawRh0,4250
-maleo_foundation/managers/service.py,sha256=hPimC1VYQv2e8kZz6omCKWCtnvEnY5Wa1BdqxtFLoo8,15419
+maleo_foundation/managers/service.py,sha256=uw9ec4nI1r3ehYZaRSvWSQx8KCc515UFGkGyDbe0hx4,15702
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=5z9l2GN4QASF0-Lft8o5QQ3SRPXqeNZNT1S1CgaE764,4384
 maleo_foundation/managers/client/maleo.py,sha256=iCM47TLL-RSQ2FkTmHVPdsb2JCd1LebMx6OJvIr4vCQ,2035
@@ -101,13 +101,13 @@ maleo_foundation/utils/query.py,sha256=ODQ3adOYQNj5E2cRW9ytbjBz56nEDcnfq8mQ6YZbC
 maleo_foundation/utils/formatter/__init__.py,sha256=iKf5YCbEdg1qKnFHyKqqcQbqAqEeRUf8mhI3v3dQoj8,78
 maleo_foundation/utils/formatter/case.py,sha256=TmvvlfzGdC_omMTB5vAa40TZBxQ3hnr-SYeo0M52Rlg,1352
 maleo_foundation/utils/loaders/__init__.py,sha256=P_3ycGfeDXFjAi8bE4iLWHxBveqUIdpHgGv-klRWM3s,282
-maleo_foundation/utils/loaders/json.py,sha256=NsXLq3VZSgzmEf99tV1VtrmiudWdQ8Pzh_hI4Rm0cM8,397
-maleo_foundation/utils/loaders/yaml.py,sha256=L438PTWFnE0St_T4-7f_3TV4apfh0LhYkIdODCuYuDw,388
+maleo_foundation/utils/loaders/json.py,sha256=8e3qe1TyL-jaJVuiQJpVHKDBS2n_CGJPGv8Ci6cK42Y,506
+maleo_foundation/utils/loaders/yaml.py,sha256=8cZWOYuDTAFNrLsUlz7IGyOrtR4oL-tk-jc7q_7nq8Q,501
 maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg7rejnG4I684FjUwh70tvhtVM,141
 maleo_foundation/utils/loaders/credential/google.py,sha256=deksZXT5wPhEsSMHbZ3x05WHXxCjLDt76Ns-1Tmhp7g,948
 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.1.92.dist-info/METADATA,sha256=_0kHhXfFtNR1_LEZvIVn1d9tUc3fjvC3BMXJ4x8-qf0,3419
-maleo_foundation-0.1.92.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-maleo_foundation-0.1.92.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.92.dist-info/RECORD,,
+maleo_foundation-0.1.94.dist-info/METADATA,sha256=pluqhekNm5UlR_v9rZBzlv90rRCCGp__eNWSz8ph3Lk,3419
+maleo_foundation-0.1.94.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+maleo_foundation-0.1.94.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.94.dist-info/RECORD,,