maleo-foundation 0.3.21__py3-none-any.whl → 0.3.25__py3-none-any.whl

maleo_foundation/models/transfers/general/settings.py

@@ -41,49 +41,21 @@ class Settings(BaseSettings):
         description="Public key"
     )
 
-    @classmethod
-    @model_validator(mode="before")
-    def define_configurations_path(
-        cls,
-        values: BaseTypes.StringToAnyDict
-    ) -> BaseTypes.StringToAnyDict:
-        # Define and check environment
-        environment: BaseTypes.OptionalString = values.get("ENVIRONMENT", None)
-        if environment is None:
-            raise ValueError("'ENVIRONMENT' variable not defined/found")
-
-        # Define and check service key
-        service_key: BaseTypes.OptionalString = values.get("SERVICE_KEY", None)
-        if service_key is None:
-            raise ValueError("'SERVICE_KEY' variable not defined/found")
-
-        # Define and check use local static configurations
-        use_local_static_configurations: BaseTypes.OptionalBoolean = values.get("USE_LOCAL_STATIC_CONFIGURATIONS", None)
-        if use_local_static_configurations is None:
-            raise ValueError("'USE_LOCAL_STATIC_CONFIGURATIONS' variable not defined/found")
-
-        # Define static configurations path if necessary
-        static_configurations_path: BaseTypes.OptionalString = values.get("STATIC_CONFIGURATIONS_PATH", None)
-        if use_local_static_configurations and static_configurations_path is None:
-            values["STATIC_CONFIGURATIONS_PATH"] = f"/maleo-static-configurations-{environment}.yaml"
-
-        # Define and check use local runtime configurations
-        use_local_runtime_configurations: BaseTypes.OptionalBoolean = values.get("USE_LOCAL_RUNTIME_CONFIGURATIONS", None)
-        if use_local_runtime_configurations is None:
-            raise ValueError("'USE_LOCAL_RUNTIME_CONFIGURATIONS' variable not defined/found")
-
-        # Define runtime configurations path if necessary
-        runtime_configurations_path: BaseTypes.OptionalString = values.get("RUNTIME_CONFIGURATIONS_PATH", None)
-        if use_local_runtime_configurations and runtime_configurations_path is None:
-            values["RUNTIME_CONFIGURATIONS_PATH"] = f"/{service_key}-runtime-configurations-{environment}.yaml"
-
-        return values
-
     @model_validator(mode="after")
     def validate_configurations_path(self) -> Self:
+        if self.USE_LOCAL_STATIC_CONFIGURATIONS and self.STATIC_CONFIGURATIONS_PATH is None:
+            self.STATIC_CONFIGURATIONS_PATH = (
+                f"/static-configurations/maleo-static-configurations-{self.ENVIRONMENT}.yaml"
+            )
+
         if self.USE_LOCAL_STATIC_CONFIGURATIONS and self.STATIC_CONFIGURATIONS_PATH is None:
             raise ValueError("Static configurations path must exist if use local static configurations is set to true")
-        
+
+        if self.USE_LOCAL_RUNTIME_CONFIGURATIONS and self.RUNTIME_CONFIGURATIONS_PATH is None:
+            self.RUNTIME_CONFIGURATIONS_PATH = (
+                f"/runtime-configurations/{self.SERVICE_KEY}-runtime-configurations-{self.ENVIRONMENT}.yaml"
+            )
+
         if self.USE_LOCAL_RUNTIME_CONFIGURATIONS and self.RUNTIME_CONFIGURATIONS_PATH is None:
             raise ValueError("Runtime configurations path must exist if use local runtime configurations is set to true")
 

{maleo_foundation-0.3.21.dist-info → maleo_foundation-0.3.25.dist-info}/METADATA

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

{maleo_foundation-0.3.21.dist-info → maleo_foundation-0.3.25.dist-info}/RECORD

@@ -68,7 +68,7 @@ maleo_foundation/models/transfers/general/credentials.py,sha256=kLS0ymFipQmL3QaA
 maleo_foundation/models/transfers/general/database.py,sha256=bFNPd-1x3jNHPscwCk0besnpwartAeLY2e5PfKVyI4M,1201
 maleo_foundation/models/transfers/general/key.py,sha256=S37SqD3qwTbgMk7785hW7Kl9d4Kouh4uPZcGoyMQ_-Q,755
 maleo_foundation/models/transfers/general/request.py,sha256=xOeBbtXygK5P6DxPyf3C4LIH3nb262tqWsgvALB4yfQ,1792
-maleo_foundation/models/transfers/general/settings.py,sha256=Datk7HcIBK4NwpZoqyjTtMBwK-K4Zu6D6cOpqT90QG8,4069
+maleo_foundation/models/transfers/general/settings.py,sha256=q3ljAuvLmzXD2vE9QdYDT6VNeqM5sjm1iZMhm1xB40g,2548
 maleo_foundation/models/transfers/general/signature.py,sha256=J9xQy2HjpCQOnES7RJqsUnDgjFPuakQ1mxyfdTdstSE,297
 maleo_foundation/models/transfers/general/token.py,sha256=PU-_wLFaY2i8pwRi9-jlk4nh7XzoTKOk0BEsUCGbD80,4979
 maleo_foundation/models/transfers/general/configurations/__init__.py,sha256=DMiBLOnA4Ye2q0-n0EyUU6U8YbpyqRn1l_vl4kuMKAI,2042
@@ -133,7 +133,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=ZglnLdW3lHmaKER4mwGe5N5ERus-bdsamfpwGmQYPIo,6344
 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.3.21.dist-info/METADATA,sha256=DxjNFhqeUOZijuVofupZ1Zb_B8iD97pjLHlDYEJksVw,3740
-maleo_foundation-0.3.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.3.21.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.3.21.dist-info/RECORD,,
+maleo_foundation-0.3.25.dist-info/METADATA,sha256=MiUXG1VvGaLcBiJqBwqmdWINhODbZYCr9t6gNLWUQk0,3740
+maleo_foundation-0.3.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.25.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.25.dist-info/RECORD,,