diff --git a/litellm/_redis.py b/litellm/_redis.py index 499d713e5e4..186f8523519 100644 --- a/litellm/_redis.py +++ b/litellm/_redis.py @@ -675,7 +675,10 @@ def _get_redis_client_logic(**env_overrides): if redis_kwargs.get("startup_nodes") else redis.Redis ) - return _coerce_redis_kwargs_types(redis_kwargs, client=coercion_client) + coerced_kwargs: Final = _coerce_redis_kwargs_types(redis_kwargs, client=coercion_client) + if coerced_kwargs.get("socket_timeout") is None: + coerced_kwargs["socket_timeout"] = REDIS_SOCKET_TIMEOUT + return coerced_kwargs def init_redis_cluster(redis_kwargs) -> redis.RedisCluster: @@ -722,7 +725,6 @@ def _init_redis_sentinel(redis_kwargs) -> redis.Redis: sentinel_password: Final = redis_kwargs.get("sentinel_password") service_name: Final = redis_kwargs.get("service_name") connection_kwargs: Final = _get_redis_sentinel_connection_kwargs(redis_kwargs) - connection_kwargs.setdefault("socket_timeout", REDIS_SOCKET_TIMEOUT) sentinel_kwargs: Final = _sentinel_auth_kwargs(connection_kwargs, sentinel_password) if not sentinel_nodes or not service_name: @@ -755,7 +757,6 @@ def _init_async_redis_sentinel(redis_kwargs) -> async_redis.Redis: sentinel_password: Final = redis_kwargs.get("sentinel_password") service_name: Final = redis_kwargs.get("service_name") connection_kwargs: Final = _get_redis_sentinel_connection_kwargs(redis_kwargs) - connection_kwargs.setdefault("socket_timeout", REDIS_SOCKET_TIMEOUT) sentinel_kwargs: Final = _sentinel_auth_kwargs(connection_kwargs, sentinel_password) if not sentinel_nodes or not service_name: diff --git a/litellm/constants.py b/litellm/constants.py index 6b34491efff..e78e3e36364 100644 --- a/litellm/constants.py +++ b/litellm/constants.py @@ -551,7 +551,7 @@ DEFAULT_POLLING_INTERVAL: Final = get_env_float( AZURE_OPERATION_POLLING_TIMEOUT: Final = get_env_int("AZURE_OPERATION_POLLING_TIMEOUT", 120) AZURE_DOCUMENT_INTELLIGENCE_API_VERSION: Final = str(os.getenv("AZURE_DOCUMENT_INTELLIGENCE_API_VERSION", "2024-11-30")) AZURE_DOCUMENT_INTELLIGENCE_DEFAULT_DPI: Final = get_env_int("AZURE_DOCUMENT_INTELLIGENCE_DEFAULT_DPI", 96) -REDIS_SOCKET_TIMEOUT: Final = get_env_float("REDIS_SOCKET_TIMEOUT", 0.1) +REDIS_SOCKET_TIMEOUT: Final = get_env_float("REDIS_SOCKET_TIMEOUT", 5.0) CACHE_WRITE_SHUTDOWN_FLUSH_TIMEOUT_SECONDS: Final[float] = 5.0 REDIS_CONNECTION_POOL_TIMEOUT: Final = get_env_int("REDIS_CONNECTION_POOL_TIMEOUT", 5) REDIS_CIRCUIT_BREAKER_FAILURE_THRESHOLD: Final = get_env_int("REDIS_CIRCUIT_BREAKER_FAILURE_THRESHOLD", 5)