maleo-foundation 0.1.37__tar.gz → 0.1.38__tar.gz

{maleo_foundation-0.1.37 → maleo_foundation-0.1.38}/PKG-INFO

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

{maleo_foundation-0.1.37 → maleo_foundation-0.1.38}/maleo_foundation/managers/service.py

@@ -20,7 +20,8 @@ from maleo_foundation.middlewares.base import RequestProcessor
 from maleo_foundation.services.token import BaseTokenService
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.exceptions import BaseExceptions
-from maleo_foundation.utils.keyloader import BaseKeyLoaders
+from maleo_foundation.utils.loaders.json import JSONLoader
+from maleo_foundation.utils.loaders.key import KeyLoader
 from maleo_foundation.utils.logging import GoogleCloudLogging, ServiceLogger, MiddlewareLogger
 
 class LogConfig(BaseModel):
@@ -38,6 +39,7 @@ class Settings(BaseSettings):
     PUBLIC_KEY_PATH:str = Field("/keys/maleo-public-key.pem", description="Maleo's public key path")
     KEY_PASSWORD:str = Field(..., description="Maleo key's password")
     CONFIGURATIONS_PATH:str = Field(..., description="Service's configuration file path")
+    DB_PASSWORD:str = Field(..., description="Database's password")
 
 class Keys(BaseModel):
     password:str = Field(..., description="Key's password")
@@ -78,7 +80,8 @@ class ServiceConfigurations(BaseModel):
 
 class DatabaseConfigurations(BaseModel):
     username:str = Field("postgres", description="Database user's username")
-    password:str = Field(..., description="Database user's password")
+    password_env:str = Field("DB_PASSWORD", description="Database user's password .env")
+    password:str = Field(os.getenv(password_env), description="Database user's password")
     host:str = Field(..., description="Database's host")
     port:int = Field(5432, description="Database's port")
     database:str = Field(..., description="Database")
@@ -254,9 +257,8 @@ class ServiceManager:
         return self._settings
 
     def _load_configs(self) -> None:
-        with open(self._settings.CONFIGURATIONS_PATH) as f:
-            data = json.load(f)
-            self._configs = Configurations.model_validate(data)
+        data = JSONLoader.load(self._settings.CONFIGURATIONS_PATH)
+        self._configs = Configurations.model_validate(data)
 
     @property
     def configs(self) -> Configurations:
@@ -278,13 +280,11 @@ class ServiceManager:
 
     def _load_credentials(self) -> None:
         #* Load google credentials
-        with open(self._settings.GOOGLE_CREDENTIALS_PATH) as f:
-            data = json.load(f)
-            google = GoogleCredentials.model_validate(data)
+        data = JSONLoader.load(self._settings.GOOGLE_CREDENTIALS_PATH)
+        google = GoogleCredentials.model_validate(data)
         #* Load internal credentials
-        with open(self._settings.INTERNAL_CREDENTIALS_PATH) as f:
-            data = json.load(f)
-            internal = InternalCredentials.model_validate(data)
+        data = JSONLoader.load(self._settings.INTERNAL_CREDENTIALS_PATH)
+        internal = InternalCredentials.model_validate(data)
         self._credentials = Credentials(google=google, internal=internal)
 
     @property
@@ -294,14 +294,14 @@ class ServiceManager:
     def _parse_keys(self) -> None:
         #* Parse private key
         key_type = BaseEnums.KeyType.PRIVATE
