feat: change keydb providing

src/infrastructure/config/settings.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
-from functools import lru_cache
-from typing import List, Literal
 import os
-from dotenv import load_dotenv, find_dotenv
-from pydantic import AliasChoices, Field, field_validator, model_validator
-from pydantic_settings import BaseSettings, SettingsConfigDict
+from functools import lru_cache
+from typing import List,Literal
+from dotenv import find_dotenv,load_dotenv
+from pydantic import AliasChoices,Field,field_validator,model_validator
+from pydantic_settings import BaseSettings,SettingsConfigDict
 from src.infrastructure.vault import create_hvac_client_from_approle, read_kv2_secret
 
-env_file = find_dotenv(".env")
+env_file = find_dotenv('.env')
 if env_file:
     load_dotenv(env_file)
 
@@ -80,6 +80,10 @@ class Settings(BaseSettings):
     KEYDB_REMOTE_PORT: int | None = None
     KEYDB_REMOTE_PASSWORD: str | None = None
     KEYDB_REMOTE_DB: int | None = None
+    KEYDB_HOST: str | None = Field(default=None,validation_alias=AliasChoices('KEYDB_HOST','KEYDB_CACHE_HOST'))
+    KEYDB_PORT: int | None = Field(default=None,validation_alias=AliasChoices('KEYDB_PORT','KEYDB_CACHE_PORT'))
+    KEYDB_PASSWORD: str | None = Field(default=None,validation_alias=AliasChoices('KEYDB_PASSWORD','KEYDB_CACHE_PASSWORD'))
+    KEYDB_DB: int | None = Field(default=None,validation_alias=AliasChoices('KEYDB_DB','KEYDB_CACHE_DB'))
 
     RABBIT_HOST: str = "localhost"
     RABBIT_PORT: int = 5672
@@ -128,7 +132,7 @@ class Settings(BaseSettings):
             return v
         return normalize_vault_base_url(v)
 
-    @model_validator(mode="before")
+    @model_validator(mode='before')
     @classmethod
     def load_from_vault(cls, data: dict):
         if not isinstance(data, dict):
@@ -284,19 +288,6 @@ class Settings(BaseSettings):
         else:
             data['KEYDB_REMOTE_PASSWORD'] = None
 
-        keydb_host_override = os.getenv('KEYDB_REMOTE_HOST') or data.get('KEYDB_REMOTE_HOST')
-        keydb_port_override = os.getenv('KEYDB_REMOTE_PORT') or data.get('KEYDB_REMOTE_PORT')
-        keydb_db_override = os.getenv('KEYDB_REMOTE_DB') or data.get('KEYDB_REMOTE_DB')
-        keydb_password_override = os.getenv('KEYDB_REMOTE_PASSWORD') or data.get('KEYDB_REMOTE_PASSWORD')
-        if keydb_host_override is not None and str(keydb_host_override).strip():
-            data['KEYDB_REMOTE_HOST'] = str(keydb_host_override).strip()
-        if keydb_port_override is not None and str(keydb_port_override).strip():
-            data['KEYDB_REMOTE_PORT'] = int(keydb_port_override)
-        if keydb_db_override is not None and str(keydb_db_override).strip():
-            data['KEYDB_REMOTE_DB'] = int(keydb_db_override)
-        if keydb_password_override is not None and str(keydb_password_override).strip():
-            data['KEYDB_REMOTE_PASSWORD'] = str(keydb_password_override).strip()
-
         itpay_public_id = data.get('ITPAY_PUBLIC_ID') or os.getenv('ITPAY_PUBLIC_ID')
         itpay_api_secret = data.get('ITPAY_API_SECRET') or os.getenv('ITPAY_API_SECRET')
         if itpay_public_id is not None and str(itpay_public_id).strip() and itpay_api_secret is not None and str(itpay_api_secret).strip():
@@ -348,20 +339,41 @@ class Settings(BaseSettings):
 
     @property
     def REDIS_URL(self) -> str:
-        return self.KEYDB_REMOTE_URL
+        return self.KEYDB_MARKET_URL
 
     @staticmethod
     def _redis_url(*, host: str, port: int, password: str | None, db: int) -> str:
         auth = f':{password}@' if password else ''
         return f'redis://{auth}{host}:{port}/{db}'
 
+    @property
+    def KEYDB_MARKET_URL(self) -> str:
+        if self.KEYDB_REMOTE_HOST is None or self.KEYDB_REMOTE_PORT is None or self.KEYDB_REMOTE_DB is None:
+            raise RuntimeError('Vault KeyDB settings are required for market data')
+        return self._redis_url(
+            host=self.KEYDB_REMOTE_HOST,
+            port=int(self.KEYDB_REMOTE_PORT),
+            password=self.KEYDB_REMOTE_PASSWORD,
+            db=int(self.KEYDB_REMOTE_DB),
+        )
+
     @property
     def KEYDB_REMOTE_URL(self) -> str:
-        host = self.KEYDB_REMOTE_HOST or self.REDIS_HOST
-        port = int(self.KEYDB_REMOTE_PORT) if self.KEYDB_REMOTE_PORT is not None else int(self.REDIS_PORT)
-        password = self.KEYDB_REMOTE_PASSWORD if self.KEYDB_REMOTE_PASSWORD is not None else self.REDIS_PASSWORD
-        db = int(self.KEYDB_REMOTE_DB) if self.KEYDB_REMOTE_DB is not None else int(self.REDIS_DB)
-        return self._redis_url(host=host, port=port, password=password, db=db)
+        return self.KEYDB_MARKET_URL
+
+    @property
+    def KEYDB_CACHE_URL(self) -> str | None:
+        if self.KEYDB_HOST is None or not self.KEYDB_HOST.strip():
+            return None
+        if self.KEYDB_PORT is None:
+            return None
+        db = int(self.KEYDB_DB) if self.KEYDB_DB is not None else 0
+        return self._redis_url(
+            host=self.KEYDB_HOST.strip(),
+            port=int(self.KEYDB_PORT),
+            password=self.KEYDB_PASSWORD,
+            db=db,
+        )
 
     @property
     def RABBIT_URL(self) -> str: