feat(redis): Update Redis configuration to support flexible connection handling

.env.example

@@ -26,10 +26,10 @@ POSTGRES_CONNECT_BACKOFF_MULTIPLIER=1.5
 DATABASE_URL=postgresql+asyncpg://your-db-user:your-db-password@localhost:5432/cuatrolabs
 
 # Redis Configuration (for caching and session management)
-REDIS_URL=redis://default:your-redis-password@localhost:6379/0
+# If REDIS_URL is set, it will be used; otherwise REDIS_HOST/REDIS_PORT are used.
+REDIS_URL=redis://:your-redis-password@localhost:6379/0
 REDIS_HOST=localhost
 REDIS_PORT=6379
-REDIS_USERNAME=default
 REDIS_PASSWORD=your-redis-password
 REDIS_DB=0
 

app/cache.py

@@ -3,7 +3,6 @@ Redis connection and cache instance.
 Provides Redis client for OTP storage and rate limiting.
 """
 import redis.asyncio as redis
-from redis.exceptions import AuthenticationError
 from insightfy_utils.logging import get_logger
 from app.core.config import settings
 
@@ -12,6 +11,51 @@ logger = get_logger(__name__)
 # Redis client instance
 redis_client: redis.Redis = None
 
+# Insightfy-style settings mapping
+CACHE_URL = settings.REDIS_URL
+CACHE_URI = f"{settings.REDIS_HOST}:{settings.REDIS_PORT}"
+CACHE_K = settings.REDIS_PASSWORD
+CACHE_DB = settings.REDIS_DB
+
+
+def create_redis_connection(**kwargs) -> redis.Redis:
+    """Create a Redis client with the provided kwargs."""
+    return redis.Redis(**kwargs)
+
+
+# -----------------------------------------------------------------------------
+# Redis client initialization with insightfy patterns
+# -----------------------------------------------------------------------------
+def _redis_from_settings() -> redis.Redis:
+    """Create Redis client from settings using insightfy patterns."""
+    if CACHE_URL:
+        return redis.from_url(
+            CACHE_URL,
+            decode_responses=True,
+            socket_timeout=5,
+            socket_connect_timeout=5,
+            retry_on_timeout=True,
+            health_check_interval=30,
+        )
+
+    try:
+        host, port_str = CACHE_URI.split(":")
+        port = int(port_str)
+    except Exception:
+        raise ValueError("Invalid CACHE_URI format. Expected 'host:port'.")
+
+    return create_redis_connection(
+        host=host,
+        port=port,
+        password=CACHE_K or None,
+        db=CACHE_DB,
+        decode_responses=True,
+        socket_timeout=5,
+        socket_connect_timeout=5,
+        retry_on_timeout=True,
+        health_check_interval=30,
+    )
+
 
 async def connect_to_redis():
     """
@@ -20,55 +64,16 @@ async def connect_to_redis():
     """
     global redis_client
     try:
-        logger.info("Connecting to Redis", extra={
-            "host": settings.REDIS_HOST,
-            "port": settings.REDIS_PORT,
-            "db": settings.REDIS_DB
+        redis_client = _redis_from_settings()
+        logger.info("Redis client initialized with insightfy patterns", extra={
+            "service": "insightfy-bms-ms-mhs"
         })
 
-        if settings.REDIS_URL:
-            redis_client = redis.from_url(
-                settings.REDIS_URL,
-                decode_responses=True
-            )
-        else:
-            username = settings.REDIS_USERNAME or None
-            password = settings.REDIS_PASSWORD or None
-            redis_client = redis.Redis(
-                host=settings.REDIS_HOST,
-                port=settings.REDIS_PORT,
-                username=username,
-                password=password,
-                db=settings.REDIS_DB,
-                decode_responses=True
-            )
-
         # Test the connection
-        try:
-            await redis_client.ping()
-        except AuthenticationError as auth_error:
-            if settings.REDIS_URL or not settings.REDIS_USERNAME:
-                raise auth_error
-            logger.warning(
-                "Redis auth failed with username; retrying without username for legacy AUTH",
-                extra={
-                    "host": settings.REDIS_HOST,
-                    "port": settings.REDIS_PORT,
-                    "db": settings.REDIS_DB
-                }
-            )
-            redis_client = redis.Redis(
-                host=settings.REDIS_HOST,
-                port=settings.REDIS_PORT,
-                password=settings.REDIS_PASSWORD or None,
-                db=settings.REDIS_DB,
-                decode_responses=True
-            )
-            await redis_client.ping()
-        
+        await redis_client.ping()
         logger.info("Successfully connected to Redis")
     except Exception as e:
-        logger.error("Failed to connect to Redis", exc_info=e)
+        logger.error("Failed to initialize Redis client", exc_info=e)
         raise
 
 

app/core/config.py

@@ -83,7 +83,6 @@ class Settings(BaseSettings):
     REDIS_URL: Optional[str] = os.getenv("REDIS_URL")
     REDIS_HOST: str = os.getenv("REDIS_HOST", "localhost")
     REDIS_PORT: int = int(os.getenv("REDIS_PORT", "6379"))
-    REDIS_USERNAME: Optional[str] = os.getenv("REDIS_USERNAME")
     REDIS_PASSWORD: Optional[str] = os.getenv("REDIS_PASSWORD")
     REDIS_DB: int = int(os.getenv("REDIS_DB", "0"))