mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-08 03:08:45 +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>
374 lines
12 KiB
Python
374 lines
12 KiB
Python
import time
|
|
from unittest.mock import AsyncMock
|
|
|
|
import pytest
|
|
from httpx import Request, Response
|
|
|
|
from litellm.integrations.datadog.datadog_cost_management import (
|
|
DatadogCostManagementLogger,
|
|
)
|
|
from litellm.types.utils import StandardLoggingPayload
|
|
|
|
|
|
@pytest.fixture
|
|
def clean_env(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
for key, value in (
|
|
("DD_API_KEY", "test_api_key"),
|
|
("DD_APP_KEY", "test_app_key"),
|
|
("DD_SITE", "test.datadoghq.com"),
|
|
):
|
|
monkeypatch.setenv(key, value)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_init(clean_env):
|
|
"""
|
|
Test initialization sets up clients and url correctly
|
|
"""
|
|
logger = DatadogCostManagementLogger()
|
|
assert logger.dd_api_key == "test_api_key"
|
|
assert logger.dd_app_key == "test_app_key"
|
|
assert (
|
|
logger.upload_url == "https://api.test.datadoghq.com/api/v2/cost/custom_costs"
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_aggregate_costs(clean_env):
|
|
"""
|
|
Test that costs are correctly aggregated by provider, model, and date
|
|
"""
|
|
logger = DatadogCostManagementLogger()
|
|
|
|
# Mock some log payloads
|
|
now = time.time()
|
|
day_str = time.strftime("%Y-%m-%d", time.localtime(now))
|
|
|
|
logs = [
|
|
StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=now,
|
|
metadata={"user_api_key_team_alias": "team-a"},
|
|
),
|
|
StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.02,
|
|
startTime=now,
|
|
metadata={"user_api_key_team_alias": "team-a"},
|
|
),
|
|
StandardLoggingPayload(
|
|
custom_llm_provider="anthropic",
|
|
model="claude-3",
|
|
response_cost=0.05,
|
|
startTime=now,
|
|
),
|
|
]
|
|
|
|
aggregated = logger._aggregate_costs(logs)
|
|
|
|
assert len(aggregated) == 2
|
|
|
|
# Check OpenAI entry
|
|
openai_entry = next(e for e in aggregated if e["ProviderName"] == "openai")
|
|
assert openai_entry["BilledCost"] == 0.03
|
|
assert openai_entry["ChargeDescription"] == "LLM Usage for gpt-4"
|
|
assert openai_entry["ChargePeriodStart"] == day_str
|
|
assert openai_entry["Tags"]["team"] == "team-a"
|
|
assert "env" in openai_entry["Tags"]
|
|
assert "service" in openai_entry["Tags"]
|
|
|
|
# Check Anthropic entry
|
|
anthropic_entry = next(e for e in aggregated if e["ProviderName"] == "anthropic")
|
|
assert anthropic_entry["BilledCost"] == 0.05
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_async_log_success_event(clean_env):
|
|
"""
|
|
Test that logs are added to queue
|
|
"""
|
|
logger = DatadogCostManagementLogger(batch_size=10)
|
|
|
|
await logger.async_log_success_event(
|
|
kwargs={"standard_logging_object": {"response_cost": 0.01}},
|
|
response_obj={},
|
|
start_time=time.time(),
|
|
end_time=time.time(),
|
|
)
|
|
|
|
assert len(logger.log_queue) == 1
|
|
assert logger.log_queue[0]["response_cost"] == 0.01
|
|
|
|
# Test zero cost ignored
|
|
await logger.async_log_success_event(
|
|
kwargs={"standard_logging_object": {"response_cost": 0.0}},
|
|
response_obj={},
|
|
start_time=time.time(),
|
|
end_time=time.time(),
|
|
)
|
|
|
|
assert len(logger.log_queue) == 1
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_async_send_batch(clean_env):
|
|
"""
|
|
Test that batch is aggregated and uploaded
|
|
"""
|
|
logger = DatadogCostManagementLogger()
|
|
logger.async_client = AsyncMock()
|
|
logger.async_client.put.return_value = Response(202, json={"status": "ok"})
|
|
|
|
# Add logs directly to queue
|
|
logger.log_queue = [
|
|
StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
)
|
|
]
|
|
|
|
await logger.async_send_batch()
|
|
|
|
# Verify API called
|
|
assert logger.async_client.put.called
|
|
call_args = logger.async_client.put.call_args
|
|
assert call_args[0][0] == "https://api.test.datadoghq.com/api/v2/cost/custom_costs"
|
|
|
|
import json
|
|
|
|
# Use call_args.kwargs['content']
|
|
content = json.loads(call_args[1]["content"])
|
|
assert content[0]["ProviderName"] == "openai"
|
|
assert content[0]["BilledCost"] == 0.01
|
|
|
|
|
|
_PUT_REQUEST = Request("PUT", "https://api.test.datadoghq.com/api/v2/cost/custom_costs")
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_async_send_batch_clears_queue_on_success(clean_env):
|
|
"""Bug 1 regression: log_queue must be empty after a successful upload."""
|
|
logger = DatadogCostManagementLogger()
|
|
logger.async_client = AsyncMock()
|
|
logger.async_client.put.return_value = Response(
|
|
202, json={"status": "ok"}, request=_PUT_REQUEST
|
|
)
|
|
logger.log_queue = [
|
|
StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
)
|
|
]
|
|
await logger.async_send_batch()
|
|
assert logger.log_queue == []
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_async_send_batch_preserves_events_added_during_upload(clean_env):
|
|
"""Events appended while the upload is in flight survive (land on the cleared queue)."""
|
|
logger = DatadogCostManagementLogger()
|
|
|
|
later_event = StandardLoggingPayload(
|
|
custom_llm_provider="anthropic",
|
|
model="claude-3",
|
|
response_cost=0.02,
|
|
startTime=time.time(),
|
|
)
|
|
|
|
async def slow_put(*args, **kwargs):
|
|
logger.log_queue.append(later_event)
|
|
return Response(202, json={"status": "ok"}, request=_PUT_REQUEST)
|
|
|
|
logger.async_client = AsyncMock()
|
|
logger.async_client.put.side_effect = slow_put
|
|
logger.log_queue = [
|
|
StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
)
|
|
]
|
|
await logger.async_send_batch()
|
|
assert logger.log_queue == [later_event]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_async_send_batch_requeues_on_upload_failure(clean_env):
|
|
"""Failed upload requeues the original batch (no data loss)."""
|
|
logger = DatadogCostManagementLogger()
|
|
logger.async_client = AsyncMock()
|
|
logger.async_client.put.side_effect = Exception("boom")
|
|
original = StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
)
|
|
logger.log_queue = [original]
|
|
await logger.async_send_batch()
|
|
assert logger.log_queue == [original]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_extract_tags_emits_canonical_focus_dimensions(clean_env):
|
|
"""provider, model, model_id always emitted regardless of cost_tag_keys."""
|
|
logger = DatadogCostManagementLogger()
|
|
log = StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4o",
|
|
model_id="router-id-123",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
)
|
|
tags = logger._extract_tags(log)
|
|
assert tags["provider"] == "openai"
|
|
assert tags["model"] == "gpt-4o"
|
|
assert tags["model_id"] == "router-id-123"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_extract_tags_allowlist_filters_request_tags(clean_env):
|
|
"""Only request_tags whose key is in cost_tag_keys reach the Tags dict."""
|
|
logger = DatadogCostManagementLogger(cost_tag_keys=["capability", "tier"])
|
|
log = StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
request_tags=["capability:chat", "tier:gold", "secret:disallowed"],
|
|
)
|
|
tags = logger._extract_tags(log)
|
|
assert tags["capability"] == "chat"
|
|
assert tags["tier"] == "gold"
|
|
assert "secret" not in tags
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_extract_tags_allowlist_filters_metadata(clean_env):
|
|
"""Only metadata keys in cost_tag_keys flow through; others (and dict/list values) are dropped."""
|
|
logger = DatadogCostManagementLogger(cost_tag_keys=["capability", "owner"])
|
|
log = StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
metadata={
|
|
"capability": "chat",
|
|
"owner": "team-x",
|
|
"secret_field": "sensitive",
|
|
"nested_obj": {"a": 1},
|
|
},
|
|
)
|
|
tags = logger._extract_tags(log)
|
|
assert tags["capability"] == "chat"
|
|
assert tags["owner"] == "team-x"
|
|
assert "secret_field" not in tags
|
|
assert "nested_obj" not in tags
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_extract_tags_empty_allowlist_default(clean_env):
|
|
"""With no cost_tag_keys, request_tags and arbitrary metadata.* do NOT leak into Tags."""
|
|
logger = DatadogCostManagementLogger()
|
|
log = StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
request_tags=["capability:chat"],
|
|
metadata={"capability": "chat", "user_api_key_alias": "alice"},
|
|
)
|
|
tags = logger._extract_tags(log)
|
|
assert "capability" not in tags
|
|
# Backwards-compat keys still flow:
|
|
assert tags["user"] == "alice"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_extract_tags_nested_metadata_allowlisted(clean_env):
|
|
"""spend_logs_metadata and requester_metadata get spread one level under the allowlist."""
|
|
logger = DatadogCostManagementLogger(cost_tag_keys=["env", "platform"])
|
|
log = StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
metadata={
|
|
"spend_logs_metadata": {"platform": "web", "ignored": "x"},
|
|
"requester_metadata": {"env": "prod"},
|
|
},
|
|
)
|
|
tags = logger._extract_tags(log)
|
|
assert tags["platform"] == "web"
|
|
# "env" is a reserved trusted dimension — requester_metadata.env must NOT
|
|
# overwrite the value sourced from get_datadog_env().
|
|
assert tags["env"] != "prod"
|
|
assert "ignored" not in tags
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_extract_tags_allowlist_cannot_override_reserved_dimensions(clean_env):
|
|
"""
|
|
Reserved tag keys (env, service, host, pod_name, provider, model, model_id,
|
|
team, user, model_group) must not be overwritten by user-controlled
|
|
request_tags or metadata, even when listed in cost_tag_keys.
|
|
"""
|
|
reserved = [
|
|
"env",
|
|
"service",
|
|
"host",
|
|
"pod_name",
|
|
"provider",
|
|
"model",
|
|
"model_id",
|
|
"team",
|
|
"user",
|
|
"model_group",
|
|
]
|
|
logger = DatadogCostManagementLogger(cost_tag_keys=reserved)
|
|
|
|
metadata_attack = {k: f"attacker-meta-{k}" for k in reserved}
|
|
metadata_attack["user_api_key_alias"] = "trusted-user"
|
|
metadata_attack["user_api_key_team_alias"] = "trusted-team"
|
|
metadata_attack["model_group"] = "trusted-group"
|
|
metadata_attack["spend_logs_metadata"] = {
|
|
k: f"attacker-spend-{k}" for k in reserved
|
|
}
|
|
metadata_attack["requester_metadata"] = {k: f"attacker-req-{k}" for k in reserved}
|
|
|
|
log = StandardLoggingPayload(
|
|
custom_llm_provider="openai",
|
|
model="gpt-4",
|
|
model_id="router-id-123",
|
|
response_cost=0.01,
|
|
startTime=time.time(),
|
|
request_tags=[f"{k}:attacker-rt-{k}" for k in reserved],
|
|
metadata=metadata_attack,
|
|
)
|
|
|
|
tags = logger._extract_tags(log)
|
|
|
|
# Canonical FOCUS dims keep their trusted (top-level payload) values.
|
|
assert tags["provider"] == "openai"
|
|
assert tags["model"] == "gpt-4"
|
|
assert tags["model_id"] == "router-id-123"
|
|
|
|
# Backwards-compat trusted dims keep their proxy-controlled metadata values.
|
|
assert tags["user"] == "trusted-user"
|
|
assert tags["team"] == "trusted-team"
|
|
assert tags["model_group"] == "trusted-group"
|
|
|
|
# No reserved key carries an attacker-supplied prefix from any path.
|
|
for k in reserved:
|
|
assert not tags[k].startswith("attacker-"), (
|
|
f"reserved key {k!r} was overwritten by user-controlled input: "
|
|
f"{tags[k]!r}"
|
|
)
|