mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-06 02:48:13 +00:00
`pytest.raises(Exception)` with no `match=` passes on any error that broad. A TypeError from a refactor, a botched fixture, an import that moved: all of them read as the rejection the test claims to police, so the test goes green for the wrong reason and stays green after the behaviour it guards is gone. PT011 closes that gap for the 317 sites B017 could not reach, because B017 only fires on a single-statement body with no `as e` binding. Each pattern here is the message the code actually raised, recorded by running the sites under a plugin that logged the concrete type and text per call site, so the assertions describe observed behaviour rather than a guess. Where a site raises more than one message across its parametrize cases, the pattern is an alternation of what was seen; where the exception carries an empty `str()` and puts the text on `.message`, the site keeps a narrow `noqa` with the reason. PT014 removes four parametrize cases that were listed twice. The duplicate re-runs an assertion that already passed, and it usually marks a case someone meant to vary and forgot to edit.
1068 lines
40 KiB
Python
1068 lines
40 KiB
Python
import json
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
import redis
|
|
import redis.asyncio as async_redis
|
|
|
|
from litellm._redis import (
|
|
_get_redis_cluster_kwargs,
|
|
get_redis_async_client,
|
|
get_redis_client,
|
|
get_redis_connection_pool,
|
|
get_redis_url_from_environment,
|
|
)
|
|
from litellm.constants import REDIS_CLUSTER_HEALTH_CHECK_INTERVAL
|
|
from litellm._redis_credential_provider import (
|
|
AzureADCredentialProvider,
|
|
GCPIAMCredentialProvider,
|
|
_token_cache,
|
|
)
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def clear_gcp_iam_token_cache():
|
|
"""Reset the module-level GCP IAM token cache between tests."""
|
|
_token_cache.clear()
|
|
yield
|
|
_token_cache.clear()
|
|
|
|
|
|
def test_get_redis_url_from_environment_single_url(monkeypatch):
|
|
"""Test when REDIS_URL is directly provided"""
|
|
# Set the environment variable
|
|
monkeypatch.setenv("REDIS_URL", "redis://redis-server:6379/0")
|
|
|
|
# Call the function to get the Redis URL
|
|
redis_url = get_redis_url_from_environment()
|
|
|
|
# Assert that the returned URL matches the expected value
|
|
assert redis_url == "redis://redis-server:6379/0"
|
|
|
|
|
|
def test_get_redis_url_from_environment_host_port(monkeypatch):
|
|
"""Test when REDIS_HOST and REDIS_PORT are provided"""
|
|
# Set the environment variables
|
|
monkeypatch.setenv("REDIS_HOST", "redis-server")
|
|
monkeypatch.setenv("REDIS_PORT", "6379")
|
|
# Ensure authentication variables are not set
|
|
monkeypatch.delenv("REDIS_USERNAME", raising=False)
|
|
monkeypatch.delenv("REDIS_PASSWORD", raising=False)
|
|
monkeypatch.delenv("REDIS_SSL", raising=False)
|
|
|
|
# Call the function to get the Redis URL
|
|
redis_url = get_redis_url_from_environment()
|
|
|
|
# Assert that the returned URL matches the expected value
|
|
assert redis_url == "redis://redis-server:6379"
|
|
|
|
|
|
def test_get_redis_url_from_environment_with_ssl(monkeypatch):
|
|
"""Test when SSL is enabled"""
|
|
# Set the environment variables
|
|
monkeypatch.setenv("REDIS_HOST", "redis-server")
|
|
monkeypatch.setenv("REDIS_PORT", "6379")
|
|
monkeypatch.setenv("REDIS_SSL", "true")
|
|
# Ensure authentication variables are not set
|
|
monkeypatch.delenv("REDIS_USERNAME", raising=False)
|
|
monkeypatch.delenv("REDIS_PASSWORD", raising=False)
|
|
|
|
# Call the function to get the Redis URL
|
|
redis_url = get_redis_url_from_environment()
|
|
|
|
# Assert that the returned URL uses rediss:// protocol
|
|
assert redis_url == "rediss://redis-server:6379"
|
|
|
|
|
|
def test_get_redis_url_from_environment_with_username_password(monkeypatch):
|
|
"""Test when username and password are provided"""
|
|
# Set the environment variables
|
|
monkeypatch.setenv("REDIS_HOST", "redis-server")
|
|
monkeypatch.setenv("REDIS_PORT", "6379")
|
|
monkeypatch.setenv("REDIS_USERNAME", "user")
|
|
monkeypatch.setenv("REDIS_PASSWORD", "password")
|
|
|
|
# Call the function to get the Redis URL
|
|
redis_url = get_redis_url_from_environment()
|
|
|
|
# Assert that the returned URL includes username:password@
|
|
assert redis_url == "redis://user:password@redis-server:6379"
|
|
|
|
|
|
def test_get_redis_url_from_environment_with_password_only(monkeypatch):
|
|
"""Test when only password is provided"""
|
|
# Set the environment variables
|
|
monkeypatch.setenv("REDIS_HOST", "redis-server")
|
|
monkeypatch.setenv("REDIS_PORT", "6379")
|
|
monkeypatch.setenv("REDIS_PASSWORD", "password")
|
|
# Ensure username is not set
|
|
monkeypatch.delenv("REDIS_USERNAME", raising=False)
|
|
monkeypatch.delenv("REDIS_SSL", raising=False)
|
|
|
|
# Call the function to get the Redis URL
|
|
redis_url = get_redis_url_from_environment()
|
|
|
|
# Assert that the returned URL includes :password@
|
|
assert redis_url == "redis://password@redis-server:6379"
|
|
|
|
|
|
def test_get_redis_url_from_environment_with_all_options(monkeypatch):
|
|
"""Test when all options are provided"""
|
|
# Set the environment variables
|
|
monkeypatch.setenv("REDIS_HOST", "redis-server")
|
|
monkeypatch.setenv("REDIS_PORT", "6379")
|
|
monkeypatch.setenv("REDIS_USERNAME", "user")
|
|
monkeypatch.setenv("REDIS_PASSWORD", "password")
|
|
monkeypatch.setenv("REDIS_SSL", "true")
|
|
|
|
# Call the function to get the Redis URL
|
|
redis_url = get_redis_url_from_environment()
|
|
|
|
# Assert that the returned URL includes all components
|
|
assert redis_url == "rediss://user:password@redis-server:6379"
|
|
|
|
|
|
def test_get_redis_url_from_environment_missing_host_port(monkeypatch):
|
|
"""Test error when required variables are missing"""
|
|
# Make sure these environment variables don't exist
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.delenv("REDIS_PORT", raising=False)
|
|
|
|
# Call the function and expect a ValueError
|
|
with pytest.raises(ValueError, match="Either 'REDIS_URL' or both 'REDIS_HOST' and 'REDIS_PORT") as excinfo:
|
|
get_redis_url_from_environment()
|
|
|
|
# Check the error message
|
|
assert (
|
|
"Either 'REDIS_URL' or both 'REDIS_HOST' and 'REDIS_PORT' must be specified"
|
|
in str(excinfo.value)
|
|
)
|
|
|
|
|
|
def test_get_redis_url_from_environment_missing_port(monkeypatch):
|
|
"""Test error when only REDIS_HOST is provided but REDIS_PORT is missing"""
|
|
# Make sure REDIS_URL doesn't exist and set only REDIS_HOST
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_PORT", raising=False)
|
|
monkeypatch.setenv("REDIS_HOST", "redis-server")
|
|
|
|
# Call the function and expect a ValueError
|
|
with pytest.raises(ValueError, match="Either 'REDIS_URL' or both 'REDIS_HOST' and 'REDIS_PORT") as excinfo:
|
|
get_redis_url_from_environment()
|
|
|
|
# Check the error message
|
|
assert (
|
|
"Either 'REDIS_URL' or both 'REDIS_HOST' and 'REDIS_PORT' must be specified"
|
|
in str(excinfo.value)
|
|
)
|
|
|
|
|
|
def test_max_connections_in_cluster_kwargs():
|
|
"""Test that max_connections is included in Redis cluster kwargs"""
|
|
kwargs = _get_redis_cluster_kwargs()
|
|
assert (
|
|
"max_connections" in kwargs
|
|
), "max_connections should be in available Redis cluster kwargs"
|
|
|
|
|
|
def test_socket_timeouts_in_cluster_kwargs():
|
|
"""Test that Redis cluster clients can receive socket timeout configuration"""
|
|
kwargs = _get_redis_cluster_kwargs()
|
|
assert "socket_timeout" in kwargs
|
|
assert "socket_connect_timeout" in kwargs
|
|
|
|
|
|
def test_reconnect_kwargs_in_cluster_kwargs():
|
|
"""Health check and keepalive must survive the cluster kwarg allow-list so
|
|
operators can tune Redis cluster reconnection behavior via config."""
|
|
kwargs = _get_redis_cluster_kwargs()
|
|
assert "health_check_interval" in kwargs
|
|
assert "socket_keepalive" in kwargs
|
|
|
|
|
|
@patch("litellm._redis.async_redis.RedisCluster")
|
|
def test_async_cluster_sets_reconnect_defaults(mock_cluster_cls):
|
|
"""
|
|
The async RedisCluster client must be built with a periodic health check and
|
|
TCP keepalive so a connection silently dropped by a cluster restart (e.g.
|
|
ElastiCache Serverless maintenance) is revalidated and reconnected before
|
|
reuse instead of stalling in re-initialization. Regression for LIT-4083.
|
|
"""
|
|
get_redis_async_client(startup_nodes=[{"host": "cluster-node", "port": 6379}])
|
|
|
|
mock_cluster_cls.assert_called_once()
|
|
call_kwargs = mock_cluster_cls.call_args[1]
|
|
assert call_kwargs["health_check_interval"] == REDIS_CLUSTER_HEALTH_CHECK_INTERVAL
|
|
assert call_kwargs["health_check_interval"] > 0
|
|
assert call_kwargs["socket_keepalive"] is True
|
|
|
|
|
|
@patch("litellm._redis.async_redis.RedisCluster")
|
|
def test_async_cluster_reconnect_defaults_are_overridable(mock_cluster_cls):
|
|
"""An explicit health_check_interval / socket_keepalive from config must win
|
|
over the built-in reconnect defaults."""
|
|
get_redis_async_client(
|
|
startup_nodes=[{"host": "cluster-node", "port": 6379}],
|
|
health_check_interval=7,
|
|
socket_keepalive=False,
|
|
)
|
|
|
|
call_kwargs = mock_cluster_cls.call_args[1]
|
|
assert call_kwargs["health_check_interval"] == 7
|
|
assert call_kwargs["socket_keepalive"] is False
|
|
|
|
|
|
def test_get_redis_async_client_with_connection_pool():
|
|
"""Test that connection_pool parameter is properly passed to Redis client"""
|
|
# Create a mock connection pool
|
|
mock_pool = MagicMock(spec=async_redis.BlockingConnectionPool)
|
|
|
|
# Mock the Redis client creation
|
|
with (
|
|
patch("litellm._redis.async_redis.Redis") as mock_redis,
|
|
patch("litellm._redis._get_redis_client_logic") as mock_logic,
|
|
):
|
|
|
|
# Configure mock to return basic redis kwargs
|
|
mock_logic.return_value = {"host": "localhost", "port": 6379, "db": 0}
|
|
|
|
# Call get_redis_async_client with connection_pool
|
|
get_redis_async_client(connection_pool=mock_pool)
|
|
|
|
# Verify Redis was called with connection_pool in kwargs
|
|
call_kwargs = mock_redis.call_args[1]
|
|
assert (
|
|
"connection_pool" in call_kwargs
|
|
), "connection_pool should be passed to Redis client"
|
|
assert (
|
|
call_kwargs["connection_pool"] == mock_pool
|
|
), "connection_pool should match the provided pool"
|
|
|
|
|
|
def test_get_redis_async_client_without_connection_pool():
|
|
"""Test that Redis client works without connection_pool parameter"""
|
|
with (
|
|
patch("litellm._redis.async_redis.Redis") as mock_redis,
|
|
patch("litellm._redis._get_redis_client_logic") as mock_logic,
|
|
):
|
|
|
|
# Configure mock to return basic redis kwargs
|
|
mock_logic.return_value = {"host": "localhost", "port": 6379, "db": 0}
|
|
|
|
# Call get_redis_async_client without connection_pool
|
|
get_redis_async_client()
|
|
|
|
# Verify Redis was called without connection_pool in kwargs
|
|
call_kwargs = mock_redis.call_args[1]
|
|
assert (
|
|
"connection_pool" not in call_kwargs
|
|
), "connection_pool should not be in kwargs when not provided"
|
|
|
|
|
|
def test_gcp_iam_credential_provider_get_credentials():
|
|
"""GCPIAMCredentialProvider.get_credentials() returns a token tuple."""
|
|
service_account = "projects/-/serviceAccounts/test@project.iam.gserviceaccount.com"
|
|
|
|
with patch(
|
|
"litellm._redis_credential_provider._generate_gcp_iam_access_token",
|
|
return_value="tok-1",
|
|
) as mock_gen:
|
|
provider = GCPIAMCredentialProvider(service_account)
|
|
creds = provider.get_credentials()
|
|
|
|
assert creds == ("tok-1",)
|
|
mock_gen.assert_called_once_with(service_account)
|
|
|
|
|
|
def test_gcp_iam_credential_provider_caches_token():
|
|
"""
|
|
Repeated calls to get_credentials() reuse the cached token and only call
|
|
_generate_gcp_iam_access_token once, avoiding redundant blocking I/O.
|
|
"""
|
|
service_account = "projects/-/serviceAccounts/test@project.iam.gserviceaccount.com"
|
|
|
|
with patch(
|
|
"litellm._redis_credential_provider._generate_gcp_iam_access_token",
|
|
return_value="tok-cached",
|
|
) as mock_gen:
|
|
provider = GCPIAMCredentialProvider(service_account)
|
|
results = [provider.get_credentials() for _ in range(5)]
|
|
|
|
assert all(r == ("tok-cached",) for r in results)
|
|
# Token must be fetched exactly once regardless of how many connections are established
|
|
mock_gen.assert_called_once_with(service_account)
|
|
|
|
|
|
def test_gcp_iam_credential_provider_refreshes_on_expiry():
|
|
"""
|
|
get_credentials() fetches a new token after the cached one expires,
|
|
ensuring connections always authenticate with a valid token.
|
|
"""
|
|
import time
|
|
|
|
import litellm._redis_credential_provider as cred_module
|
|
|
|
service_account = "projects/-/serviceAccounts/test@project.iam.gserviceaccount.com"
|
|
|
|
with patch(
|
|
"litellm._redis_credential_provider._generate_gcp_iam_access_token",
|
|
side_effect=["tok-1", "tok-2"],
|
|
) as mock_gen:
|
|
provider = GCPIAMCredentialProvider(service_account)
|
|
|
|
# First call — populates cache
|
|
assert provider.get_credentials() == ("tok-1",)
|
|
|
|
# Artificially expire the cached token
|
|
cred_module._token_cache[service_account] = ("tok-1", time.monotonic() - 1)
|
|
|
|
# Second call — cache miss, must refresh
|
|
assert provider.get_credentials() == ("tok-2",)
|
|
|
|
assert mock_gen.call_count == 2
|
|
|
|
|
|
def test_gcp_iam_credential_provider_cache_shared_across_instances():
|
|
"""
|
|
Multiple GCPIAMCredentialProvider instances for the same service account
|
|
share one cached token so concurrent Redis connections don't each trigger
|
|
a blocking IAM round-trip.
|
|
"""
|
|
service_account = (
|
|
"projects/-/serviceAccounts/shared@project.iam.gserviceaccount.com"
|
|
)
|
|
|
|
with patch(
|
|
"litellm._redis_credential_provider._generate_gcp_iam_access_token",
|
|
return_value="tok-shared",
|
|
) as mock_gen:
|
|
p1 = GCPIAMCredentialProvider(service_account)
|
|
p2 = GCPIAMCredentialProvider(service_account)
|
|
|
|
assert p1.get_credentials() == ("tok-shared",)
|
|
assert p2.get_credentials() == ("tok-shared",)
|
|
|
|
# Only one network call despite two provider instances
|
|
mock_gen.assert_called_once()
|
|
|
|
|
|
def test_get_redis_async_client_gcp_cluster_uses_credential_provider():
|
|
"""
|
|
When startup_nodes + gcp_service_account are provided, the async cluster client
|
|
must be constructed with a GCPIAMCredentialProvider — not a static password.
|
|
This ensures that the 1-hour IAM token expiry does not cause auth failures.
|
|
"""
|
|
startup_nodes = [{"host": "redis-node-1", "port": 6379}]
|
|
|
|
mock_connect_func = MagicMock()
|
|
mock_connect_func._gcp_service_account = (
|
|
"projects/-/serviceAccounts/sa@project.iam.gserviceaccount.com"
|
|
)
|
|
|
|
redis_kwargs = {
|
|
"startup_nodes": startup_nodes,
|
|
"redis_connect_func": mock_connect_func,
|
|
}
|
|
|
|
with (
|
|
patch("litellm._redis.async_redis.RedisCluster") as mock_cluster,
|
|
patch("litellm._redis._get_redis_client_logic", return_value=redis_kwargs),
|
|
):
|
|
get_redis_async_client()
|
|
|
|
assert mock_cluster.called
|
|
cluster_call_kwargs = mock_cluster.call_args[1]
|
|
|
|
# Must use credential_provider, not a static password
|
|
assert (
|
|
"credential_provider" in cluster_call_kwargs
|
|
), "async GCP cluster must use credential_provider for per-connection token refresh"
|
|
assert isinstance(
|
|
cluster_call_kwargs["credential_provider"], GCPIAMCredentialProvider
|
|
)
|
|
assert (
|
|
"password" not in cluster_call_kwargs
|
|
), "async GCP cluster must not use a static password (expires after 1h)"
|
|
|
|
|
|
@patch("litellm._redis.init_redis_cluster")
|
|
def test_sync_client_prefers_cluster_over_url(mock_init_cluster, monkeypatch):
|
|
"""
|
|
Test get_redis_client returns RedisCluster when startup_nodes is present even if
|
|
REDIS_URL is also set.
|
|
"""
|
|
monkeypatch.setenv("REDIS_URL", "redis://fallback-host:6379")
|
|
mock_init_cluster.return_value = MagicMock(spec=redis.RedisCluster)
|
|
|
|
startup_nodes = [{"host": "cluster-node.example.com", "port": 6379}]
|
|
get_redis_client(startup_nodes=startup_nodes)
|
|
|
|
mock_init_cluster.assert_called_once()
|
|
call_kwargs = mock_init_cluster.call_args[0][0]
|
|
assert (
|
|
"startup_nodes" in call_kwargs
|
|
), "startup_nodes must be forwarded to init_redis_cluster"
|
|
|
|
|
|
@patch("litellm._redis.async_redis.RedisCluster")
|
|
def test_async_client_prefers_cluster_over_url(mock_cluster_cls, monkeypatch):
|
|
"""
|
|
Test (1) get_redis_async_client returns async RedisCluster when startup_nodes is present
|
|
even if REDIS_URL is also set and (2) startup_nodes is forwarded to RedisCluster.
|
|
"""
|
|
monkeypatch.setenv("REDIS_URL", "redis://fallback-host:6379")
|
|
|
|
startup_nodes = [{"host": "cluster-node.example.com", "port": 6379}]
|
|
get_redis_async_client(startup_nodes=startup_nodes)
|
|
|
|
mock_cluster_cls.assert_called_once()
|
|
call_kwargs = mock_cluster_cls.call_args[1]
|
|
assert (
|
|
"startup_nodes" in call_kwargs
|
|
), "startup_nodes must be forwarded to async RedisCluster"
|
|
assert (
|
|
len(call_kwargs["startup_nodes"]) == 1
|
|
), "should forward exactly 1 cluster node"
|
|
|
|
|
|
@patch("litellm._redis.async_redis.RedisCluster")
|
|
def test_async_client_prefers_cluster_over_url_via_env_var(
|
|
mock_cluster_cls, monkeypatch
|
|
):
|
|
"""
|
|
Test get_redis_async_client returns async RedisCluster when REDIS_CLUSTER_NODES is set
|
|
even if REDIS_URL is also set.
|
|
"""
|
|
monkeypatch.setenv("REDIS_URL", "redis://fallback-host:6379")
|
|
monkeypatch.setenv(
|
|
"REDIS_CLUSTER_NODES",
|
|
json.dumps([{"host": "cluster-node.example.com", "port": 6379}]),
|
|
)
|
|
|
|
get_redis_async_client()
|
|
|
|
mock_cluster_cls.assert_called_once()
|
|
call_kwargs = mock_cluster_cls.call_args[1]
|
|
assert (
|
|
"startup_nodes" in call_kwargs
|
|
), "startup_nodes must be forwarded to async RedisCluster"
|
|
|
|
|
|
@patch("litellm._redis.init_redis_cluster")
|
|
def test_sync_client_prefers_cluster_over_url_via_env_var(
|
|
mock_init_cluster, monkeypatch
|
|
):
|
|
"""
|
|
Test get_redis_client returns RedisCluster when REDIS_CLUSTER_NODES is set even if
|
|
REDIS_URL is also set.
|
|
"""
|
|
monkeypatch.setenv("REDIS_URL", "redis://fallback-host:6379")
|
|
monkeypatch.setenv(
|
|
"REDIS_CLUSTER_NODES",
|
|
json.dumps([{"host": "cluster-node.example.com", "port": 6379}]),
|
|
)
|
|
mock_init_cluster.return_value = MagicMock(spec=redis.RedisCluster)
|
|
|
|
get_redis_client()
|
|
|
|
mock_init_cluster.assert_called_once()
|
|
call_kwargs = mock_init_cluster.call_args[0][0]
|
|
assert (
|
|
"startup_nodes" in call_kwargs
|
|
), "startup_nodes must be forwarded to init_redis_cluster"
|
|
assert len(call_kwargs["startup_nodes"]) == 1
|
|
|
|
|
|
@patch("litellm._redis.redis.Sentinel")
|
|
def test_sync_sentinel_uses_sentinel_password_and_master_password(mock_sentinel_cls):
|
|
"""Sentinel auth must be passed to the sentinel, not the Redis master client."""
|
|
mock_sentinel = MagicMock()
|
|
mock_sentinel_cls.return_value = mock_sentinel
|
|
|
|
get_redis_client(
|
|
sentinel_nodes=[("sentinel-1", 26379)],
|
|
sentinel_password="sentinel-secret",
|
|
service_name="mymaster",
|
|
password="redis-secret",
|
|
username="redis-user",
|
|
ssl=True,
|
|
ssl_cert_reqs="required",
|
|
ssl_check_hostname=True,
|
|
ssl_ca_certs="/tmp/test-ca.pem",
|
|
max_connections=17,
|
|
socket_timeout=5,
|
|
)
|
|
|
|
mock_sentinel_cls.assert_called_once()
|
|
sentinel_call_kwargs = mock_sentinel_cls.call_args[1]
|
|
assert "password" not in sentinel_call_kwargs
|
|
assert "username" not in sentinel_call_kwargs
|
|
assert "ssl" not in sentinel_call_kwargs
|
|
assert "ssl_cert_reqs" not in sentinel_call_kwargs
|
|
assert "ssl_check_hostname" not in sentinel_call_kwargs
|
|
assert "ssl_ca_certs" not in sentinel_call_kwargs
|
|
assert "max_connections" not in sentinel_call_kwargs
|
|
assert "socket_timeout" not in sentinel_call_kwargs
|
|
assert sentinel_call_kwargs["sentinel_kwargs"] == {
|
|
"password": "sentinel-secret",
|
|
"username": "redis-user",
|
|
"ssl": True,
|
|
"ssl_cert_reqs": "required",
|
|
"ssl_check_hostname": True,
|
|
"ssl_ca_certs": "/tmp/test-ca.pem",
|
|
"max_connections": 17,
|
|
"socket_timeout": 5,
|
|
}
|
|
assert "service_name" not in sentinel_call_kwargs["sentinel_kwargs"]
|
|
assert "sentinel_nodes" not in sentinel_call_kwargs["sentinel_kwargs"]
|
|
assert "sentinel_password" not in sentinel_call_kwargs["sentinel_kwargs"]
|
|
mock_sentinel.master_for.assert_called_once_with(
|
|
"mymaster",
|
|
password="redis-secret",
|
|
username="redis-user",
|
|
ssl=True,
|
|
ssl_cert_reqs="required",
|
|
ssl_check_hostname=True,
|
|
ssl_ca_certs="/tmp/test-ca.pem",
|
|
max_connections=17,
|
|
socket_timeout=5,
|
|
)
|
|
|
|
|
|
@patch("litellm._redis.async_redis.Sentinel")
|
|
def test_async_sentinel_uses_sentinel_password_and_master_password(
|
|
mock_sentinel_cls,
|
|
):
|
|
"""Async sentinel auth must mirror the sync sentinel password routing."""
|
|
mock_sentinel = MagicMock()
|
|
mock_sentinel_cls.return_value = mock_sentinel
|
|
|
|
get_redis_async_client(
|
|
sentinel_nodes=[("sentinel-1", 26379)],
|
|
sentinel_password="sentinel-secret",
|
|
service_name="mymaster",
|
|
password="redis-secret",
|
|
username="redis-user",
|
|
ssl=True,
|
|
ssl_cert_reqs="required",
|
|
ssl_check_hostname=True,
|
|
ssl_ca_certs="/tmp/test-ca.pem",
|
|
max_connections=17,
|
|
socket_timeout=5,
|
|
)
|
|
|
|
mock_sentinel_cls.assert_called_once()
|
|
sentinel_call_kwargs = mock_sentinel_cls.call_args[1]
|
|
assert "password" not in sentinel_call_kwargs
|
|
assert "username" not in sentinel_call_kwargs
|
|
assert "ssl" not in sentinel_call_kwargs
|
|
assert "ssl_cert_reqs" not in sentinel_call_kwargs
|
|
assert "ssl_check_hostname" not in sentinel_call_kwargs
|
|
assert "ssl_ca_certs" not in sentinel_call_kwargs
|
|
assert "max_connections" not in sentinel_call_kwargs
|
|
assert "socket_timeout" not in sentinel_call_kwargs
|
|
assert sentinel_call_kwargs["sentinel_kwargs"] == {
|
|
"password": "sentinel-secret",
|
|
"username": "redis-user",
|
|
"ssl": True,
|
|
"ssl_cert_reqs": "required",
|
|
"ssl_check_hostname": True,
|
|
"ssl_ca_certs": "/tmp/test-ca.pem",
|
|
"max_connections": 17,
|
|
"socket_timeout": 5,
|
|
}
|
|
assert "service_name" not in sentinel_call_kwargs["sentinel_kwargs"]
|
|
assert "sentinel_nodes" not in sentinel_call_kwargs["sentinel_kwargs"]
|
|
assert "sentinel_password" not in sentinel_call_kwargs["sentinel_kwargs"]
|
|
mock_sentinel.master_for.assert_called_once_with(
|
|
"mymaster",
|
|
password="redis-secret",
|
|
username="redis-user",
|
|
ssl=True,
|
|
ssl_cert_reqs="required",
|
|
ssl_check_hostname=True,
|
|
ssl_ca_certs="/tmp/test-ca.pem",
|
|
max_connections=17,
|
|
socket_timeout=5,
|
|
)
|
|
|
|
|
|
@patch("litellm._redis.init_redis_cluster")
|
|
def test_sync_client_preserves_password_for_cluster_when_url_also_set(
|
|
mock_init_cluster, monkeypatch
|
|
):
|
|
"""
|
|
Test _get_redis_client_logic does not strip password from redis_kwargs when
|
|
startup_nodes is present even if REDIS_URL is also set.
|
|
"""
|
|
monkeypatch.setenv("REDIS_URL", "redis://fallback-host:6379")
|
|
monkeypatch.setenv("REDIS_PASSWORD", "secret")
|
|
mock_init_cluster.return_value = MagicMock(spec=redis.RedisCluster)
|
|
|
|
startup_nodes = [{"host": "cluster-node.example.com", "port": 6379}]
|
|
get_redis_client(startup_nodes=startup_nodes)
|
|
|
|
mock_init_cluster.assert_called_once()
|
|
call_kwargs = mock_init_cluster.call_args[0][0]
|
|
assert (
|
|
"password" in call_kwargs
|
|
), "password must not be stripped when routing to cluster"
|
|
assert call_kwargs["password"] == "secret"
|
|
|
|
|
|
def test_connection_pool_returns_none_for_cluster(monkeypatch):
|
|
"""Test get_redis_connection_pool returns None when startup_nodes is present."""
|
|
monkeypatch.setenv("REDIS_URL", "redis://fallback-host:6379")
|
|
startup_nodes = [{"host": "cluster-node.example.com", "port": 6379}]
|
|
result = get_redis_connection_pool(startup_nodes=startup_nodes)
|
|
assert result is None, "connection pool must be None for cluster mode"
|
|
|
|
|
|
@patch("litellm._redis.redis.Redis.from_url")
|
|
def test_sync_client_url_used_when_no_cluster(mock_from_url, monkeypatch):
|
|
"""
|
|
Test get_redis_client default to using URL path when no startup_nodes are provided.
|
|
"""
|
|
monkeypatch.setenv("REDIS_URL", "redis://plain-host:6379")
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
get_redis_client()
|
|
|
|
mock_from_url.assert_called_once()
|
|
|
|
|
|
@patch("litellm._redis.redis.Redis.from_url")
|
|
def test_explicit_host_outranks_environment_redis_url(mock_from_url, monkeypatch):
|
|
"""
|
|
An explicitly configured host must win over REDIS_URL in the environment.
|
|
|
|
Otherwise the url branch strips the caller's host/port and the client
|
|
silently connects to whatever REDIS_URL names, so an explicit config block
|
|
(or a connection test typed into the admin UI) targets the wrong server.
|
|
"""
|
|
monkeypatch.setenv("REDIS_URL", "redis://env-host:6379")
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
client = get_redis_client(host="explicit-host", port=6380)
|
|
|
|
mock_from_url.assert_not_called()
|
|
assert client.connection_pool.connection_kwargs["host"] == "explicit-host"
|
|
assert client.connection_pool.connection_kwargs["port"] == 6380
|
|
|
|
|
|
@patch("litellm._redis.redis.Redis.from_url")
|
|
def test_explicit_url_still_wins_over_environment_host(mock_from_url, monkeypatch):
|
|
"""An explicit url argument keeps taking the from_url path."""
|
|
monkeypatch.setenv("REDIS_HOST", "env-host")
|
|
monkeypatch.setenv("REDIS_PORT", "6379")
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
get_redis_client(url="redis://explicit-host:6380")
|
|
|
|
mock_from_url.assert_called_once()
|
|
assert mock_from_url.call_args.kwargs["url"] == "redis://explicit-host:6380"
|
|
|
|
|
|
@patch("litellm._redis.redis.Redis.from_url")
|
|
def test_environment_redis_url_used_when_caller_names_no_target(mock_from_url, monkeypatch):
|
|
"""With no caller-supplied connection target, REDIS_URL still drives the client."""
|
|
monkeypatch.setenv("REDIS_URL", "redis://env-host:6379")
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
get_redis_client()
|
|
|
|
mock_from_url.assert_called_once()
|
|
|
|
|
|
@pytest.mark.parametrize("falsy_ssl", [False, None, 0, ""])
|
|
def test_connection_pool_falsy_ssl_uses_plain_connection(falsy_ssl, monkeypatch):
|
|
"""
|
|
ssl=False must produce a plain (non-TLS) connection pool.
|
|
|
|
The admin UI's coordination Redis form always sends ssl explicitly, so a
|
|
presence check here turns ssl=False into an SSLConnection; the TLS
|
|
handshake against a plaintext Redis then hangs until the ping timeout and
|
|
every connection test from the UI fails.
|
|
"""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_SSL", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
with patch("litellm._redis.async_redis.BlockingConnectionPool") as mock_pool:
|
|
get_redis_connection_pool(host="plain-redis.example.com", port=6379, ssl=falsy_ssl)
|
|
|
|
call_kwargs = mock_pool.call_args.kwargs
|
|
assert call_kwargs.get("connection_class") is not async_redis.SSLConnection, (
|
|
f"ssl={falsy_ssl!r} must not select SSLConnection"
|
|
)
|
|
assert "ssl" not in call_kwargs, "ssl must never leak into BlockingConnectionPool kwargs"
|
|
|
|
|
|
def test_connection_pool_ssl_true_uses_ssl_connection(monkeypatch):
|
|
"""ssl=True must still opt in to a TLS connection pool."""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_SSL", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
with patch("litellm._redis.async_redis.BlockingConnectionPool") as mock_pool:
|
|
get_redis_connection_pool(host="tls-redis.example.com", port=6380, ssl=True)
|
|
|
|
call_kwargs = mock_pool.call_args.kwargs
|
|
assert call_kwargs.get("connection_class") is async_redis.SSLConnection
|
|
assert "ssl" not in call_kwargs, "ssl must be consumed, not forwarded to the pool"
|
|
|
|
|
|
def test_connection_pool_without_ssl_kwarg_uses_plain_connection(monkeypatch):
|
|
"""Omitting ssl entirely must keep the historical plain-connection default."""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_SSL", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
with patch("litellm._redis.async_redis.BlockingConnectionPool") as mock_pool:
|
|
get_redis_connection_pool(host="plain-redis.example.com", port=6379)
|
|
|
|
call_kwargs = mock_pool.call_args.kwargs
|
|
assert call_kwargs.get("connection_class") is not async_redis.SSLConnection
|
|
assert "ssl" not in call_kwargs
|
|
|
|
|
|
def test_connection_pool_env_redis_ssl_false_uses_plain_connection(monkeypatch):
|
|
"""REDIS_SSL=false from the environment must not select SSLConnection."""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
monkeypatch.setenv("REDIS_SSL", "false")
|
|
|
|
pool = get_redis_connection_pool(host="plain-host", port=6379)
|
|
|
|
assert pool is not None
|
|
assert pool.connection_class is async_redis.Connection
|
|
assert "ssl" not in pool.connection_kwargs
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"redis_config",
|
|
[
|
|
pytest.param({"host": "redis-host", "port": 6379}, id="host_port"),
|
|
pytest.param({"url": "redis://redis-host:6379"}, id="url"),
|
|
],
|
|
)
|
|
def test_connection_pool_keeps_socket_timeout(redis_config, monkeypatch):
|
|
"""The async pool must carry socket_timeout however Redis was configured.
|
|
|
|
The url branch used to rebuild pool kwargs from scratch as {timeout, url,
|
|
max_connections}, dropping socket_timeout. redis-py then leaves both
|
|
socket_timeout and socket_connect_timeout (which falls back to it) unset, so a
|
|
Redis host that drops packets rather than refusing them blocks every caller
|
|
indefinitely instead of failing fast.
|
|
"""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
pool = get_redis_connection_pool(socket_timeout=5.0, **redis_config)
|
|
|
|
assert pool is not None
|
|
assert pool.connection_kwargs.get("socket_timeout") == 5.0
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"redis_config",
|
|
[
|
|
pytest.param({"host": "redis-host", "port": 6379}, id="host_port"),
|
|
pytest.param({"url": "redis://redis-host:6379"}, id="url"),
|
|
],
|
|
)
|
|
def test_sync_client_keeps_socket_timeout(redis_config, monkeypatch):
|
|
"""The sync client is built during RedisCache.__init__ and blocks the caller.
|
|
|
|
Without socket_timeout it stalls for the OS TCP timeout against an unreachable
|
|
host, so merely constructing the cache stops the process.
|
|
"""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
client = get_redis_client(socket_timeout=5.0, **redis_config)
|
|
|
|
assert client.connection_pool.connection_kwargs.get("socket_timeout") == 5.0
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"redis_config",
|
|
[
|
|
pytest.param({"host": "redis-host", "port": 6379}, id="host_port"),
|
|
pytest.param({"url": "redis://redis-host:6379"}, id="url"),
|
|
],
|
|
)
|
|
def test_async_client_keeps_socket_timeout(redis_config, monkeypatch):
|
|
"""Same invariant for the async client built without an injected pool."""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
client = get_redis_async_client(socket_timeout=5.0, **redis_config)
|
|
|
|
assert client.connection_pool.connection_kwargs.get("socket_timeout") == 5.0
|
|
|
|
|
|
def test_url_config_does_not_forward_ssl_kwarg(monkeypatch):
|
|
"""ssl stays consumed rather than forwarded on the url path.
|
|
|
|
TLS is selected by the rediss:// scheme there; handing ssl=True to a redis://
|
|
url yields a plain Connection that rejects the kwarg when it first connects.
|
|
"""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
client = get_redis_client(url="redis://redis-host:6379", ssl=True)
|
|
|
|
assert "ssl" not in client.connection_pool.connection_kwargs
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"client_only_kwarg",
|
|
[
|
|
pytest.param({"single_connection_client": True}, id="single_connection_client"),
|
|
pytest.param({"auto_close_connection_pool": True}, id="auto_close_connection_pool"),
|
|
pytest.param({"ssl_ca_certs": "/tmp/ca.pem"}, id="ssl_ca_certs"),
|
|
pytest.param({"ssl": True}, id="ssl"),
|
|
],
|
|
)
|
|
def test_url_config_drops_kwargs_the_connection_cannot_accept(client_only_kwarg, monkeypatch):
|
|
"""Only kwargs the connection accepts may be forwarded on the url path.
|
|
|
|
from_url hands its kwargs down to the connection class, so client-level settings and
|
|
the SSLConnection-only ssl_* family raise TypeError the first time a connection is
|
|
created. TLS on a url config comes from the rediss:// scheme instead.
|
|
"""
|
|
monkeypatch.delenv("REDIS_URL", raising=False)
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.delenv("REDIS_CLUSTER_NODES", raising=False)
|
|
|
|
pool = get_redis_connection_pool(url="redis://redis-host:6379", socket_timeout=5.0, **client_only_kwarg)
|
|
|
|
assert pool is not None
|
|
pool.make_connection()
|
|
assert pool.connection_kwargs.get("socket_timeout") == 5.0
|
|
|
|
|
|
def test_redis_uses_the_hiredis_response_parser():
|
|
"""The C parser must be the one redis-py actually picks.
|
|
|
|
hiredis is declared in the `proxy` extra purely for speed; nothing imports it, so
|
|
dropping it from pyproject.toml would silently fall back to the pure-Python parser
|
|
with no other symptom. redis-py selects it at import time, so asserting on the
|
|
selection is what catches that.
|
|
"""
|
|
from redis._parsers import _HiredisParser
|
|
from redis.connection import HIREDIS_AVAILABLE, DefaultParser
|
|
|
|
assert HIREDIS_AVAILABLE, "hiredis is not installed; redis-py fell back to the pure-Python parser"
|
|
assert DefaultParser is _HiredisParser, f"redis-py selected {DefaultParser.__name__}, expected _HiredisParser"
|
|
|
|
client = get_redis_client(host="redis-host", port=6379)
|
|
connection = client.connection_pool.make_connection()
|
|
assert isinstance(connection._parser, _HiredisParser)
|
|
|
|
|
|
def test_init_arg_names_sees_through_decorated_inits():
|
|
"""redis-py >= 7.4 wraps AbstractConnection.__init__ with @deprecated_args, whose
|
|
wrapper is declared (self, *args, **kwargs). Introspecting the wrapper directly
|
|
yields no real parameters, which silently emptied the from_url allowlist and
|
|
dropped socket_timeout from url-configured connections. The MRO walk must follow
|
|
__wrapped__ to the true signature.
|
|
"""
|
|
import functools
|
|
|
|
from litellm._redis import _init_arg_names
|
|
|
|
def deprecating(fn):
|
|
@functools.wraps(fn)
|
|
def wrapper(self, *args, **kwargs):
|
|
return fn(self, *args, **kwargs)
|
|
|
|
return wrapper
|
|
|
|
class Base:
|
|
@deprecating
|
|
def __init__(self, socket_timeout=None, socket_connect_timeout=None):
|
|
pass
|
|
|
|
class Concrete(Base):
|
|
def __init__(self, host=None, **kwargs):
|
|
super().__init__(**kwargs)
|
|
|
|
names = _init_arg_names(Concrete)
|
|
assert "socket_timeout" in names
|
|
assert "socket_connect_timeout" in names
|
|
assert "host" in names
|
|
|
|
|
|
def test_url_allowlist_always_carries_socket_timeouts():
|
|
"""The load-bearing invariant behind test_url_config_* against the INSTALLED
|
|
redis-py, whatever its version: if a redis-py release changes how its __init__
|
|
signatures are declared (7.4 did, via @deprecated_args), this is the first
|
|
assertion that goes red.
|
|
"""
|
|
from litellm._redis import _get_redis_url_kwargs
|
|
|
|
allowed = _get_redis_url_kwargs()
|
|
assert "socket_timeout" in allowed
|
|
assert "socket_connect_timeout" in allowed
|
|
|
|
|
|
AZURE_AD_CONNECT_FUNC = {"_azure_credential": object()}
|
|
GCP_IAM_CONNECT_FUNC = {"_gcp_service_account": "projects/-/serviceAccounts/sa@project.iam.gserviceaccount.com"}
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"markers, provider_cls",
|
|
[
|
|
(AZURE_AD_CONNECT_FUNC, AzureADCredentialProvider),
|
|
(GCP_IAM_CONNECT_FUNC, GCPIAMCredentialProvider),
|
|
],
|
|
ids=["azure_ad", "gcp_iam"],
|
|
)
|
|
def test_async_url_client_authenticates_through_credential_provider(markers, provider_cls):
|
|
"""A REDIS_URL config with Azure AD or GCP IAM must still reach the server with a credential.
|
|
|
|
The url branch forwards redis_connect_func straight to the async connection, which runs
|
|
its AUTH exchange with the blocking client API and dies, so the branch has to hand the
|
|
connection a CredentialProvider instead.
|
|
"""
|
|
redis_kwargs = {
|
|
"url": "rediss://redis-host:6380",
|
|
"redis_connect_func": SimpleNamespace(**markers),
|
|
}
|
|
|
|
with patch("litellm._redis._get_redis_client_logic", return_value=redis_kwargs):
|
|
client = get_redis_async_client()
|
|
|
|
connection_kwargs = client.connection_pool.connection_kwargs
|
|
assert isinstance(connection_kwargs.get("credential_provider"), provider_cls)
|
|
assert "redis_connect_func" not in connection_kwargs
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"markers, provider_cls",
|
|
[
|
|
(AZURE_AD_CONNECT_FUNC, AzureADCredentialProvider),
|
|
(GCP_IAM_CONNECT_FUNC, GCPIAMCredentialProvider),
|
|
],
|
|
ids=["azure_ad", "gcp_iam"],
|
|
)
|
|
def test_async_url_connection_pool_authenticates_through_credential_provider(markers, provider_cls):
|
|
"""Same for the pool-based path: every connection the pool hands out needs the provider."""
|
|
redis_kwargs = {
|
|
"url": "rediss://redis-host:6380",
|
|
"redis_connect_func": SimpleNamespace(**markers),
|
|
}
|
|
|
|
with patch("litellm._redis._get_redis_client_logic", return_value=redis_kwargs):
|
|
pool = get_redis_connection_pool()
|
|
|
|
assert isinstance(pool.connection_kwargs.get("credential_provider"), provider_cls)
|
|
assert "redis_connect_func" not in pool.connection_kwargs
|
|
|
|
|
|
def test_async_url_client_drops_username_alongside_credential_provider():
|
|
"""redis-py refuses a connection given both a username and a credential_provider, and
|
|
AzureADCredentialProvider already carries REDIS_USERNAME, so the username must be dropped.
|
|
"""
|
|
redis_kwargs = {
|
|
"url": "rediss://redis-host:6380",
|
|
"username": "redis-user",
|
|
"redis_connect_func": SimpleNamespace(**AZURE_AD_CONNECT_FUNC),
|
|
}
|
|
|
|
with patch("litellm._redis._get_redis_client_logic", return_value=redis_kwargs):
|
|
client = get_redis_async_client()
|
|
|
|
pool = client.connection_pool
|
|
assert "username" not in pool.connection_kwargs
|
|
pool.connection_class(**pool.connection_kwargs)
|
|
|
|
|
|
@pytest.mark.parametrize("build_pool", [False, True], ids=["client", "pool"])
|
|
def test_async_url_keeps_a_coroutine_connect_func(build_pool):
|
|
"""redis-py awaits a coroutine redis_connect_func on an async connection, so one we cannot
|
|
turn into a credential provider has to be left where it is rather than dropped.
|
|
"""
|
|
|
|
async def connect(connection):
|
|
return None
|
|
|
|
redis_kwargs = {
|
|
"url": "rediss://redis-host:6380",
|
|
"redis_connect_func": connect,
|
|
}
|
|
|
|
with patch("litellm._redis._get_redis_client_logic", return_value=redis_kwargs):
|
|
pool = get_redis_connection_pool() if build_pool else get_redis_async_client().connection_pool
|
|
|
|
assert pool.connection_kwargs["redis_connect_func"] is connect
|
|
assert "credential_provider" not in pool.connection_kwargs
|
|
|
|
|
|
def test_async_cluster_drops_a_connect_func_it_cannot_pass_on():
|
|
"""redis-py's async RedisCluster has no redis_connect_func parameter, so a connect func that
|
|
is not translated into a credential provider has to be dropped rather than forwarded.
|
|
"""
|
|
|
|
async def connect(connection):
|
|
return None
|
|
|
|
redis_kwargs = {
|
|
"startup_nodes": [{"host": "cluster-node", "port": 6379}],
|
|
"redis_connect_func": connect,
|
|
}
|
|
|
|
with patch("litellm._redis._get_redis_client_logic", return_value=redis_kwargs):
|
|
client = get_redis_async_client()
|
|
|
|
assert isinstance(client, async_redis.RedisCluster)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"markers, provider_cls",
|
|
[
|
|
(AZURE_AD_CONNECT_FUNC, AzureADCredentialProvider),
|
|
(GCP_IAM_CONNECT_FUNC, GCPIAMCredentialProvider),
|
|
],
|
|
ids=["azure_ad", "gcp_iam"],
|
|
)
|
|
@pytest.mark.parametrize(
|
|
"sentinel_password",
|
|
[None, "sentinel-secret"],
|
|
ids=["unauthenticated_monitors", "password_protected_monitors"],
|
|
)
|
|
def test_async_sentinel_keeps_the_credential_provider_off_the_monitors(markers, provider_cls, sentinel_password):
|
|
"""The Sentinel monitors are separate servers with their own password, so the data node's token
|
|
never belongs on them: redis-py refuses it next to a Sentinel password, and sends it to an
|
|
unauthenticated monitor as an AUTH the monitor rejects.
|
|
"""
|
|
redis_kwargs = {
|
|
"sentinel_nodes": [("sentinel-1", 26379)],
|
|
"sentinel_password": sentinel_password,
|
|
"service_name": "mymaster",
|
|
"redis_connect_func": SimpleNamespace(**markers),
|
|
}
|
|
|
|
with patch("litellm._redis.async_redis.Sentinel") as mock_sentinel_cls:
|
|
with patch("litellm._redis._get_redis_client_logic", return_value=redis_kwargs):
|
|
get_redis_async_client()
|
|
|
|
sentinel_kwargs = mock_sentinel_cls.call_args[1]["sentinel_kwargs"]
|
|
assert sentinel_kwargs["password"] == sentinel_password
|
|
assert "credential_provider" not in sentinel_kwargs
|
|
|
|
monitor_connection = async_redis.Connection(host="sentinel-1", port=26379, **sentinel_kwargs)
|
|
assert monitor_connection.credential_provider is None
|
|
assert bool(monitor_connection.username or monitor_connection.password) is bool(sentinel_password)
|
|
|
|
master_kwargs = mock_sentinel_cls.return_value.master_for.call_args[1]
|
|
assert isinstance(master_kwargs["credential_provider"], provider_cls)
|
|
assert "password" not in master_kwargs
|