maleo-foundation 0.1.93__tar.gz → 0.1.95__tar.gz

{maleo_foundation-0.1.93 → maleo_foundation-0.1.95}/PKG-INFO

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

{maleo_foundation-0.1.93 → maleo_foundation-0.1.95}/maleo_foundation/managers/service.py

@@ -177,23 +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_configs = StaticConfigurations.model_validate(static_configurations)
+            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}")
-            static_configs = StaticConfigurations.model_validate_strings(static_configurations)
+            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_configs = RuntimeConfigurations.model_validate(runtime_configurations)
+            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}")
-            runtime_configs = RuntimeConfigurations.model_validate_strings(runtime_configurations)
+            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-0.1.93 → maleo_foundation-0.1.95}/maleo_foundation/middlewares/authentication.py

@@ -25,14 +25,17 @@ class Backend(AuthenticationBackend):
         auth = conn.headers["Authorization"]
         scheme, token = auth.split()
         if scheme != 'Bearer':
-            raise AuthenticationError("Authorization scheme must be Bearer token")
+            # raise AuthenticationError("Authorization scheme must be Bearer token")
+            return Credentials(), User(authenticated=False)
 
         decode_token_parameters = MaleoFoundationTokenParametersTransfers.Decode(key=self._keys.public, token=token)
         decode_token_result = self._maleo_foundation.services.token.decode(parameters=decode_token_parameters)
         if not decode_token_result.success:
-            raise AuthenticationError("Invalid Bearer token, unable to decode token")
+            # raise AuthenticationError("Invalid Bearer token, unable to decode token")
+            return Credentials(), User(authenticated=False)
         if decode_token_result.data.exp_dt <= datetime.now(tz=timezone.utc):
-            raise AuthenticationError("Expired Bearer token, request new or refresh token")
+            # raise AuthenticationError("Expired Bearer token, request new or refresh token")
+            return Credentials(), User(authenticated=False)
 
         payload = decode_token_result.data
         return (

{maleo_foundation-0.1.93 → maleo_foundation-0.1.95}/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-0.1.93 → maleo_foundation-0.1.95}/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.93 → maleo_foundation-0.1.95}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.1.93 → maleo_foundation-0.1.95}/pyproject.toml

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