mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-26 01:12:21 +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: 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. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
261 lines
9.5 KiB
Python
261 lines
9.5 KiB
Python
|
|
import pytest
|
|
|
|
|
|
import litellm
|
|
from litellm.containers.utils import (
|
|
ContainerRequestUtils,
|
|
decode_managed_container_id_for_request,
|
|
)
|
|
from litellm.responses.utils import ResponsesAPIRequestUtils
|
|
from litellm.types.router import GenericLiteLLMParams
|
|
from litellm.llms.openai.containers.transformation import OpenAIContainerConfig
|
|
from litellm.types.containers.main import (
|
|
ContainerCreateOptionalRequestParams,
|
|
ContainerListOptionalRequestParams,
|
|
DeleteContainerFileResponse,
|
|
)
|
|
|
|
|
|
class TestContainerRequestUtils:
|
|
"""Test suite for container request utilities."""
|
|
|
|
def test_get_optional_params_container_create_basic(self):
|
|
"""Test that optional parameters are correctly processed for container creation."""
|
|
# Setup
|
|
config = OpenAIContainerConfig()
|
|
optional_params = ContainerCreateOptionalRequestParams(
|
|
{
|
|
"expires_after": {"anchor": "last_active_at", "minutes": 30},
|
|
"file_ids": ["file_123", "file_456"],
|
|
}
|
|
)
|
|
|
|
# Execute
|
|
result = ContainerRequestUtils.get_optional_params_container_create(
|
|
container_provider_config=config,
|
|
container_create_optional_params=optional_params,
|
|
)
|
|
|
|
# Assert
|
|
assert result == optional_params
|
|
assert "expires_after" in result
|
|
assert result["expires_after"]["minutes"] == 30
|
|
assert "file_ids" in result
|
|
assert result["file_ids"] == ["file_123", "file_456"]
|
|
|
|
def test_get_optional_params_container_create_unsupported_param(self):
|
|
"""Test that unsupported parameters are filtered out by ContainerCreateOptionalRequestParams."""
|
|
# Setup
|
|
config = OpenAIContainerConfig()
|
|
|
|
# ContainerCreateOptionalRequestParams will only accept valid parameters
|
|
# so this test verifies the type validation works correctly
|
|
valid_params = ContainerCreateOptionalRequestParams(
|
|
{
|
|
"expires_after": {"anchor": "last_active_at", "minutes": 30},
|
|
"file_ids": ["file_123"],
|
|
}
|
|
)
|
|
|
|
# Execute - should work fine with valid parameters
|
|
result = ContainerRequestUtils.get_optional_params_container_create(
|
|
container_provider_config=config,
|
|
container_create_optional_params=valid_params,
|
|
)
|
|
|
|
assert result["expires_after"]["minutes"] == 30
|
|
assert result["file_ids"] == ["file_123"]
|
|
|
|
def test_get_requested_container_create_optional_param(self):
|
|
"""Test filtering parameters to only include those in ContainerCreateOptionalRequestParams."""
|
|
# Setup
|
|
params = {
|
|
"name": "Test Container", # This should be excluded as it's required
|
|
"expires_after": {"anchor": "last_active_at", "minutes": 30},
|
|
"file_ids": ["file_123"],
|
|
"invalid_param": "value",
|
|
"custom_llm_provider": "openai", # This should be excluded
|
|
}
|
|
|
|
# Execute
|
|
result = ContainerRequestUtils.get_requested_container_create_optional_param(
|
|
params
|
|
)
|
|
|
|
# Assert
|
|
assert "expires_after" in result
|
|
assert "file_ids" in result
|
|
assert "invalid_param" not in result
|
|
assert "name" not in result
|
|
assert "custom_llm_provider" not in result
|
|
assert result["expires_after"]["minutes"] == 30
|
|
assert result["file_ids"] == ["file_123"]
|
|
|
|
def test_get_requested_container_list_optional_param(self):
|
|
"""Test filtering parameters for container list requests."""
|
|
# Setup
|
|
params = {
|
|
"after": "cntr_123",
|
|
"limit": 10,
|
|
"order": "desc",
|
|
"invalid_param": "value",
|
|
"custom_llm_provider": "openai", # This should be excluded
|
|
}
|
|
|
|
# Execute
|
|
result = ContainerRequestUtils.get_requested_container_list_optional_param(
|
|
params
|
|
)
|
|
|
|
# Assert
|
|
assert "after" in result
|
|
assert "limit" in result
|
|
assert "order" in result
|
|
assert "invalid_param" not in result
|
|
assert "custom_llm_provider" not in result
|
|
assert result["after"] == "cntr_123"
|
|
assert result["limit"] == 10
|
|
assert result["order"] == "desc"
|
|
|
|
def test_get_optional_params_container_create_empty_params(self):
|
|
"""Test handling of empty optional parameters."""
|
|
# Setup
|
|
config = OpenAIContainerConfig()
|
|
optional_params = ContainerCreateOptionalRequestParams({})
|
|
|
|
# Execute
|
|
result = ContainerRequestUtils.get_optional_params_container_create(
|
|
container_provider_config=config,
|
|
container_create_optional_params=optional_params,
|
|
)
|
|
|
|
# Assert
|
|
assert result == optional_params
|
|
assert len(result) == 0
|
|
|
|
def test_get_optional_params_container_create_with_none_values(self):
|
|
"""Test handling of None values in optional parameters."""
|
|
# Setup
|
|
config = OpenAIContainerConfig()
|
|
optional_params = ContainerCreateOptionalRequestParams(
|
|
{"expires_after": None, "file_ids": None}
|
|
)
|
|
|
|
# Execute
|
|
result = ContainerRequestUtils.get_optional_params_container_create(
|
|
container_provider_config=config,
|
|
container_create_optional_params=optional_params,
|
|
)
|
|
|
|
# Assert
|
|
assert result == optional_params
|
|
assert "expires_after" in result
|
|
assert "file_ids" in result
|
|
assert result["expires_after"] is None
|
|
assert result["file_ids"] is None
|
|
|
|
def test_get_requested_container_list_optional_param_partial(self):
|
|
"""Test filtering with only some list parameters present."""
|
|
# Setup
|
|
params = {
|
|
"limit": 5,
|
|
"custom_llm_provider": "openai", # Should be excluded
|
|
"timeout": 600, # Should be excluded
|
|
}
|
|
|
|
# Execute
|
|
result = ContainerRequestUtils.get_requested_container_list_optional_param(
|
|
params
|
|
)
|
|
|
|
# Assert
|
|
assert "limit" in result
|
|
assert "custom_llm_provider" not in result
|
|
assert "timeout" not in result
|
|
assert "after" not in result # Not present in input
|
|
assert "order" not in result # Not present in input
|
|
assert result["limit"] == 5
|
|
|
|
def test_container_create_optional_params_type_validation(self):
|
|
"""Test that ContainerCreateOptionalRequestParams validates types correctly."""
|
|
# Test with valid expires_after
|
|
valid_params = ContainerCreateOptionalRequestParams(
|
|
{
|
|
"expires_after": {"anchor": "last_active_at", "minutes": 20},
|
|
"file_ids": ["file_1", "file_2"],
|
|
}
|
|
)
|
|
|
|
assert valid_params["expires_after"]["anchor"] == "last_active_at"
|
|
assert valid_params["expires_after"]["minutes"] == 20
|
|
assert valid_params["file_ids"] == ["file_1", "file_2"]
|
|
|
|
def test_container_list_optional_params_type_validation(self):
|
|
"""Test that ContainerListOptionalRequestParams validates types correctly."""
|
|
# Test with valid parameters
|
|
valid_params = ContainerListOptionalRequestParams(
|
|
{"after": "cntr_123", "limit": 10, "order": "desc"}
|
|
)
|
|
|
|
assert valid_params["after"] == "cntr_123"
|
|
assert valid_params["limit"] == 10
|
|
assert valid_params["order"] == "desc"
|
|
|
|
def test_get_optional_params_with_supported_params_check(self):
|
|
"""Test that only supported parameters are accepted."""
|
|
# Setup
|
|
config = OpenAIContainerConfig()
|
|
|
|
# Get supported params to understand what should be allowed
|
|
supported_params = config.get_supported_openai_params()
|
|
|
|
# Create params with only valid parameters
|
|
test_params = {"expires_after": {"anchor": "last_active_at", "minutes": 15}}
|
|
|
|
optional_params = ContainerCreateOptionalRequestParams(test_params)
|
|
|
|
# Execute - should work fine with supported params
|
|
result = ContainerRequestUtils.get_optional_params_container_create(
|
|
container_provider_config=config,
|
|
container_create_optional_params=optional_params,
|
|
)
|
|
|
|
assert result["expires_after"]["minutes"] == 15
|
|
|
|
def test_decode_managed_container_id_returns_provider_container_id(self):
|
|
"""Managed IDs must decode to the short ID sent on upstream requests."""
|
|
inner = "cntr_69d4ff00deadbeef"
|
|
managed = ResponsesAPIRequestUtils._build_container_id(
|
|
custom_llm_provider="openai",
|
|
model_id=None,
|
|
container_id=inner,
|
|
)
|
|
assert len(managed) > len(inner)
|
|
litellm_params: GenericLiteLLMParams = GenericLiteLLMParams()
|
|
original_id, provider, updated = decode_managed_container_id_for_request(
|
|
managed, "openai", litellm_params
|
|
)
|
|
assert original_id == inner
|
|
assert provider == "openai"
|
|
assert updated is litellm_params
|
|
|
|
|
|
class TestDeleteContainerFileResponseWireFormat:
|
|
"""OpenAI / Azure return ``container.file.deleted`` on DELETE file."""
|
|
|
|
def test_accepts_openai_dot_notation(self):
|
|
m = DeleteContainerFileResponse(
|
|
id="cfile_abc",
|
|
object="container.file.deleted",
|
|
deleted=True,
|
|
)
|
|
assert m.object == "container.file.deleted"
|
|
|
|
def test_accepts_legacy_underscore(self):
|
|
m = DeleteContainerFileResponse(
|
|
id="cfile_abc",
|
|
object="container_file.deleted",
|
|
deleted=True,
|
|
)
|
|
assert m.object == "container_file.deleted"
|