maleo-foundation 0.3.12__py3-none-any.whl → 0.3.13__py3-none-any.whl

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/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/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.dist-info → maleo_foundation-0.3.13.dist-info}/METADATA

@@ -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.dist-info → maleo_foundation-0.3.13.dist-info}/RECORD

@@ -37,7 +37,7 @@ maleo_foundation/managers/configuration.py,sha256=IyefI1GDDRYf5FRjxpJ2LfYiRL1fuz
 maleo_foundation/managers/credential.py,sha256=i1w9bVozf7FYG8NGfLgJYRdLWBQBf35yyzVOEDgdXSA,3108
 maleo_foundation/managers/db.py,sha256=y5oP3bTXKeXYKqng-E_HZ-3wC0ZPtl5bls0AEEej6zM,6050
 maleo_foundation/managers/middleware.py,sha256=ecTNloglV67xoC_hqIEMIxhfQwzXRKHLI3ThJdd-lbY,2480
-maleo_foundation/managers/service.py,sha256=1rqxXMJ9E-pla0LuhKZ83JS4boTnUhiXxn1EbzYQlWA,10859
+maleo_foundation/managers/service.py,sha256=UxQnWjfzqCR_e8n18-oSgM61Z9yuA93FmuqQ_vp6vmo,11168
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=j5_CsToA_7nn_2mP9TWWz7qKalXSWqxfKY_9gTNGJJA,4282
 maleo_foundation/managers/client/maleo.py,sha256=DoMmRitPQkBKvi92NtW20awUQRhcaBXdBzfDyFdSM3Q,2669
@@ -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=b-Bi8yEETtX58GiG1ROFcLGnc2LjMeccXYWqteHNwpY,1777
-maleo_foundation/models/transfers/general/settings.py,sha256=bEvsbhlFi5DO2tS3OmxL2LAG3q1cesW3ceYsT5iGNsE,3702
+maleo_foundation/models/transfers/general/settings.py,sha256=aGknx8K-GWLPSn2eEkdlmZuYAtnurHeKOS2RWyPN-zI,4089
 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=ZYXbqNkj-PHNuS8PsPtMB291s88K3wGi_PK2zJSeiX4,2010
@@ -76,7 +76,7 @@ maleo_foundation/models/transfers/general/configurations/database.py,sha256=v-Iz
 maleo_foundation/models/transfers/general/configurations/middleware.py,sha256=1BulO00lb7Xe537--rD_11GFrUKS8YxWHx2RkWfHqtg,2292
 maleo_foundation/models/transfers/general/configurations/service.py,sha256=8lag1KXkS43IwsMGWka7L-peQ9YT1-dmWeEhQ1hnnLU,304
 maleo_foundation/models/transfers/general/configurations/cache/__init__.py,sha256=a7p5LWkQJlgcfKpdJrKnCfe1LUAnwltXwTOThANlR6s,286
-maleo_foundation/models/transfers/general/configurations/cache/redis.py,sha256=LMxBNCmal6JjsAi7FTeN191PR1zFGw4jjfrJ9lJ_zu0,1162
+maleo_foundation/models/transfers/general/configurations/cache/redis.py,sha256=CFUkIgE6OyFeHcVBqShI8NBbG1G0wpJg6b2t8Ssq3OI,1161
 maleo_foundation/models/transfers/general/configurations/client/__init__.py,sha256=XSJp-y7TzXaz_cD3AG_Cnt4YQFv3tYGfam4U0FqUrhE,275
 maleo_foundation/models/transfers/general/configurations/client/maleo.py,sha256=p6NRPWL6eKZCVU_irBCS2iuTQl-QylYuHwV8Rht30GI,1560
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
@@ -134,7 +134,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=vmVObdAyXehb3L6ASOuUJ63mNvGPb9fiXSpdRndN-4A,6528
 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.12.dist-info/METADATA,sha256=EGdGe8N4zLGGDJ7w6NK6V_6JmDV9_2EdnMFeuNAeHOY,3740
-maleo_foundation-0.3.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.3.12.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.3.12.dist-info/RECORD,,
+maleo_foundation-0.3.13.dist-info/METADATA,sha256=bgIumcHp68bKDu2hon7uhNTLNQz0fbHkLkTWxn-XU_I,3740
+maleo_foundation-0.3.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.13.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.13.dist-info/RECORD,,