maleo-foundation 0.3.12__tar.gz → 0.3.13__tar.gz

{maleo_foundation-0.3.12 → maleo_foundation-0.3.13}/PKG-INFO

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

{maleo_foundation-0.3.12 → maleo_foundation-0.3.13}/maleo_foundation/managers/service.py

@@ -72,31 +72,43 @@ class ServiceManager:
     @property
     def settings(self) -> Settings:
         return self._settings
-    
+
     @property
     def log_config(self) -> SimpleConfig:
         return self._log_config
-    
+
     @property
     def google_credentials(self) -> Credentials:
         return self._credential_manager.google_credentials
-    
+
     @property
     def secret_manager(self) -> GoogleSecretManager:
         return self._credential_manager.secret_manager
-    
+
     @property
     def maleo_credentials(self) -> MaleoCredentials:
         return self._credential_manager.maleo_credentials
-    
+
     @property
     def configurations(self) -> Configurations:
         return self._configuration_manager.configurations
 
     def _load_keys(self) -> None:
-        password = self.secret_manager.get(name="maleo-key-password")
-        private = self.secret_manager.get(name="maleo-private-key")
-        public = self.secret_manager.get(name="maleo-public-key")
+        if self.settings.KEY_PASSWORD is not None:
+            password = self.settings.KEY_PASSWORD
+        else:
+            password = self.secret_manager.get(name="maleo-key-password")
+
+        if self.settings.PRIVATE_KEY is not None:
+            private = self.settings.PRIVATE_KEY
+        else:
+            private = self.secret_manager.get(name="maleo-private-key")
+
+        if self.settings.PUBLIC_KEY is not None:
+            public = self.settings.PUBLIC_KEY
+        else:
+            public = self.secret_manager.get(name="maleo-public-key")
+
         self._keys = BaseGeneralSchemas.RSAKeys(
             password=password,
             private=private,
@@ -231,12 +243,14 @@ class ServiceManager:
     def create_app(
         self,
         router: APIRouter,
-        lifespan: Optional[Lifespan[AppType]] = None
+        lifespan: Optional[Lifespan[AppType]] = None,
+        version: str = "unknown"
     ) -> FastAPI:
         self._loggers.application.info("Creating FastAPI application")
-        root_path = "" if self._settings.ENVIRONMENT == "local" else f"/{self.configurations.service.key.removeprefix("maleo-")}"
+        root_path = self._settings.ROOT_PATH
         self._app = FastAPI(
             title=self.configurations.service.name,
+            version=version,
             lifespan=lifespan,
             root_path=root_path
         )

{maleo_foundation-0.3.12 → maleo_foundation-0.3.13}/maleo_foundation/models/transfers/general/configurations/cache/redis.py

@@ -21,5 +21,5 @@ class RedisCacheConfigurations(BaseModel):
     port: int = Field(6379, description="Redis instance's port")
     db: int = Field(0, description="Redis instance's db")
     password: BaseTypes.OptionalString = Field(None, description="AUTH password")
-    decode_responses: bool = Field(False, description="Whether to decode responses")
+    decode_responses: bool = Field(True, description="Whether to decode responses")
     health_check_interval: int = Field(30, description="Health check interval")

{maleo_foundation-0.3.12 → maleo_foundation-0.3.13}/maleo_foundation/models/transfers/general/settings.py

@@ -7,6 +7,7 @@ from maleo_foundation.types import BaseTypes
 class Settings(BaseSettings):
     ENVIRONMENT: BaseEnums.EnvironmentType = Field(..., description="Environment")
     SERVICE_KEY: str = Field(..., description="Service's key")
+    ROOT_PATH: str = Field("", description="Application's root path")
     GOOGLE_CREDENTIALS_PATH: str = Field(
         "/credentials/maleo-google-service-account.json",
         description="Internal credential's file path"
@@ -27,6 +28,18 @@ class Settings(BaseSettings):
         None,
         description="Service's runtime configurations path"
     )
+    KEY_PASSWORD: BaseTypes.OptionalString = Field(
+        None,
+        description="Key's password"
+    )
+    PRIVATE_KEY: BaseTypes.OptionalString = Field(
+        None,
+        description="Private key"
+    )
+    PUBLIC_KEY: BaseTypes.OptionalString = Field(
+        None,
+        description="Public key"
+    )
 
     @classmethod
     @model_validator(mode="before")

{maleo_foundation-0.3.12 → maleo_foundation-0.3.13}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.3.12 → maleo_foundation-0.3.13}/pyproject.toml

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