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

maleo_foundation/managers/client/google/subscription.py

@@ -17,7 +17,7 @@ OptionalController = Optional[Controller]
 class SubscriptionConfigurations(BaseModel):
     subscription_name: str
     max_messages: int = 10
-    ack_deadline: int = 30
+    ack_deadline: int = 10
     controller: OptionalController = None
 
 class SubscriptionManager(GoogleClientManager):

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/types.py

@@ -1,5 +1,4 @@
 from datetime import date, datetime
-from pathlib import Path
 from typing import Dict, Optional, Union, Literal, List, Any
 from uuid import UUID
 from maleo_foundation.enums import BaseEnums
@@ -25,9 +24,6 @@ class BaseTypes:
     OptionalInteger = Optional[int]
     OptionalListOfIntegers = Optional[List[int]]
 
-    #* Path-related types
-    OptionalPath = Optional[Path]
-
     #* String-related types
     ListOfStrings = List[str]
     OptionalString = Optional[str]

maleo_foundation/utils/loaders/credential/google.py

@@ -17,7 +17,7 @@ class GoogleCredentialsLoader:
         2. GOOGLE_CREDENTIALS_PATH environment variable
         3. GOOGLE_APPLICATION_CREDENTIALS environment variable
         4. Service account from default credentials (if available)
