mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-28 01:32:17 +00:00
* ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event * test: move tests/test_litellm root and small trees into tests/unit Pure renames, no content changes. Follow-up commits in this PR fix references, merge the three files that already existed in tests/unit, keep live-provider tests in tests/test_litellm and wire CI. * test: carry tests/test_litellm conftest isolation into tests/unit Callback lists, routing fallbacks, cached HTTP clients, logger state, AWS, proxy-URL and keychain env, and session-end client cleanup now reset for unit tests too. The environment isolation owns its MonkeyPatch so a test's own monkeypatch is undone before the model-cost teardown runs. * test: merge, split and prune the moved root and small-tree tests Merge batches/test_batch_utils.py and the chat_completions and messages dispatch tests into the files that already existed in tests/unit. Keep the live Gemini interactions tests, the async image-fetch format test and the OpenAI embedding scorer test in tests/test_litellm since they need real network or keys. Put test_router.py under tests/unit/test_router so the existing package no longer shadows it. Delete eight tests the audit found superseded by stronger ones kept in this move. * ci: run the moved root and small-tree tests under their legacy flags Add the misc and responses-caching-types flags to unit_selection.sh and CircleCI, extend enterprise-routing and mcp-integration, and point the legacy GHA shards, Makefile, redis-compat workflow, merge smoke manifest and change classifier at the new paths. * test: make the new tests/unit directories packages tests/unit/test_package_layout.py requires every directory to carry an __init__.py, and without one the moved and retained test_litellm_responses_bridge.py modules collide on import. * test: scope the unit socket block to tests/unit in shared sessions The GHA shards collect the legacy test-path and the unit selection in one pytest session. The unit conftest's loopback-only block leaked into legacy modules that reach the network at import. The legacy conftest now lifts the restriction at collect and setup time, and the unit conftest re-applies it when collecting its own modules. * test: move tests/test_litellm/llms into tests/unit/llms Rename-only. Moves the provider tests and the fine-tuning fixtures they load, mirroring the old paths. Follow-up commits merge, split and wire them. * test: merge, split and prune the moved llms tests Merges the Databricks chat transformation tests into the existing unit file, keeps the tests that need real keys or the network in tests/test_litellm, deletes the audited tests a stronger unit test already covers, and points imports at tests.unit.llms. * ci: run the moved llms tests under their legacy flags The Vertex AI and All Other Providers shards keep their legacy test-path for the retained files and add the llm-vertex-ai and llm-other-providers unit selections. CircleCI gets matching unit jobs. * test: make the tests/unit/llms directories packages Adds __init__.py to the moved dirs and drops the legacy ones whose directories no longer hold tests. * test: drop script runners and path hacks the llms split left dangling The __main__ runners in the split openai_like files and the Databricks e2e runner called tests that now live in the other half of the split or were deleted. The retained legacy halves also no longer need sys.path edits. * test: give the shard-script tests their own GITHUB_OUTPUT They only passed where the runner set it. The CircleCI unit job's env allowlist drops it, so the script's redirect failed there. * test: point the router and module-deletion checks at tests/unit router_code_coverage and code_qa_check_tests only searched tests/test_litellm, so the moved router tests no longer counted. The two silent-experiment tests the audit deleted were the only direct callers of those methods; they are replaced with tests that assert the forwarded shadow request and the recursion guard. * test: move tests/test_litellm integrations and secret_managers into tests/unit Rename-only. Mirrors the old paths, including the directory conftests and the prompt and JSON fixtures. Follow-up commits prune and wire them. * test: prune and repoint the moved integrations tests Deletes the 7 audited tests a stronger test in the same tree already covers, imports the TLS sink helpers from their new conftest path, and restores os.environ after each integrations test. Some presets write OTEL_EXPORTER_OTLP_HEADERS straight into os.environ, and without the legacy tree's test ordering that header leaked into the AgentOps tests. * ci: run the moved integrations tests under their legacy flag The integrations GHA shard and a new CircleCI job run the integrations unit selection. secret_managers joins the misc selection. * docs: point integrations and secret_managers references at tests/unit * test: make the moved integrations directories packages * test: keep the Databricks manual e2e runner and fix the SageMaker Nova run path The Databricks e2e file is a manual script whose main() calls the tests that were pruned, so pruning them broke the documented run. It is back to its main version. The SageMaker Nova docstring now points at the file's real location in tests/local_testing. * test: move tests/test_litellm core utils, routing, responses, caching and rust_bridge into tests/unit Rename-only. Mirrors the old paths, including fixtures, the stubtest config and the native-route wheel script. Two files that collide with existing unit files are merged in a follow-up commit. * test: merge, prune and repoint the moved core, routing, responses, caching and rust_bridge tests Merges the two files that collided with existing unit files, folding the legacy extra case into test_is_chat_completion_cached_dict, and deletes the 9 audited tests a stronger test in the same file already covers. Keeps what needs the network in tests/test_litellm: test_tokenizers pulls a tokenizer from the Hugging Face hub, and the gpt2 and r50k_base tokenizer cases download their BPE files. The unit core_utils conftest points TIKTOKEN_CACHE_DIR at litellm's bundled encodings so the rest never depend on import order to stay offline, and FakeSecretVault moves to a shared module so both trees can build it. * ci: run the moved core, routing, responses, caching and rust_bridge tests under their flags core_utils gets a core-utils flag and CircleCI job, and its GHA shard keeps the legacy path for the retained network tests. router_utils and router_strategy join enterprise-routing, responses joins responses-caching-types (minus responses/mcp, which mcp-integration owns), caching joins caching-local and rust_bridge joins misc. The redis-compat, test-rust, stubtest and merge-smoke paths follow the move. * docs: point the Rust crate references at tests/unit * test: make the moved core, routing and rust_bridge directories packages * test: keep the no-loop DualCache batch_get_cache regression test It runs the sync path outside any event loop, which the inside-loop test cannot, so a change that picks the Redis client by loop state would only show up there. * test: keep the job's UNIT_FLAG out of the shard-script tests * fix(url_utils): block 192.0.0.0/24 on every Python patch release * test: move the new budget limiter tests into tests/unit/router_strategy * test: move the new sentry scrubbing tests into tests/unit/litellm_core_utils * test: move the new zerobus tests into tests/unit/integrations * test: make tests/unit/integrations/zerobus a package * test: load litellm's own tiktoken cache setup once instead of resetting it per test --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
298 lines
11 KiB
Python
298 lines
11 KiB
Python
from importlib import import_module
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from litellm._redis import (
|
|
_coerce_redis_kwargs_types,
|
|
_get_redis_client_logic,
|
|
_get_redis_env_kwarg_mapping,
|
|
get_redis_async_client,
|
|
get_redis_connection_pool,
|
|
)
|
|
|
|
|
|
def test_url_config_uses_passed_pool():
|
|
"""When connection_pool is provided with a URL config, the client
|
|
should use the passed pool — not create a new one via from_url()."""
|
|
mock_pool = MagicMock()
|
|
|
|
with patch("litellm._redis._get_redis_client_logic") as mock_logic:
|
|
mock_logic.return_value = {"url": "redis://localhost:6379/0"}
|
|
|
|
client = get_redis_async_client(connection_pool=mock_pool)
|
|
|
|
assert client.connection_pool is mock_pool
|
|
|
|
|
|
def test_url_config_falls_back_to_from_url_without_pool():
|
|
"""When no connection_pool is provided, URL config should still
|
|
use from_url() as before."""
|
|
with patch("litellm._redis._get_redis_client_logic") as mock_logic:
|
|
mock_logic.return_value = {"url": "redis://localhost:6379/0"}
|
|
|
|
client = get_redis_async_client()
|
|
|
|
# from_url creates its own pool — just verify it's not None
|
|
assert client.connection_pool is not None
|
|
|
|
|
|
def test_max_connections_url_config(monkeypatch):
|
|
"""max_connections should be respected when using URL-based config."""
|
|
monkeypatch.setenv("REDIS_URL", "redis://localhost:6379/0")
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.setenv("REDIS_MAX_CONNECTIONS", "10")
|
|
|
|
pool = get_redis_connection_pool()
|
|
|
|
assert pool.max_connections == 10
|
|
|
|
|
|
def test_max_connections_url_config_string_value(monkeypatch):
|
|
"""max_connections provided as a string (from env var) should be
|
|
cast to int."""
|
|
monkeypatch.setenv("REDIS_URL", "redis://localhost:6379/0")
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.setenv("REDIS_MAX_CONNECTIONS", "25")
|
|
|
|
pool = get_redis_connection_pool()
|
|
|
|
assert pool.max_connections == 25
|
|
|
|
|
|
def test_max_connections_url_config_invalid_value(monkeypatch):
|
|
"""Invalid max_connections from an env var should be silently dropped,
|
|
falling back to the pool default (50 for BlockingConnectionPool)."""
|
|
monkeypatch.setenv("REDIS_URL", "redis://localhost:6379/0")
|
|
monkeypatch.delenv("REDIS_HOST", raising=False)
|
|
monkeypatch.setenv("REDIS_MAX_CONNECTIONS", "not_a_number")
|
|
|
|
pool = get_redis_connection_pool()
|
|
|
|
# BlockingConnectionPool default is 50
|
|
assert pool.max_connections == 50
|
|
|
|
|
|
def test_max_connections_url_config_none_value():
|
|
"""max_connections=None should be silently ignored."""
|
|
with patch("litellm._redis._get_redis_client_logic") as mock_logic:
|
|
mock_logic.return_value = {
|
|
"url": "redis://localhost:6379/0",
|
|
"max_connections": None,
|
|
}
|
|
|
|
pool = get_redis_connection_pool()
|
|
|
|
assert pool.max_connections == 50
|
|
|
|
|
|
def _make_redis_cache():
|
|
"""Create a RedisCache with all external I/O mocked out."""
|
|
mock_sync_client = MagicMock()
|
|
mock_async_pool = AsyncMock()
|
|
patches = [
|
|
patch("litellm._redis.get_redis_client", return_value=mock_sync_client),
|
|
patch("litellm._redis.get_redis_connection_pool", return_value=mock_async_pool),
|
|
patch.object(import_module("litellm.caching.redis_cache").RedisCache, "_setup_health_pings"),
|
|
]
|
|
for p in patches:
|
|
p.start()
|
|
|
|
from litellm.caching.redis_cache import RedisCache
|
|
|
|
cache = RedisCache(host="localhost", port=6379)
|
|
|
|
for p in patches:
|
|
p.stop()
|
|
|
|
return cache, mock_sync_client, mock_async_pool
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_disconnect_closes_sync_client():
|
|
"""disconnect() should close both the async pool and the sync client."""
|
|
cache, mock_sync_client, mock_async_pool = _make_redis_cache()
|
|
await cache.disconnect()
|
|
|
|
mock_async_pool.disconnect.assert_awaited_once_with(inuse_connections=True)
|
|
mock_sync_client.close.assert_called_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_disconnect_idempotent():
|
|
"""Calling disconnect() twice should not raise."""
|
|
cache, mock_sync_client, mock_async_pool = _make_redis_cache()
|
|
mock_sync_client.close.side_effect = [None, RuntimeError("already closed")]
|
|
|
|
await cache.disconnect()
|
|
await cache.disconnect() # should not raise
|
|
|
|
|
|
def test_coerce_redis_kwargs_types_int():
|
|
"""String values for int-typed Redis params are coerced to int."""
|
|
result = _coerce_redis_kwargs_types({"health_check_interval": "30", "port": "6380", "db": "1"})
|
|
assert result["health_check_interval"] == 30
|
|
assert isinstance(result["health_check_interval"], int)
|
|
assert result["port"] == 6380
|
|
assert result["db"] == 1
|
|
|
|
|
|
def test_coerce_redis_kwargs_types_bool():
|
|
"""String values for bool-typed Redis params are coerced to bool."""
|
|
result = _coerce_redis_kwargs_types({"ssl": "true", "decode_responses": "false"})
|
|
assert result["ssl"] is True
|
|
assert result["decode_responses"] is False
|
|
|
|
|
|
def test_coerce_redis_kwargs_types_none_default_numeric():
|
|
"""String values for known None-default numeric params are coerced."""
|
|
result = _coerce_redis_kwargs_types({"max_connections": "20", "socket_timeout": "5.5"})
|
|
assert result["max_connections"] == 20
|
|
assert isinstance(result["max_connections"], int)
|
|
assert result["socket_timeout"] == 5.5
|
|
assert isinstance(result["socket_timeout"], float)
|
|
|
|
|
|
def _redis_signature_pre_8x(
|
|
socket_timeout=None,
|
|
socket_connect_timeout=None,
|
|
max_connections=None,
|
|
health_check_interval=0,
|
|
):
|
|
"""Stand-in for the redis-py <= 7.x Redis signature, where the timeout defaults are None."""
|
|
|
|
|
|
def _redis_signature_8x(
|
|
socket_timeout=5,
|
|
socket_connect_timeout=5,
|
|
max_connections=None,
|
|
health_check_interval=0,
|
|
):
|
|
"""Stand-in for the redis-py 8.x Redis signature, where the timeout defaults became int 5."""
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"client",
|
|
[_redis_signature_pre_8x, _redis_signature_8x],
|
|
ids=["redis-py<=7.x", "redis-py-8.x"],
|
|
)
|
|
def test_coerce_fractional_socket_timeout_survives_signature_default_change(client):
|
|
"""redis-py 8.x changed socket_timeout's default from None to int 5. Deriving the
|
|
target type from the signature default made int("5.5") raise, so the key was dropped
|
|
and REDIS_SOCKET_TIMEOUT=5.5 silently disappeared on 8.x."""
|
|
result = _coerce_redis_kwargs_types(
|
|
{"socket_timeout": "5.5", "socket_connect_timeout": "2.5", "max_connections": "20"},
|
|
client=client,
|
|
)
|
|
|
|
assert result["socket_timeout"] == pytest.approx(5.5)
|
|
assert isinstance(result["socket_timeout"], float)
|
|
assert result["socket_connect_timeout"] == pytest.approx(2.5)
|
|
assert isinstance(result["socket_connect_timeout"], float)
|
|
assert result["max_connections"] == 20
|
|
assert isinstance(result["max_connections"], int)
|
|
|
|
|
|
def test_coerce_invalid_socket_timeout_is_still_dropped():
|
|
"""Garbage must not survive the explicit-type path; Redis falls back to its own default."""
|
|
result = _coerce_redis_kwargs_types({"socket_timeout": "not_a_number"}, client=_redis_signature_8x)
|
|
|
|
assert "socket_timeout" not in result
|
|
|
|
|
|
def test_coerce_redis_kwargs_types_invalid_drops_key():
|
|
"""A string that cannot be coerced to the expected numeric type is dropped."""
|
|
result = _coerce_redis_kwargs_types({"health_check_interval": "not_a_number"})
|
|
assert "health_check_interval" not in result
|
|
|
|
|
|
def test_coerce_redis_kwargs_types_non_string_unchanged():
|
|
"""Non-string values pass through without modification."""
|
|
result = _coerce_redis_kwargs_types({"health_check_interval": 30, "ssl": True})
|
|
assert result["health_check_interval"] == 30
|
|
assert result["ssl"] is True
|
|
|
|
|
|
def test_health_check_interval_from_env_is_int(monkeypatch):
|
|
monkeypatch.setenv("REDIS_HOST", "localhost")
|
|
monkeypatch.setenv("REDIS_HEALTH_CHECK_INTERVAL", "30")
|
|
|
|
pool = get_redis_connection_pool()
|
|
|
|
assert pool is not None
|
|
interval = pool.connection_kwargs.get("health_check_interval")
|
|
assert interval == 30
|
|
assert isinstance(interval, int), f"Expected int, got {type(interval)}: {interval!r}"
|
|
|
|
|
|
def _signature_without_defaults(testkey):
|
|
"""Stand-in for a client whose parameter declares no default at all."""
|
|
|
|
|
|
def _signature_with_float_default(myparam=1.0):
|
|
"""Stand-in for a client whose parameter declares a float default."""
|
|
|
|
|
|
def test_coerce_redis_kwargs_types_empty_default_param_unchanged():
|
|
"""String params whose signature entry has no default (inspect.Parameter.empty) are left as-is."""
|
|
result = _coerce_redis_kwargs_types({"testkey": "some_value"}, client=_signature_without_defaults)
|
|
|
|
assert result["testkey"] == "some_value"
|
|
assert isinstance(result["testkey"], str)
|
|
|
|
|
|
def test_coerce_redis_kwargs_types_float_valid():
|
|
"""String values for params whose signature default is a float are coerced to float."""
|
|
result = _coerce_redis_kwargs_types({"myparam": "3.14"}, client=_signature_with_float_default)
|
|
|
|
assert result["myparam"] == pytest.approx(3.14)
|
|
assert isinstance(result["myparam"], float)
|
|
|
|
|
|
def test_coerce_redis_kwargs_types_float_invalid_drops_key():
|
|
"""An unconvertible string for a float-default param is dropped from the result."""
|
|
result = _coerce_redis_kwargs_types({"myparam": "not_a_float"}, client=_signature_with_float_default)
|
|
|
|
assert "myparam" not in result
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("raw", "expected"),
|
|
[("false", False), ("true", True), ("0", False), ("1", True)],
|
|
)
|
|
def test_coerce_socket_keepalive_string(raw, expected):
|
|
"""socket_keepalive's signature default is None, so it needs an explicit bool
|
|
coercion: a leftover "false" string is truthy and enables keepalive."""
|
|
result = _coerce_redis_kwargs_types({"socket_keepalive": raw})
|
|
|
|
assert result["socket_keepalive"] is expected
|
|
|
|
|
|
def test_get_redis_client_logic_coerces_cluster_only_kwargs(monkeypatch):
|
|
"""Cluster-only kwargs (absent from redis.Redis's signature) must still be
|
|
coerced when routing to a cluster, or Helm-stringified values reach
|
|
RedisCluster as strings."""
|
|
for envvar in (*_get_redis_env_kwarg_mapping(), "REDIS_CLUSTER_NODES", "REDIS_SENTINEL_NODES"):
|
|
monkeypatch.delenv(envvar, raising=False)
|
|
|
|
result = _get_redis_client_logic(
|
|
startup_nodes='[{"host": "localhost", "port": 7000}]',
|
|
cluster_error_retry_attempts="5",
|
|
require_full_coverage="false",
|
|
health_check_interval="30",
|
|
)
|
|
|
|
assert result["cluster_error_retry_attempts"] == 5
|
|
assert isinstance(result["cluster_error_retry_attempts"], int)
|
|
assert result["require_full_coverage"] is False
|
|
assert result["health_check_interval"] == 30
|
|
assert isinstance(result["health_check_interval"], int)
|
|
|
|
|
|
def test_get_redis_client_logic_raises_without_host_or_url(monkeypatch):
|
|
"""_get_redis_client_logic raises ValueError when neither host nor url is provided."""
|
|
for envvar in (*_get_redis_env_kwarg_mapping(), "REDIS_CLUSTER_NODES", "REDIS_SENTINEL_NODES"):
|
|
monkeypatch.delenv(envvar, raising=False)
|
|
|
|
with pytest.raises(ValueError, match="Either 'host' or 'url' must be specified for redis"):
|
|
_get_redis_client_logic()
|