-        private = BaseKeyLoaders.load_rsa(
+        private = KeyLoader.load_rsa(
             type=key_type,
             path=self._settings.PRIVATE_KEY_PATH,
             password=self._settings.KEY_PASSWORD
         )
         #* Parse public key
         key_type = BaseEnums.KeyType.PUBLIC
-        public = BaseKeyLoaders.load_rsa(
+        public = KeyLoader.load_rsa(
             type=key_type,
             path=self._settings.PUBLIC_KEY_PATH
         )

{maleo_foundation-0.1.37 → maleo_foundation-0.1.38}/maleo_foundation/utils/__init__.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 from .formatter import BaseFormatter
 from .exceptions import BaseExceptions
 from .extractor import BaseExtractors
-from .keyloader import BaseKeyLoaders
+from .loaders import BaseLoaders
 from .controller import BaseControllerUtils
 from .query import BaseQueryUtils
 
@@ -10,6 +10,6 @@ class BaseUtils:
     Formatter = BaseFormatter
     Exceptions = BaseExceptions
     Extractors = BaseExtractors
-    KeyLoader = BaseKeyLoaders
+    Loaders = BaseLoaders
     Controller = BaseControllerUtils
     Query = BaseQueryUtils

maleo_foundation-0.1.38/maleo_foundation/utils/loaders/__init__.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+from .json import JSONLoader
+from .key import KeyLoader
+from .yaml import YAMLLoader
+
+class BaseLoaders:
+    Json = JSONLoader
+    Key = KeyLoader
+    Yaml = YAMLLoader

maleo_foundation-0.1.38/maleo_foundation/utils/loaders/json.py

@@ -0,0 +1,14 @@
+import json
+from typing import Dict, List, Union, Any
+from pathlib import Path
+
+class JSONLoader:
+    @staticmethod
+    def load(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)

maleo_foundation-0.1.37/maleo_foundation/utils/keyloader.py → maleo_foundation-0.1.38/maleo_foundation/utils/loaders/key.py

@@ -1,13 +1,13 @@
-import pathlib
 from cryptography.hazmat.primitives import serialization
+from pathlib import Path
 from typing import Optional, Union
 from maleo_foundation.enums import BaseEnums
 
-class BaseKeyLoaders:
+class KeyLoader:
     @staticmethod
     def load_rsa(
         type:BaseEnums.KeyType,
-        path: Union[str, pathlib.Path],
+        path: Union[str, Path],
         password:Optional[Union[str, bytes]] = None,
         format:BaseEnums.KeyFormatType = BaseEnums.KeyFormatType.STRING,
     ) -> Union[bytes, str]:
@@ -15,7 +15,7 @@ class BaseKeyLoaders:
         Load an RSA private or public key strictly from a file.
 
         Args:
-            path (str | pathlib.Path): Path to the PEM file.
+            path (str | Path): Path to the PEM file.
             password (str | bytes | None): Password for encrypted private keys (optional).
 
         Returns:
@@ -24,7 +24,7 @@ class BaseKeyLoaders:
         if not isinstance(type, BaseEnums.KeyType):
             raise TypeError("Invalid key type")
 
-        file_path = pathlib.Path(path)
+        file_path = Path(path)
 
         if not file_path.is_file():
             raise FileNotFoundError(f"Key file not found: {file_path}")

maleo_foundation-0.1.38/maleo_foundation/utils/loaders/yaml.py

@@ -0,0 +1,14 @@
+import yaml
+from pathlib import Path
+from typing import Dict, Union
+
+class YAMLLoader:
+    @staticmethod
+    def load(path:Union[Path, str]) -> Dict:
+        file_path = Path(path)
+
+        if 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)

{maleo_foundation-0.1.37 → maleo_foundation-0.1.38}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.1.37 → maleo_foundation-0.1.38}/maleo_foundation.egg-info/SOURCES.txt

@@ -65,8 +65,11 @@ maleo_foundation/utils/__init__.py
 maleo_foundation/utils/controller.py
 maleo_foundation/utils/exceptions.py
 maleo_foundation/utils/extractor.py
-maleo_foundation/utils/keyloader.py
 maleo_foundation/utils/logging.py
 maleo_foundation/utils/query.py
 maleo_foundation/utils/formatter/__init__.py
-maleo_foundation/utils/formatter/case.py
+maleo_foundation/utils/formatter/case.py
+maleo_foundation/utils/loaders/__init__.py
+maleo_foundation/utils/loaders/json.py
+maleo_foundation/utils/loaders/key.py
+maleo_foundation/utils/loaders/yaml.py

{maleo_foundation-0.1.37 → maleo_foundation-0.1.38}/pyproject.toml

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