mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-03 02:22:24 +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: keep the job's UNIT_FLAG out of the shard-script tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
254 lines
7.6 KiB
Python
254 lines
7.6 KiB
Python
"""
|
|
Test custom secret manager implementation
|
|
"""
|
|
|
|
from typing import Optional, Union
|
|
|
|
import httpx
|
|
import pytest
|
|
|
|
|
|
import litellm
|
|
from litellm.integrations.custom_secret_manager import CustomSecretManager
|
|
from litellm.types.secret_managers.main import KeyManagementSystem
|
|
|
|
|
|
class TestCustomSecretManager(CustomSecretManager):
|
|
"""
|
|
Test implementation of a custom secret manager.
|
|
|
|
This simulates a simple in-memory secret store for testing purposes.
|
|
"""
|
|
|
|
def __init__(self, secrets: Optional[dict] = None):
|
|
super().__init__(secret_manager_name="test_custom_secret_manager")
|
|
self.secrets = secrets or {
|
|
"TEST_API_KEY": "test-api-key-12345",
|
|
"TEST_SECRET": "super-secret-value",
|
|
"OPENAI_API_KEY": "sk-test-openai-key",
|
|
}
|
|
|
|
async def async_read_secret(
|
|
self,
|
|
secret_name: str,
|
|
optional_params: Optional[dict] = None,
|
|
timeout: Optional[Union[float, httpx.Timeout]] = None,
|
|
) -> Optional[str]:
|
|
"""
|
|
Read a secret from the in-memory store asynchronously.
|
|
"""
|
|
return self.secrets.get(secret_name)
|
|
|
|
def sync_read_secret(
|
|
self,
|
|
secret_name: str,
|
|
optional_params: Optional[dict] = None,
|
|
timeout: Optional[Union[float, httpx.Timeout]] = None,
|
|
) -> Optional[str]:
|
|
"""
|
|
Read a secret from the in-memory store synchronously.
|
|
"""
|
|
return self.secrets.get(secret_name)
|
|
|
|
async def async_write_secret(
|
|
self,
|
|
secret_name: str,
|
|
secret_value: str,
|
|
description: Optional[str] = None,
|
|
optional_params: Optional[dict] = None,
|
|
timeout: Optional[Union[float, httpx.Timeout]] = None,
|
|
tags: Optional[Union[dict, list]] = None,
|
|
) -> dict:
|
|
"""
|
|
Write a secret to the in-memory store.
|
|
"""
|
|
self.secrets[secret_name] = secret_value
|
|
return {
|
|
"secret_name": secret_name,
|
|
"status": "success",
|
|
"description": description,
|
|
}
|
|
|
|
async def async_delete_secret(
|
|
self,
|
|
secret_name: str,
|
|
recovery_window_in_days: Optional[int] = 7,
|
|
optional_params: Optional[dict] = None,
|
|
timeout: Optional[Union[float, httpx.Timeout]] = None,
|
|
) -> dict:
|
|
"""
|
|
Delete a secret from the in-memory store.
|
|
"""
|
|
if secret_name in self.secrets:
|
|
del self.secrets[secret_name]
|
|
return {"secret_name": secret_name, "status": "deleted"}
|
|
return {"secret_name": secret_name, "status": "not_found"}
|
|
|
|
|
|
def test_custom_secret_manager_initialization():
|
|
"""
|
|
Test that a custom secret manager can be initialized correctly.
|
|
"""
|
|
secret_manager = TestCustomSecretManager()
|
|
assert secret_manager.secret_manager_name == "test_custom_secret_manager"
|
|
assert "TEST_API_KEY" in secret_manager.secrets
|
|
|
|
|
|
def test_custom_secret_manager_sync_read():
|
|
"""
|
|
Test synchronous secret reading.
|
|
"""
|
|
secret_manager = TestCustomSecretManager()
|
|
|
|
# Test reading an existing secret
|
|
api_key = secret_manager.sync_read_secret("TEST_API_KEY")
|
|
assert api_key == "test-api-key-12345"
|
|
|
|
# Test reading a non-existent secret
|
|
missing_key = secret_manager.sync_read_secret("NON_EXISTENT_KEY")
|
|
assert missing_key is None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_custom_secret_manager_async_read():
|
|
"""
|
|
Test asynchronous secret reading.
|
|
"""
|
|
secret_manager = TestCustomSecretManager()
|
|
|
|
# Test reading an existing secret
|
|
api_key = await secret_manager.async_read_secret("TEST_SECRET")
|
|
assert api_key == "super-secret-value"
|
|
|
|
# Test reading a non-existent secret
|
|
missing_key = await secret_manager.async_read_secret("NON_EXISTENT_KEY")
|
|
assert missing_key is None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_custom_secret_manager_async_write():
|
|
"""
|
|
Test asynchronous secret writing.
|
|
"""
|
|
secret_manager = TestCustomSecretManager()
|
|
|
|
# Write a new secret
|
|
result = await secret_manager.async_write_secret(
|
|
secret_name="NEW_SECRET",
|
|
secret_value="new-secret-value",
|
|
description="A new test secret",
|
|
)
|
|
|
|
assert result["status"] == "success"
|
|
assert result["secret_name"] == "NEW_SECRET"
|
|
|
|
# Verify the secret was written
|
|
secret_value = secret_manager.sync_read_secret("NEW_SECRET")
|
|
assert secret_value == "new-secret-value"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_custom_secret_manager_async_delete():
|
|
"""
|
|
Test asynchronous secret deletion.
|
|
"""
|
|
secret_manager = TestCustomSecretManager()
|
|
|
|
# Verify secret exists
|
|
assert secret_manager.sync_read_secret("TEST_API_KEY") is not None
|
|
|
|
# Delete the secret
|
|
result = await secret_manager.async_delete_secret("TEST_API_KEY")
|
|
assert result["status"] == "deleted"
|
|
|
|
# Verify secret is deleted
|
|
assert secret_manager.sync_read_secret("TEST_API_KEY") is None
|
|
|
|
|
|
def test_custom_secret_manager_integration_with_litellm():
|
|
"""
|
|
Test that the custom secret manager integrates with LiteLLM's secret management system.
|
|
"""
|
|
# Create and set the custom secret manager
|
|
secret_manager = TestCustomSecretManager()
|
|
litellm.secret_manager_client = secret_manager
|
|
litellm._key_management_system = KeyManagementSystem.CUSTOM
|
|
|
|
# Set access mode to enable secret reading
|
|
from litellm.types.secret_managers.main import KeyManagementSettings
|
|
|
|
litellm._key_management_settings = KeyManagementSettings(access_mode="read_only")
|
|
|
|
try:
|
|
# Test getting a secret through LiteLLM's get_secret function
|
|
from litellm.secret_managers.main import get_secret
|
|
|
|
api_key = get_secret("TEST_API_KEY")
|
|
assert api_key == "test-api-key-12345"
|
|
|
|
openai_key = get_secret("OPENAI_API_KEY")
|
|
assert openai_key == "sk-test-openai-key"
|
|
|
|
finally:
|
|
# Clean up
|
|
litellm.secret_manager_client = None
|
|
litellm._key_management_system = None
|
|
litellm._key_management_settings = None
|
|
|
|
|
|
class MinimalCustomSecretManager(CustomSecretManager):
|
|
"""
|
|
Minimal implementation that only implements required methods.
|
|
"""
|
|
|
|
def __init__(self):
|
|
super().__init__(secret_manager_name="minimal_custom")
|
|
|
|
async def async_read_secret(
|
|
self,
|
|
secret_name: str,
|
|
optional_params: Optional[dict] = None,
|
|
timeout: Optional[Union[float, httpx.Timeout]] = None,
|
|
) -> Optional[str]:
|
|
"""
|
|
Minimal async read implementation.
|
|
"""
|
|
return f"async-{secret_name}-value"
|
|
|
|
def sync_read_secret(
|
|
self,
|
|
secret_name: str,
|
|
optional_params: Optional[dict] = None,
|
|
timeout: Optional[Union[float, httpx.Timeout]] = None,
|
|
) -> Optional[str]:
|
|
"""
|
|
Minimal sync read implementation.
|
|
"""
|
|
return f"sync-{secret_name}-value"
|
|
|
|
|
|
def test_minimal_custom_secret_manager():
|
|
"""
|
|
Test that a minimal implementation without write/delete methods works.
|
|
"""
|
|
secret_manager = MinimalCustomSecretManager()
|
|
|
|
# Read should work
|
|
value = secret_manager.sync_read_secret("TEST_KEY")
|
|
assert value == "sync-TEST_KEY-value"
|
|
|
|
# Write should raise NotImplementedError
|
|
import asyncio
|
|
|
|
with pytest.raises(NotImplementedError) as exc_info:
|
|
asyncio.run(secret_manager.async_write_secret("KEY", "value"))
|
|
|
|
assert "Write operations are not implemented" in str(exc_info.value)
|
|
|
|
# Delete should raise NotImplementedError
|
|
import asyncio
|
|
|
|
with pytest.raises(NotImplementedError) as exc_info:
|
|
asyncio.run(secret_manager.async_delete_secret("KEY"))
|
|
|
|
assert "Delete operations are not implemented" in str(exc_info.value)
|