maleo-foundation 0.1.42__py3-none-any.whl → 0.1.43__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -24,6 +24,7 @@ from maleo_foundation.utils.loaders.json import JSONLoader
 from maleo_foundation.utils.loaders.key import KeyLoader
 from maleo_foundation.utils.loaders.yaml import YAMLLoader
 from maleo_foundation.utils.logging import GoogleCloudLogging, ServiceLogger, MiddlewareLogger
+from maleo_foundation.utils.mergers import BaseMergers
 
 class LogConfig(BaseModel):
     logs_dir:str = Field(..., description="Logs directory")
@@ -299,7 +300,8 @@ class ServiceManager:
         self._static_configs = StaticConfigurations.model_validate(static_configurations)
         runtime_configurations = YAMLLoader.load(self._settings.RUNTIME_CONFIGURATIONS_PATH)
         self._runtime_configs = RuntimeConfigurations.model_validate(runtime_configurations)
-        self._configs = Configurations.model_validate(self._static_configs.model_dump() | self._runtime_configs.model_dump())
+        merged_configs = BaseMergers.deep_merge(self._static_configs.model_dump(), self._runtime_configs.model_dump())
+        self._configs = Configurations.model_validate(merged_configs)
 
     @property
     def configs(self) -> Configurations:

maleo_foundation/utils/__init__.py

@@ -3,6 +3,7 @@ from .formatter import BaseFormatter
 from .exceptions import BaseExceptions
 from .extractor import BaseExtractors
 from .loaders import BaseLoaders
+from .mergers import BaseMergers
 from .controller import BaseControllerUtils
 from .query import BaseQueryUtils
 
@@ -11,5 +12,6 @@ class BaseUtils:
     Exceptions = BaseExceptions
     Extractors = BaseExtractors
     Loaders = BaseLoaders
+    Mergers = BaseMergers
     Controller = BaseControllerUtils
     Query = BaseQueryUtils

maleo_foundation/utils/mergers.py

@@ -0,0 +1,23 @@
+from collections.abc import Mapping
+from typing import Dict
+
+class BaseMergers:
+    @staticmethod
+    def deep_merge(*obj:Dict) -> Dict:
+        def merge_dicts(a:Dict, b:Dict) -> Dict:
+            result = dict(a)
+            for key, value in b.items():
+                if (
+                    key in result
+                    and isinstance(result[key], Mapping)
+                    and isinstance(value, Mapping)
+                ):
+                    result[key] = merge_dicts(result[key], value)
+                else:
+                    result[key] = value
+            return result
+
+        merged = {}
+        for ob in obj:
+            merged = merge_dicts(merged, ob)
+        return merged

{maleo_foundation-0.1.42.dist-info → maleo_foundation-0.1.43.dist-info}/METADATA

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

{maleo_foundation-0.1.42.dist-info → maleo_foundation-0.1.43.dist-info}/RECORD

@@ -13,7 +13,7 @@ maleo_foundation/expanded_types/token.py,sha256=4fRTJw6W5MYq71NksNrWNi7qYHQ4_lQw
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=ZN0b43OgqQtk2WHKMJQ0E2TeaSEyVJ0-l4FEkrSG0Qo,4645
 maleo_foundation/managers/middleware.py,sha256=7CDXPMb28AR7J72TWOeKFxOlMypKezEtO9mr53a88B0,4032
-maleo_foundation/managers/service.py,sha256=K-njasUsxVg781EtSvDMwF_SevcK1kac1sLtkMwdlN0,22642
+maleo_foundation/managers/service.py,sha256=IqCwAQvemgHIB763kB6myLtzWEueZ-Vt8z0ySsLCTvI,22760
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=lYREmEoTLShlPPXOKKiAopjefJ8nIWHCi7IvWkXXKeY,1465
 maleo_foundation/managers/client/maleo.py,sha256=NibYGdiN3EXUw5nx-tL48QAZym14GcA4BDZihGJNQ-g,4254
@@ -54,11 +54,12 @@ maleo_foundation/models/transfers/results/service/controllers/__init__.py,sha256
 maleo_foundation/models/transfers/results/service/controllers/rest.py,sha256=wCuFyOTQkuBs2cqjPsWnPy0XIsCfMqGByhrSy57qp7Y,1107
 maleo_foundation/services/__init__.py,sha256=Ho5zJSA89xdGFKIwOdzjmd8sm23cIuwrqYAxCEBBTIU,120
 maleo_foundation/services/token.py,sha256=ZqRqOdGUnaSIam6-JHVdAW1UST-2EDtcVN0fpbPmXY4,1638
-maleo_foundation/utils/__init__.py,sha256=KoERe8U2ERGZeAKUNBPW_itk7g9YpH7v7_mD9_i050o,461
+maleo_foundation/utils/__init__.py,sha256=SRPEVoqjZoO6W8rtF_Ti8VIangg6Auwm6eHbZMdOthY,520
 maleo_foundation/utils/controller.py,sha256=ECzPzpw36zBAjKcWcDbUAhIJGbc6UpeypdUUX6ipXBg,6396
 maleo_foundation/utils/exceptions.py,sha256=LPPcU-6_3NbRIBZg2Nr2Ac5HF1qZJbHbMVnwfIfZg6g,3702
 maleo_foundation/utils/extractor.py,sha256=SZXVYDHWGaA-Dd1BUydwF2HHdZqexEielS4CjL0Ceng,814
 maleo_foundation/utils/logging.py,sha256=MwvZmZSA8SIdfq-knEvpYIgqnSpHcyHrZY9TVHWVHJA,9023
+maleo_foundation/utils/mergers.py,sha256=DniUu3Ot4qkYH_YSw4uD1cn9cfirum4S_Opp8fMkQwA,702
 maleo_foundation/utils/query.py,sha256=ODQ3adOYQNj5E2cRW9ytbjBz56nEDcnfq8mQ6YZbCCM,4375
 maleo_foundation/utils/formatter/__init__.py,sha256=iKf5YCbEdg1qKnFHyKqqcQbqAqEeRUf8mhI3v3dQoj8,78
 maleo_foundation/utils/formatter/case.py,sha256=TmvvlfzGdC_omMTB5vAa40TZBxQ3hnr-SYeo0M52Rlg,1352
@@ -66,7 +67,7 @@ maleo_foundation/utils/loaders/__init__.py,sha256=Dnuv7BWyglSddnbsFb96s-b3KaW7UK
 maleo_foundation/utils/loaders/json.py,sha256=NsXLq3VZSgzmEf99tV1VtrmiudWdQ8Pzh_hI4Rm0cM8,397
 maleo_foundation/utils/loaders/key.py,sha256=GZ4h1ONfp6Xx8-E8AWoGP4ajAZrwPhZRtidjn_u82Qg,2562
 maleo_foundation/utils/loaders/yaml.py,sha256=jr8v3BlgmRCMTzdNgKhIYt1tnubaJXcDSSGkKVR8pbw,362
-maleo_foundation-0.1.42.dist-info/METADATA,sha256=pccVpYnDrFeZPmFiQxwgbaoGYIhia8KGH_DklWLi_nE,3354
-maleo_foundation-0.1.42.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-maleo_foundation-0.1.42.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.42.dist-info/RECORD,,
+maleo_foundation-0.1.43.dist-info/METADATA,sha256=X3kTX7xwFhAlg7OP6Omx7BX5DLC60Py5lzCjHn0pR8Q,3354
+maleo_foundation-0.1.43.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+maleo_foundation-0.1.43.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.43.dist-info/RECORD,,