maleo-foundation 0.1.37__py3-none-any.whl → 0.1.39__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -5,9 +5,9 @@ from fastapi.exceptions import RequestValidationError
 from starlette.exceptions import HTTPException
 from starlette.types import Lifespan, AppType
 from pydantic_settings import BaseSettings
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, model_validator
 from sqlalchemy import MetaData
-from typing import Optional, Type
+from typing import Dict, Optional, Type
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.transfers.general.token import BaseTokenGeneralTransfers
 from maleo_foundation.models.transfers.parameters.token import BaseTokenParametersTransfers
@@ -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,11 +80,24 @@ class ServiceConfigurations(BaseModel):
 
 class DatabaseConfigurations(BaseModel):
     username:str = Field("postgres", description="Database user's username")
+    password_env:str = Field("DB_PASSWORD", description="Database user's password .env")
     password:str = Field(..., 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")
 
+    @model_validator(mode='before')
+    @classmethod
+    def populate_password(cls, values:Dict):
+        env_name = values.get("password_env")
+        if not env_name:
+            raise ValueError("password_env is required to fetch password from environment.")
+        env_value = os.getenv(env_name)
+        if env_value is None:
+            raise ValueError(f"'{env_name}' must be set.")
+        values["password"] = env_value
+        return values
+
     @property
     def url(self) -> str:
         return f"postgresql://{self.username}:{self.password}@{self.host}:{self.port}/{self.database}"
@@ -254,9 +269,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 +292,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 +306,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/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/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/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/utils/{keyloader.py → 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/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.dist-info → maleo_foundation-0.1.39.dist-info}/METADATA

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

{maleo_foundation-0.1.37.dist-info → maleo_foundation-0.1.39.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=-xsghwPtqV95YcktytV7Zba_E38JkmwUPlHXcLppfkQ,20413
+maleo_foundation/managers/service.py,sha256=XTbsV11JEGqfiHJwra5MSJ1l7rqP3IUTvMtLwnJZ5yM,21005
 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,16 +54,19 @@ 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=eEnPPeA6la0mu7535EFEKUB02C1IO_R8JgYcohvf1qU,471
+maleo_foundation/utils/__init__.py,sha256=KoERe8U2ERGZeAKUNBPW_itk7g9YpH7v7_mD9_i050o,461
 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/keyloader.py,sha256=TOKgKLqvUV27MYkej9d_MQB9O8bOJ_WzaXlqHorkmpo,2581
 maleo_foundation/utils/logging.py,sha256=MwvZmZSA8SIdfq-knEvpYIgqnSpHcyHrZY9TVHWVHJA,9023
 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
-maleo_foundation-0.1.37.dist-info/METADATA,sha256=G4M-2SvG4uuTt1hiIP7g0UnQmI4-SQUWbxb_OGm5tjc,3190
-maleo_foundation-0.1.37.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-maleo_foundation-0.1.37.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.37.dist-info/RECORD,,
+maleo_foundation/utils/loaders/__init__.py,sha256=Dnuv7BWyglSddnbsFb96s-b3KaW7UK1uLsMZfZ8zVi8,203
+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.39.dist-info/METADATA,sha256=DDXV3R3FbXZHl3RgmRVm380Xf4CFog-qdb8Kddf9ndM,3190
+maleo_foundation-0.1.39.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+maleo_foundation-0.1.39.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.39.dist-info/RECORD,,