-        
+
         Always returns google.oauth2.service_account.Credentials with project_id.
         Raises ValueError if service account credentials cannot be loaded or project_id is missing.
         """
@@ -26,24 +26,24 @@ class GoogleCredentialsLoader:
             credentials_path = Path(credentials_path)
             if credentials_path.exists() and credentials_path.is_file():
                 return GoogleCredentialsLoader._load_from_file(credentials_path)
-        
+
         # Try GOOGLE_CREDENTIALS_PATH environment variable
         env_credentials_path = os.getenv("GOOGLE_CREDENTIALS_PATH")
         if env_credentials_path:
             credentials_path = Path(env_credentials_path)
             if credentials_path.exists() and credentials_path.is_file():
                 return GoogleCredentialsLoader._load_from_file(credentials_path)
-        
+
         # Try GOOGLE_APPLICATION_CREDENTIALS environment variable
         app_credentials_path = os.getenv("GOOGLE_APPLICATION_CREDENTIALS")
         if app_credentials_path:
             credentials_path = Path(app_credentials_path)
             if credentials_path.exists() and credentials_path.is_file():
                 return GoogleCredentialsLoader._load_from_file(credentials_path)
-        
+
         # Try to get service account from default credentials
         return GoogleCredentialsLoader._load_from_default()
-    
+
     @staticmethod
     def _load_from_file(credentials_path: Path) -> Credentials:
         """Load credentials from a service account file."""
@@ -51,31 +51,31 @@ class GoogleCredentialsLoader:
             # First, read and validate the service account file
             with open(credentials_path, 'r') as f:
                 service_account_info = json.load(f)
-            
+
             # Ensure project_id is present in the file
             if 'project_id' not in service_account_info or not service_account_info['project_id']:
                 raise ValueError(f"Service account file {credentials_path} does not contain project_id")
-            
+
             # Load credentials from the file
             credentials = Credentials.from_service_account_file(str(credentials_path))
-            
+
             # Double-check that project_id is available in the credentials object
             if not credentials.project_id:
                 raise ValueError(f"Loaded credentials from {credentials_path} do not have project_id")
-            
+
             return credentials
-            
+
         except json.JSONDecodeError as e:
             raise ValueError(f"Invalid JSON in credentials file {credentials_path}: {str(e)}")
         except Exception as e:
             raise ValueError(f"Failed to load credentials from file {credentials_path}: {str(e)}")
-    
+
     @staticmethod
     def _load_from_default() -> Credentials:
         """Load service account credentials from default sources."""
         try:
             credentials, _ = default()
-            
+
             # Check if the default credentials are service account credentials
             if isinstance(credentials, Credentials):
                 # Already service account credentials
@@ -86,7 +86,7 @@ class GoogleCredentialsLoader:
                         "Service account credentials loaded from default source do not have project_id. "
                         "Please ensure your service account key file contains the project_id field."
                     )
-                
+
                 return credentials
             else:
                 # Default credentials are not service account credentials
@@ -96,7 +96,7 @@ class GoogleCredentialsLoader:
                     "Please provide a service account key file via GOOGLE_CREDENTIALS_PATH, "
                     "GOOGLE_APPLICATION_CREDENTIALS, or the credentials_path parameter."
                 )
-                
+
         except Exception as e:
             if "service account" in str(e).lower() or "project_id" in str(e).lower():
                 raise
@@ -105,7 +105,7 @@ class GoogleCredentialsLoader:
                 "Please provide a service account key file via GOOGLE_CREDENTIALS_PATH, "
                 "GOOGLE_APPLICATION_CREDENTIALS, or the credentials_path parameter."
             )
-    
+
     @staticmethod
     def _get_project_id_from_env() -> str:
         """Get project_id from environment variables."""
@@ -115,24 +115,24 @@ class GoogleCredentialsLoader:
             os.getenv("GCP_PROJECT") or
             os.getenv("PROJECT_ID")
         )
-        
+
         if not project_id:
             raise RuntimeError(
                 "project_id is required but not found. Please set one of the following environment variables: "
                 "GOOGLE_CLOUD_PROJECT, GCLOUD_PROJECT, GCP_PROJECT, or PROJECT_ID, "
                 "or ensure your service account key file contains the project_id field."
             )
-        
+
         return project_id
-    
+
     @staticmethod
     def validate_credentials(credentials: Credentials) -> None:
         """Validate that credentials are service account credentials with project_id."""
         if not isinstance(credentials, Credentials):
             raise ValueError("Credentials must be google.oauth2.service_account.Credentials")
-        
+
         if not credentials.project_id:
             raise ValueError("Service account credentials must have project_id")
-        
+
         if not credentials.service_account_email:
             raise ValueError("Service account credentials must have service_account_email")

{maleo_foundation-0.3.12.dist-info → maleo_foundation-0.3.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.3.12
+Version: 0.3.14
 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.14.dist-info}/RECORD

@@ -5,7 +5,7 @@ maleo_foundation/constants.py,sha256=LjMIy_Fcr6HLuhIuXs5lCtkyScZXXHOtBMPYx5lwg00
 maleo_foundation/enums.py,sha256=08rkuG3Y4-8kvd5BOBhhIS0UhzBT4kAPQX4L95GqnWQ,5316
 maleo_foundation/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/rest_controller_result.py,sha256=4KbCmk70IEHj1L1bNJfFg1Y3ifnRSnmvK6dYyVJddok,2014
-maleo_foundation/types.py,sha256=VFdnBuEh5QW_ytaZ4sNBqb6XxALU5g0RtzP0fR4svNY,2537
+maleo_foundation/types.py,sha256=bUcCR-qRlxxttMxJQnVmtBic3EXEd_urcC2P55evWPc,2451
 maleo_foundation/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/client/manager.py,sha256=zI6LCRQmBynK3LYU8tfd9RXE2QIzaOTzl12B24tpAxw,2720
 maleo_foundation/client/services/__init__.py,sha256=uIBnAeQ9a2otQbUAbKBQfYrkEUugXjxXoV8W5QYHuic,1051
@@ -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
@@ -46,7 +46,7 @@ maleo_foundation/managers/client/google/base.py,sha256=sxALVZIyKUUbNamMrXSlyb3ft
 maleo_foundation/managers/client/google/parameter.py,sha256=Jy-rMz_xhepmxBI2rWPxdP8AENBbiApg04nO6cIGXN8,1429
 maleo_foundation/managers/client/google/secret.py,sha256=m-mjaLvYMLgAEn1OxmP0IVTYFQi1jSpDdutLxNA6t6g,4620
 maleo_foundation/managers/client/google/storage.py,sha256=lEPw4N07nV9r7KjvF2Pb3RM1ZQBK9Riqj7vh6XOEY5Q,5417
-maleo_foundation/managers/client/google/subscription.py,sha256=1kb9ftuzDNynXwEMh2gFwL3BUCcNp-cmo4AoHnJjNg8,5177
+maleo_foundation/managers/client/google/subscription.py,sha256=-mTMKu-85RLXaqGzLK3odQ-jRgkqWUms5cjPRq6rtq0,5177
 maleo_foundation/middlewares/authentication.py,sha256=OXtISL-blyWXn-bsFuWlo0Wn_Go3V-rQLCQZEGmvBNY,4658
 maleo_foundation/middlewares/base.py,sha256=IszulI930Fm4T4LQZJIyV8kebAlXt4joR6knB3QZUgA,16437
 maleo_foundation/middlewares/cors.py,sha256=9hLh_h253bvIn7-A7mUblyrJQ37XNpV7aLeHW6ZTHz8,2294
@@ -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
@@ -131,10 +131,10 @@ maleo_foundation/utils/loaders/__init__.py,sha256=P_3ycGfeDXFjAi8bE4iLWHxBveqUId
 maleo_foundation/utils/loaders/json.py,sha256=Uw8v_nfkNMPvcpDYrFwqZBkACyxWzzd6M7klhHbo5JI,508
 maleo_foundation/utils/loaders/yaml.py,sha256=V2AMjkwoxi1awdahifjtEALvUZ11VL9pZWGtQ7qrNJs,503
 maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg7rejnG4I684FjUwh70tvhtVM,141
-maleo_foundation/utils/loaders/credential/google.py,sha256=vmVObdAyXehb3L6ASOuUJ63mNvGPb9fiXSpdRndN-4A,6528
+maleo_foundation/utils/loaders/credential/google.py,sha256=ZglnLdW3lHmaKER4mwGe5N5ERus-bdsamfpwGmQYPIo,6344
 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.14.dist-info/METADATA,sha256=2IjSFuWCkXn1Rhl8ylgco8zFDMHdUrAi8wMBSrOH690,3740
+maleo_foundation-0.3.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.14.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.14.dist-info/RECORD,,