mirror of
https://github.com/tiennm99/litellm.git
synced 2026-06-17 20:48:32 +00:00
2c733c00f5
* test: modernize models used in CircleCI e2e test suites
Replaces obsolete models (gpt-4o, gpt-4o-mini, gpt-3.5-turbo,
claude-3-5-sonnet-20240620, claude-sonnet-4-20250514) with current
equivalents across the e2e_openai_endpoints and
proxy_e2e_anthropic_messages_tests CircleCI jobs.
- gpt-4o -> gpt-5.5 (responses API e2e tests)
- gpt-4o-mini -> gpt-5-mini (websocket responses, oai_misc_config)
- gpt-4o-mini-2024-07-18 -> gpt-4.1-mini-2025-04-14 (fine-tuning,
still actively fine-tunable)
- gpt-4 / gpt-3.5-turbo target_model_names example -> gpt-5.5 /
gpt-5-mini
- bedrock claude-3-5-sonnet-20240620 batch entry -> haiku-4-5-20251001
(also aligning oai_misc_config model_name with what
test_bedrock_batches_api.py actually requests)
- bedrock claude-sonnet-4-20250514 (deprecated, retires 2026-06-15)
-> claude-sonnet-4-5-20250929
* test: point bedrock-claude-sonnet-4 alias at Sonnet 4.6, not 4.5
Greptile/Cursor flagged that after the previous commit, the
bedrock-claude-sonnet-4 alias collided with bedrock-claude-sonnet-4.5
(both pointed to claude-sonnet-4-5-20250929). Rename to
bedrock-claude-sonnet-4.6 and point it at the Sonnet 4.6 Bedrock ID
(us.anthropic.claude-sonnet-4-6, already in the litellm model
registry) so the alias name matches the underlying model version.
* test: modernize models across remaining CI-mounted configs & tests
Expands the modernization sweep to all CircleCI-mounted proxy configs
and to test directories where the model literal is a fixture/route key
(not the test's subject).
Config changes:
- proxy_server_config.yaml: bump gpt-3.5-turbo / gpt-3.5-turbo-1106 /
gpt-4o / gemini-1.5-flash / dall-e-3 underlying models; rename
gpt-3.5-turbo-end-user-test alias to gpt-5-mini-end-user-test; bump
text-embedding-ada-002 underlying to text-embedding-3-small. User-
facing aliases (gpt-3.5-turbo, gpt-4, text-embedding-ada-002, etc.)
preserved for backward compatibility with tests.
- simple_config.yaml, otel_test_config.yaml, spend_tracking_config.yaml:
bump gpt-3.5-turbo underlying to gpt-5-mini.
- pass_through_config.yaml: claude-3-5-sonnet / claude-3-7-sonnet /
claude-3-haiku entries replaced with claude-sonnet-4-5 / claude-
haiku-4-5 / claude-opus-4-7.
- oai_misc_config.yaml: align alias name with the gpt-5-mini rename.
Test changes (proactive: claude-sonnet-4-20250514 / claude-opus-4-
20250514 retire 2026-06-15):
- tests/llm_translation/test_anthropic_completion.py: bump 3 references
+ paired Vertex AI ID to claude-sonnet-4-5.
- tests/llm_translation/test_optional_params.py: bump 2 references.
- tests/pass_through_unit_tests/test_anthropic_messages_passthrough.py
and test_bedrock_anthropic_messages_test.py: bump router fixtures
using the deprecated model IDs.
- tests/pass_through_unit_tests/base_anthropic_messages_tool_search_test.py:
modernize docstring examples.
- tests/test_end_users.py: update references to renamed alias.
* test: modernize placeholder model literals in router_unit_tests
Mass replace_all on fixture/placeholder model literals across the
router_unit_tests/ suite (model name is a routing key / label, not the
test subject). Sub-agent sweep so far — additional commits will follow
for logging_callback_tests/, enterprise/, top-level tests/test_*.py,
and other CI-mounted dirs.
Mappings applied:
- gpt-3.5-turbo -> gpt-5-mini
- gpt-4 (bare) -> gpt-5.5
- gpt-4o (bare) -> gpt-5
- text-embedding-ada-002 -> text-embedding-3-small
- claude-3-sonnet-20240229 / claude-3-opus-20240229 /
claude-3-haiku-20240307 / claude-3-5-sonnet-20240620 ->
claude-sonnet-4-5-20250929 / claude-opus-4-7 /
claude-haiku-4-5-20251001 as appropriate
Explicitly preserved:
- gpt-4o-mini-* variants (transcribe, tts, etc.) where they're current
- gpt-4-turbo / gpt-4-vision-preview / gpt-4-0613 (subject literals)
- JSONL batch body literals
- Mock LLM response model fields (must match upstream)
- Fake/mock identifiers
* test: modernize placeholder model literals across remaining CI suites
Sub-agent sweep across logging_callback_tests/, guardrails_tests/,
enterprise/, pass_through_unit_tests/, otel_tests/,
llm_responses_api_testing/, batches_tests/, spend_tracking_tests/,
litellm_utils_tests/, unified_google_tests/, and a few top-level
tests/test_*.py files where the model literal is a fixture or
placeholder (router model_list, mock standard logging payload, mock
callback data) rather than the test's subject.
Mappings applied (see scope notes below):
- gpt-3.5-turbo -> gpt-5-mini
- gpt-4 (bare) -> gpt-5.5
- gpt-4o (bare) -> gpt-5.5 (corrected from initial gpt-5 — bare gpt-5
is not a valid OpenAI alias; only gpt-5.5 / gpt-5.4 / gpt-5.2-codex
/ gpt-5-mini exist)
- gpt-4o-mini (bare) -> gpt-5-mini
- text-embedding-ada-002 -> text-embedding-3-small
- claude-3-sonnet-20240229 -> claude-sonnet-4-5-20250929
- claude-3-opus-20240229 -> claude-opus-4-7
- claude-3-haiku-20240307 -> claude-haiku-4-5-20251001
- claude-3-5-sonnet-20240620/20241022 -> claude-sonnet-4-5-20250929
- claude-3-7-sonnet-20250219 -> claude-sonnet-4-6
- gemini-1.5-flash -> gemini-2.5-flash
- gemini-1.5-pro -> gemini-2.5-pro
Explicitly preserved (not modernized):
- llm_translation/ tests where model is the SUBJECT (provider-specific
translation/transformation logic). Only the deprecated 20250514
references were already bumped in a prior commit.
- Cost-calc / tokenizer subject tests in test_utils.py (skip-ranges
documented by the sub-agent).
- Bedrock model IDs in test_health_check.py path-stripping tests.
- JSONL batch request bodies and mock LLM response bodies (must match
upstream literal).
- Langfuse expected-request-body JSON fixtures (cost values are exact-
match-asserted; changing the model would shift response_cost).
- gpt-3.5-turbo-instruct (text-completion endpoint; no modern OpenAI
equivalent).
- Top-level tests calling the proxy through user-facing aliases
(gpt-3.5-turbo, gpt-4, text-embedding-ada-002, dall-e-3) — aliases
in proxy_server_config.yaml stay; only the underlying model was
bumped.
- tests/test_gpt5_azure_temperature_support.py (the test's whole point
is model-name handling).
- Fake / mock / openai/fake identifiers.
Notable side fixes:
- test_spend_accuracy_tests.py: UPSTREAM_MODEL now matches what
spend_tracking_config.yaml's proxy actually routes to (gpt-5-mini),
resolving a latent inconsistency.
- proxy_server_config.yaml: bare `gpt-5` alias renamed to `gpt-5.5`
(bare gpt-5 is not a valid OpenAI alias).
- test_batches_logging_unit_tests.py: explicit_models list entries
kept distinct (gpt-5-mini + gpt-5.5) after bulk rename.
* test: fix CI failures from model modernization sweep
CI surfaced 4 categories of regression from the bulk modernization:
1. Azure deployment names are customer-specific. Reverted:
- tests/litellm_utils_tests/test_health_check.py: azure/text-
embedding-3-small -> azure/text-embedding-ada-002 (the CI Azure
account does not have a text-embedding-3-small deployment).
- tests/logging_callback_tests/test_custom_callback_router.py:
same revert for two router fixtures driving aembedding.
2. gpt-5 family does not accept temperature != 1. Tests that pass a
custom temperature swapped from gpt-5-mini to gpt-4.1-mini (modern
non-reasoning OpenAI mini that still accepts temperature/logprobs):
- tests/logging_callback_tests/test_datadog.py
- tests/logging_callback_tests/test_langsmith_unit_test.py
- tests/logging_callback_tests/test_otel_logging.py
3. proxy_server_config.yaml's gpt-3.5-turbo-large alias was routing to
gpt-5.5 (a reasoning model that rejects logprobs). The proxy test
tests/test_openai_endpoints.py::test_chat_completion_streaming
exercises logprobs/top_logprobs through that alias. Bumped the
underlying model to gpt-4.1 (non-reasoning, still modern).
4. tests/logging_callback_tests/test_gcs_pub_sub.py asserts against a
pinned JSON fixture (gcs_pub_sub_body/spend_logs_payload.json) with
hardcoded model="gpt-4o" and a model-specific spend value. Reverted
the litellm.acompletion calls in the test to model="gpt-4o" so the
fixture's exact-match assertions still hold.
5. tests/pass_through_unit_tests/test_anthropic_messages_passthrough.py:
anthropic.messages.create routing to openai/gpt-5-mini returned an
empty content[0] with max_tokens=100 (reasoning-token consumption).
Swapped to openai/gpt-4.1-mini.
* test: fix Assistants API model + 2 cursor[bot] review nits
1. pass_through_unit_tests/test_custom_logger_passthrough.py: gpt-5.5
isn't accepted by the /v1/assistants endpoint
("unsupported_model"). Switch to gpt-4.1-mini (modern, Assistants-
API-supported, non-reasoning).
2. example_config_yaml/pass_through_config.yaml: the previous sweep
bumped the claude-3-7-sonnet alias to claude-opus-4-7, which is a
tier change (Sonnet -> Opus). Map to claude-sonnet-4-6 to keep the
Sonnet tier intact. (Cursor bugbot review.)
3. example_config_yaml/simple_config.yaml: model_name was left as
gpt-3.5-turbo while the underlying was bumped to gpt-5-mini, which
muddles the "simple" example. Make both sides gpt-5-mini so the
most basic example is a straight 1:1 mapping again. (Cursor bugbot
review.)
* fix: revert gpt-4/gpt-3.5-turbo alias underlying to non-reasoning models
tests/test_openai_endpoints.py::test_completion calls the proxy alias
"gpt-4" with temperature=0, and other tests call gpt-3.5-turbo with
custom temperature / logprobs / the legacy /v1/completions endpoint.
The earlier modernization mapped both aliases to gpt-5.5 / gpt-5-mini,
which are reasoning models that reject temperature != 1 and don't
expose /v1/completions. Map the aliases to gpt-4.1 / gpt-4.1-mini
(modern non-reasoning OpenAI models) instead — keeps user-facing
aliases preserved while picking a current underlying that still
supports the parameters/endpoints the tests exercise.
1104 lines
38 KiB
Python
1104 lines
38 KiB
Python
"""
|
|
Unit tests for StandardLoggingPayloadSetup
|
|
"""
|
|
|
|
import json
|
|
import os
|
|
import sys
|
|
from datetime import datetime
|
|
from unittest.mock import AsyncMock
|
|
|
|
sys.path.insert(
|
|
0, os.path.abspath("../..")
|
|
) # Adds the parent directory to the system-path
|
|
from datetime import datetime as dt_object
|
|
import time
|
|
import pytest
|
|
import litellm
|
|
from litellm.types.utils import (
|
|
StandardLoggingPayload,
|
|
Usage,
|
|
StandardLoggingMetadata,
|
|
StandardLoggingModelInformation,
|
|
StandardLoggingHiddenParams,
|
|
)
|
|
from create_mock_standard_logging_payload import (
|
|
create_standard_logging_payload,
|
|
create_standard_logging_payload_with_long_content,
|
|
)
|
|
from litellm.litellm_core_utils.litellm_logging import (
|
|
StandardLoggingPayloadSetup,
|
|
)
|
|
|
|
from litellm.integrations.custom_logger import CustomLogger
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"response_obj,expected_values",
|
|
[
|
|
# Test None input
|
|
(None, (0, 0, 0)),
|
|
# Test empty dict
|
|
({}, (0, 0, 0)),
|
|
# Test valid usage dict
|
|
(
|
|
{
|
|
"usage": {
|
|
"prompt_tokens": 10,
|
|
"completion_tokens": 20,
|
|
"total_tokens": 30,
|
|
}
|
|
},
|
|
(10, 20, 30),
|
|
),
|
|
# Test with litellm.Usage object
|
|
(
|
|
{"usage": Usage(prompt_tokens=15, completion_tokens=25, total_tokens=40)},
|
|
(15, 25, 40),
|
|
),
|
|
# Test invalid usage type
|
|
({"usage": "invalid"}, (0, 0, 0)),
|
|
# Test None usage
|
|
({"usage": None}, (0, 0, 0)),
|
|
],
|
|
)
|
|
def test_get_usage(response_obj, expected_values):
|
|
"""
|
|
Make sure values returned from get_usage are always integers
|
|
"""
|
|
|
|
usage = StandardLoggingPayloadSetup.get_usage_from_response_obj(response_obj)
|
|
|
|
# Check types
|
|
assert isinstance(usage.prompt_tokens, int)
|
|
assert isinstance(usage.completion_tokens, int)
|
|
assert isinstance(usage.total_tokens, int)
|
|
|
|
# Check values
|
|
assert usage.prompt_tokens == expected_values[0]
|
|
assert usage.completion_tokens == expected_values[1]
|
|
assert usage.total_tokens == expected_values[2]
|
|
|
|
|
|
def test_get_usage_from_image_generation_response():
|
|
"""
|
|
Test that image generation usage (with input_tokens/output_tokens format)
|
|
is correctly transformed to standard usage format with image_tokens preserved.
|
|
|
|
Note: get_usage_from_response_obj() is used by multiple endpoints including
|
|
/images/generations and Response API (/responses), both of which use the
|
|
input_tokens/output_tokens format instead of prompt_tokens/completion_tokens.
|
|
|
|
This tests the fix for the bug where image_tokens were being lost during
|
|
spend log creation for /images/generations endpoint.
|
|
"""
|
|
# Simulating image generation response usage from OpenAI
|
|
response_obj = {
|
|
"usage": {
|
|
"input_tokens": 13,
|
|
"output_tokens": 372,
|
|
"total_tokens": 385,
|
|
"input_tokens_details": {
|
|
"image_tokens": 0,
|
|
"text_tokens": 13,
|
|
},
|
|
"output_tokens_details": {
|
|
"image_tokens": 272,
|
|
"text_tokens": 100,
|
|
},
|
|
}
|
|
}
|
|
|
|
usage = StandardLoggingPayloadSetup.get_usage_from_response_obj(response_obj)
|
|
|
|
# Check basic token counts are mapped correctly
|
|
assert usage.prompt_tokens == 13
|
|
assert usage.completion_tokens == 372
|
|
assert usage.total_tokens == 385
|
|
|
|
# Check that prompt_tokens_details contains image_tokens and text_tokens
|
|
assert usage.prompt_tokens_details is not None
|
|
assert usage.prompt_tokens_details.image_tokens == 0
|
|
assert usage.prompt_tokens_details.text_tokens == 13
|
|
|
|
# Check that completion_tokens_details contains image_tokens and text_tokens
|
|
assert usage.completion_tokens_details is not None
|
|
assert usage.completion_tokens_details.image_tokens == 272
|
|
assert usage.completion_tokens_details.text_tokens == 100
|
|
|
|
|
|
def test_get_additional_headers():
|
|
additional_headers = {
|
|
"x-ratelimit-limit-requests": "2000",
|
|
"x-ratelimit-remaining-requests": "1999",
|
|
"x-ratelimit-limit-tokens": "160000",
|
|
"x-ratelimit-remaining-tokens": "160000",
|
|
"llm_provider-date": "Tue, 29 Oct 2024 23:57:37 GMT",
|
|
"llm_provider-content-type": "application/json",
|
|
"llm_provider-transfer-encoding": "chunked",
|
|
"llm_provider-connection": "keep-alive",
|
|
"llm_provider-anthropic-ratelimit-requests-limit": "2000",
|
|
"llm_provider-anthropic-ratelimit-requests-remaining": "1999",
|
|
"llm_provider-anthropic-ratelimit-requests-reset": "2024-10-29T23:57:40Z",
|
|
"llm_provider-anthropic-ratelimit-tokens-limit": "160000",
|
|
"llm_provider-anthropic-ratelimit-tokens-remaining": "160000",
|
|
"llm_provider-anthropic-ratelimit-tokens-reset": "2024-10-29T23:57:36Z",
|
|
"llm_provider-request-id": "req_01F6CycZZPSHKRCCctcS1Vto",
|
|
"llm_provider-via": "1.1 google",
|
|
"llm_provider-cf-cache-status": "DYNAMIC",
|
|
"llm_provider-x-robots-tag": "none",
|
|
"llm_provider-server": "cloudflare",
|
|
"llm_provider-cf-ray": "8da71bdbc9b57abb-SJC",
|
|
"llm_provider-content-encoding": "gzip",
|
|
"llm_provider-x-ratelimit-limit-requests": "2000",
|
|
"llm_provider-x-ratelimit-remaining-requests": "1999",
|
|
"llm_provider-x-ratelimit-limit-tokens": "160000",
|
|
"llm_provider-x-ratelimit-remaining-tokens": "160000",
|
|
}
|
|
additional_logging_headers = StandardLoggingPayloadSetup.get_additional_headers(
|
|
additional_headers
|
|
)
|
|
# Typed rate-limit fields are coerced to int
|
|
assert additional_logging_headers is not None
|
|
assert additional_logging_headers.get("x_ratelimit_limit_requests") == 2000
|
|
assert additional_logging_headers.get("x_ratelimit_remaining_requests") == 1999
|
|
assert additional_logging_headers.get("x_ratelimit_limit_tokens") == 160000
|
|
assert additional_logging_headers.get("x_ratelimit_remaining_tokens") == 160000
|
|
# Provider-specific headers are preserved verbatim (not dropped)
|
|
assert (
|
|
additional_logging_headers.get("llm_provider-request-id")
|
|
== "req_01F6CycZZPSHKRCCctcS1Vto"
|
|
)
|
|
assert (
|
|
additional_logging_headers.get(
|
|
"llm_provider-anthropic-ratelimit-requests-reset"
|
|
)
|
|
== "2024-10-29T23:57:40Z"
|
|
)
|
|
|
|
|
|
def all_fields_present(standard_logging_metadata: StandardLoggingMetadata):
|
|
for field in StandardLoggingMetadata.__annotations__.keys():
|
|
assert field in standard_logging_metadata
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"metadata_key, metadata_value",
|
|
[
|
|
("user_api_key_alias", "test_alias"),
|
|
("user_api_key_hash", "test_hash"),
|
|
("user_api_key_team_id", "test_team_id"),
|
|
("user_api_key_user_id", "test_user_id"),
|
|
("user_api_key_team_alias", "test_team_alias"),
|
|
("user_api_key_spend", 10.50),
|
|
("spend_logs_metadata", {"key": "value"}),
|
|
("requester_ip_address", "127.0.0.1"),
|
|
("requester_metadata", {"user_agent": "test_agent"}),
|
|
],
|
|
)
|
|
def test_get_standard_logging_metadata(metadata_key, metadata_value):
|
|
"""
|
|
Test that the get_standard_logging_metadata function correctly sets the metadata fields.
|
|
All fields in StandardLoggingMetadata should ALWAYS be present.
|
|
"""
|
|
metadata = {metadata_key: metadata_value}
|
|
standard_logging_metadata = (
|
|
StandardLoggingPayloadSetup.get_standard_logging_metadata(metadata)
|
|
)
|
|
|
|
print("standard_logging_metadata", standard_logging_metadata)
|
|
|
|
# Assert that all fields in StandardLoggingMetadata are present
|
|
all_fields_present(standard_logging_metadata)
|
|
|
|
# Assert that the specific metadata field is set correctly
|
|
assert standard_logging_metadata[metadata_key] == metadata_value
|
|
|
|
|
|
def test_get_standard_logging_metadata_user_api_key_hash():
|
|
valid_hash = "a" * 64 # 64 character string
|
|
metadata = {"user_api_key": valid_hash}
|
|
result = StandardLoggingPayloadSetup.get_standard_logging_metadata(metadata)
|
|
assert result["user_api_key_hash"] == valid_hash
|
|
|
|
|
|
def test_get_standard_logging_metadata_invalid_user_api_key():
|
|
invalid_hash = "not_a_valid_hash"
|
|
metadata = {"user_api_key": invalid_hash}
|
|
result = StandardLoggingPayloadSetup.get_standard_logging_metadata(metadata)
|
|
all_fields_present(result)
|
|
assert result["user_api_key_hash"] is None
|
|
|
|
|
|
def test_get_standard_logging_metadata_non_string_user_api_key():
|
|
"""Non-string user_api_key should not be set as user_api_key_hash."""
|
|
metadata = {"user_api_key": 12345}
|
|
result = StandardLoggingPayloadSetup.get_standard_logging_metadata(metadata)
|
|
all_fields_present(result)
|
|
assert result["user_api_key_hash"] is None
|
|
|
|
|
|
def test_get_standard_logging_metadata_none_user_api_key():
|
|
"""None user_api_key should not be set as user_api_key_hash."""
|
|
metadata = {"user_api_key": None}
|
|
result = StandardLoggingPayloadSetup.get_standard_logging_metadata(metadata)
|
|
all_fields_present(result)
|
|
assert result["user_api_key_hash"] is None
|
|
|
|
|
|
def test_get_standard_logging_metadata_invalid_keys():
|
|
metadata = {
|
|
"user_api_key_alias": "test_alias",
|
|
"invalid_key": "should_be_ignored",
|
|
"another_invalid_key": 123,
|
|
}
|
|
result = StandardLoggingPayloadSetup.get_standard_logging_metadata(metadata)
|
|
all_fields_present(result)
|
|
assert result["user_api_key_alias"] == "test_alias"
|
|
assert "invalid_key" not in result
|
|
assert "another_invalid_key" not in result
|
|
|
|
|
|
def test_cleanup_timestamps():
|
|
"""Test cleanup_timestamps with different input types"""
|
|
# Test with datetime objects
|
|
now = dt_object.now()
|
|
start = now
|
|
end = now
|
|
completion = now
|
|
|
|
result = StandardLoggingPayloadSetup.cleanup_timestamps(start, end, completion)
|
|
|
|
assert all(isinstance(x, float) for x in result)
|
|
assert len(result) == 3
|
|
|
|
# Test with float timestamps
|
|
start_float = time.time()
|
|
end_float = start_float + 1
|
|
completion_float = end_float
|
|
|
|
result = StandardLoggingPayloadSetup.cleanup_timestamps(
|
|
start_float, end_float, completion_float
|
|
)
|
|
|
|
assert all(isinstance(x, float) for x in result)
|
|
assert result[0] == start_float
|
|
assert result[1] == end_float
|
|
assert result[2] == completion_float
|
|
|
|
# Test with mixed types
|
|
result = StandardLoggingPayloadSetup.cleanup_timestamps(
|
|
start_float, end, completion_float
|
|
)
|
|
assert all(isinstance(x, float) for x in result)
|
|
|
|
# Test invalid input
|
|
with pytest.raises(ValueError):
|
|
StandardLoggingPayloadSetup.cleanup_timestamps(
|
|
"invalid", end_float, completion_float
|
|
)
|
|
|
|
|
|
def test_get_model_cost_information():
|
|
"""Test get_model_cost_information with different inputs"""
|
|
# Test with None values
|
|
result = StandardLoggingPayloadSetup.get_model_cost_information(
|
|
base_model=None,
|
|
custom_pricing=None,
|
|
custom_llm_provider=None,
|
|
init_response_obj={},
|
|
)
|
|
assert result["model_map_key"] == ""
|
|
assert result["model_map_value"] is None # this was not found in model cost map
|
|
# assert all fields in StandardLoggingModelInformation are present
|
|
assert all(
|
|
field in result for field in StandardLoggingModelInformation.__annotations__
|
|
)
|
|
|
|
# Test with valid model
|
|
result = StandardLoggingPayloadSetup.get_model_cost_information(
|
|
base_model="gpt-5-mini",
|
|
custom_pricing=False,
|
|
custom_llm_provider="openai",
|
|
init_response_obj={},
|
|
)
|
|
litellm_info_gpt_3_5_turbo_model_map_value = litellm.get_model_info(
|
|
model="gpt-5-mini", custom_llm_provider="openai"
|
|
)
|
|
print("result", result)
|
|
assert result["model_map_key"] == "gpt-5-mini"
|
|
assert result["model_map_value"] is not None
|
|
assert result["model_map_value"] == litellm_info_gpt_3_5_turbo_model_map_value
|
|
# assert all fields in StandardLoggingModelInformation are present
|
|
assert all(
|
|
field in result for field in StandardLoggingModelInformation.__annotations__
|
|
)
|
|
|
|
|
|
def test_get_hidden_params():
|
|
"""Test get_hidden_params with different inputs"""
|
|
# Test with None
|
|
result = StandardLoggingPayloadSetup.get_hidden_params(None)
|
|
assert result["model_id"] is None
|
|
assert result["cache_key"] is None
|
|
assert result["api_base"] is None
|
|
assert result["response_cost"] is None
|
|
assert result["additional_headers"] is None
|
|
|
|
# assert all fields in StandardLoggingHiddenParams are present
|
|
assert all(field in result for field in StandardLoggingHiddenParams.__annotations__)
|
|
|
|
# Test with valid params
|
|
hidden_params = {
|
|
"model_id": "test-model",
|
|
"cache_key": "test-cache",
|
|
"api_base": "https://api.test.com",
|
|
"response_cost": 0.001,
|
|
"additional_headers": {
|
|
"x-ratelimit-limit-requests": "2000",
|
|
"x-ratelimit-remaining-requests": "1999",
|
|
},
|
|
}
|
|
result = StandardLoggingPayloadSetup.get_hidden_params(hidden_params)
|
|
assert result["model_id"] == "test-model"
|
|
assert result["cache_key"] == "test-cache"
|
|
assert result["api_base"] == "https://api.test.com"
|
|
assert result["response_cost"] == 0.001
|
|
assert result["additional_headers"] is not None
|
|
assert result["additional_headers"]["x_ratelimit_limit_requests"] == 2000
|
|
# assert all fields in StandardLoggingHiddenParams are present
|
|
assert all(field in result for field in StandardLoggingHiddenParams.__annotations__)
|
|
|
|
|
|
def test_get_final_response_obj():
|
|
"""Test get_final_response_obj with different input types and redaction scenarios"""
|
|
# Test with direct response_obj
|
|
response_obj = {"choices": [{"message": {"content": "test content"}}]}
|
|
result = StandardLoggingPayloadSetup.get_final_response_obj(
|
|
response_obj=response_obj, init_response_obj=None, kwargs={}
|
|
)
|
|
assert result == response_obj
|
|
|
|
# Test redaction when litellm.turn_off_message_logging is True
|
|
litellm.turn_off_message_logging = True
|
|
try:
|
|
model_response = litellm.ModelResponse(
|
|
choices=[
|
|
litellm.Choices(message=litellm.Message(content="sensitive content"))
|
|
]
|
|
)
|
|
kwargs = {"messages": [{"role": "user", "content": "original message"}]}
|
|
result = StandardLoggingPayloadSetup.get_final_response_obj(
|
|
response_obj=model_response, init_response_obj=model_response, kwargs=kwargs
|
|
)
|
|
|
|
print("result", result)
|
|
print("type(result)", type(result))
|
|
# Verify response message content was redacted
|
|
assert result["choices"][0]["message"]["content"] == "redacted-by-litellm"
|
|
# Verify that redaction occurred in kwargs
|
|
assert kwargs["messages"][0]["content"] == "redacted-by-litellm"
|
|
finally:
|
|
# Reset litellm.turn_off_message_logging to its original value
|
|
litellm.turn_off_message_logging = False
|
|
|
|
|
|
def test_get_standard_logging_payload_trace_id():
|
|
"""Test _get_standard_logging_payload_trace_id with different input scenarios"""
|
|
# Test case 1: When litellm_trace_id is provided in litellm_params
|
|
from unittest.mock import MagicMock
|
|
|
|
# Create a mock Logging object
|
|
mock_logging_obj = MagicMock()
|
|
mock_logging_obj.litellm_trace_id = "default-trace-id"
|
|
|
|
# Test when litellm_trace_id is in litellm_params
|
|
litellm_params = {"litellm_trace_id": "dynamic-trace-id"}
|
|
result = StandardLoggingPayloadSetup._get_standard_logging_payload_trace_id(
|
|
logging_obj=mock_logging_obj, litellm_params=litellm_params
|
|
)
|
|
assert result == "dynamic-trace-id"
|
|
|
|
# Test case 2: When litellm_trace_id is not provided in litellm_params
|
|
litellm_params = {}
|
|
result = StandardLoggingPayloadSetup._get_standard_logging_payload_trace_id(
|
|
logging_obj=mock_logging_obj, litellm_params=litellm_params
|
|
)
|
|
assert result == "default-trace-id"
|
|
|
|
# Test case 3: When litellm_params is None
|
|
result = StandardLoggingPayloadSetup._get_standard_logging_payload_trace_id(
|
|
logging_obj=mock_logging_obj, litellm_params={}
|
|
)
|
|
assert result == "default-trace-id"
|
|
|
|
# Test case 4: When litellm_trace_id in params is not a string
|
|
litellm_params = {"litellm_trace_id": 12345}
|
|
result = StandardLoggingPayloadSetup._get_standard_logging_payload_trace_id(
|
|
logging_obj=mock_logging_obj, litellm_params=litellm_params
|
|
)
|
|
assert result == "12345"
|
|
assert isinstance(result, str)
|
|
|
|
|
|
def test_truncate_standard_logging_payload():
|
|
"""
|
|
1. original messages, response, and error_str should NOT BE MODIFIED, since these are from kwargs
|
|
2. the `messages`, `response`, and `error_str` in new standard_logging_payload should be truncated
|
|
"""
|
|
_custom_logger = CustomLogger()
|
|
standard_logging_payload: StandardLoggingPayload = (
|
|
create_standard_logging_payload_with_long_content()
|
|
)
|
|
original_messages = standard_logging_payload["messages"]
|
|
len_original_messages = len(str(original_messages))
|
|
original_response = standard_logging_payload["response"]
|
|
len_original_response = len(str(original_response))
|
|
original_error_str = standard_logging_payload["error_str"]
|
|
len_original_error_str = len(str(original_error_str))
|
|
|
|
_custom_logger.truncate_standard_logging_payload_content(standard_logging_payload)
|
|
|
|
# Original messages, response, and error_str should NOT BE MODIFIED
|
|
assert standard_logging_payload["messages"] != original_messages
|
|
assert standard_logging_payload["response"] != original_response
|
|
assert standard_logging_payload["error_str"] != original_error_str
|
|
assert len_original_messages == len(str(original_messages))
|
|
assert len_original_response == len(str(original_response))
|
|
assert len_original_error_str == len(str(original_error_str))
|
|
|
|
print(
|
|
"logged standard_logging_payload",
|
|
json.dumps(standard_logging_payload, indent=2),
|
|
)
|
|
|
|
# Logged messages, response, and error_str should be truncated
|
|
# assert len of messages is less than 10_500
|
|
assert len(str(standard_logging_payload["messages"])) < 10_500
|
|
# assert len of response is less than 10_500
|
|
assert len(str(standard_logging_payload["response"])) < 10_500
|
|
# assert len of error_str is less than 10_500
|
|
assert len(str(standard_logging_payload["error_str"])) < 10_500
|
|
|
|
|
|
def test_strip_trailing_slash():
|
|
common_api_base = "https://api.test.com"
|
|
assert (
|
|
StandardLoggingPayloadSetup.strip_trailing_slash(common_api_base + "/")
|
|
== common_api_base
|
|
)
|
|
assert (
|
|
StandardLoggingPayloadSetup.strip_trailing_slash(common_api_base)
|
|
== common_api_base
|
|
)
|
|
|
|
|
|
def test_get_error_information():
|
|
"""Test get_error_information with different types of exceptions"""
|
|
|
|
# Test with None
|
|
result = StandardLoggingPayloadSetup.get_error_information(None)
|
|
print("error_information", json.dumps(result, indent=2))
|
|
assert result["error_code"] == ""
|
|
assert result["error_class"] == ""
|
|
assert result["llm_provider"] == ""
|
|
|
|
# Test with a basic Exception
|
|
basic_exception = Exception("Test error")
|
|
result = StandardLoggingPayloadSetup.get_error_information(basic_exception)
|
|
print("error_information", json.dumps(result, indent=2))
|
|
assert result["error_code"] == ""
|
|
assert result["error_class"] == "Exception"
|
|
assert result["llm_provider"] == ""
|
|
|
|
# Test with litellm exception from provider
|
|
litellm_exception = litellm.exceptions.RateLimitError(
|
|
message="Test error",
|
|
llm_provider="openai",
|
|
model="gpt-5-mini",
|
|
response=None,
|
|
litellm_debug_info=None,
|
|
max_retries=None,
|
|
num_retries=None,
|
|
)
|
|
result = StandardLoggingPayloadSetup.get_error_information(litellm_exception)
|
|
print("error_information", json.dumps(result, indent=2))
|
|
assert result["error_code"] == "429"
|
|
assert result["error_class"] == "RateLimitError"
|
|
assert result["llm_provider"] == "openai"
|
|
assert result["error_message"] == "litellm.RateLimitError: Test error"
|
|
|
|
|
|
def test_get_response_time():
|
|
"""Test get_response_time with different streaming scenarios"""
|
|
# Test case 1: Non-streaming response
|
|
start_time = 1000.0
|
|
end_time = 1005.0
|
|
completion_start_time = 1003.0
|
|
stream = False
|
|
|
|
response_time = StandardLoggingPayloadSetup.get_response_time(
|
|
start_time_float=start_time,
|
|
end_time_float=end_time,
|
|
completion_start_time_float=completion_start_time,
|
|
stream=stream,
|
|
)
|
|
|
|
# For non-streaming, should return end_time - start_time
|
|
assert response_time == 5.0
|
|
|
|
# Test case 2: Streaming response
|
|
start_time = 1000.0
|
|
end_time = 1010.0
|
|
completion_start_time = 1002.0
|
|
stream = True
|
|
|
|
response_time = StandardLoggingPayloadSetup.get_response_time(
|
|
start_time_float=start_time,
|
|
end_time_float=end_time,
|
|
completion_start_time_float=completion_start_time,
|
|
stream=stream,
|
|
)
|
|
|
|
# For streaming, should return completion_start_time - start_time
|
|
assert response_time == 2.0
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"metadata, expected_requester_metadata",
|
|
[
|
|
({"metadata": {"test": "test2"}}, {"test": "test2"}),
|
|
({"metadata": {"test": "test2"}, "model_id": "test-model"}, {"test": "test2"}),
|
|
(
|
|
{
|
|
"metadata": {
|
|
"test": "test2",
|
|
},
|
|
"model_id": "test-model",
|
|
"requester_metadata": {"test": "test2"},
|
|
},
|
|
{"test": "test2"},
|
|
),
|
|
],
|
|
)
|
|
def test_standard_logging_metadata_requester_metadata(
|
|
metadata, expected_requester_metadata
|
|
):
|
|
result = StandardLoggingPayloadSetup.get_standard_logging_metadata(metadata)
|
|
assert result["requester_metadata"] == expected_requester_metadata
|
|
|
|
|
|
def test_cost_breakdown_in_standard_logging_payload():
|
|
"""
|
|
Test that cost breakdown fields are properly included in StandardLoggingPayload.
|
|
Tests input_cost, output_cost, tool_usage_cost, and total_cost fields.
|
|
"""
|
|
from litellm.litellm_core_utils.litellm_logging import (
|
|
get_standard_logging_object_payload,
|
|
Logging,
|
|
)
|
|
from litellm.types.utils import Usage
|
|
from datetime import datetime
|
|
import time
|
|
|
|
# Create a mock logging object with cost breakdown
|
|
logging_obj = Logging(
|
|
model="gpt-5.5",
|
|
messages=[{"role": "user", "content": "Hello"}],
|
|
stream=False,
|
|
call_type="completion",
|
|
start_time=datetime.now(),
|
|
litellm_call_id="test-123",
|
|
function_id="test-function",
|
|
)
|
|
|
|
# Simulate cost breakdown being stored during cost calculation
|
|
logging_obj.set_cost_breakdown(
|
|
input_cost=0.001,
|
|
output_cost=0.002,
|
|
total_cost=0.0035,
|
|
cost_for_built_in_tools_cost_usd_dollar=0.0005,
|
|
)
|
|
|
|
# Mock response object
|
|
mock_response = {
|
|
"id": "chatcmpl-123",
|
|
"object": "chat.completion",
|
|
"model": "gpt-5.5",
|
|
"usage": {
|
|
"prompt_tokens": 10,
|
|
"completion_tokens": 20,
|
|
"total_tokens": 30,
|
|
},
|
|
"choices": [
|
|
{
|
|
"index": 0,
|
|
"message": {
|
|
"role": "assistant",
|
|
"content": "Hello! How can I help you today?",
|
|
},
|
|
"finish_reason": "stop",
|
|
}
|
|
],
|
|
}
|
|
|
|
# Create kwargs
|
|
kwargs = {
|
|
"model": "gpt-5.5",
|
|
"messages": [{"role": "user", "content": "Hello"}],
|
|
"response_cost": 0.0035,
|
|
"custom_llm_provider": "openai",
|
|
}
|
|
|
|
start_time = datetime.now()
|
|
end_time = datetime.now()
|
|
|
|
# Get the standard logging payload
|
|
payload = get_standard_logging_object_payload(
|
|
kwargs=kwargs,
|
|
init_response_obj=mock_response,
|
|
start_time=start_time,
|
|
end_time=end_time,
|
|
logging_obj=logging_obj,
|
|
status="success",
|
|
)
|
|
|
|
# Verify the cost breakdown field is present
|
|
assert payload is not None
|
|
assert payload["cost_breakdown"] is not None
|
|
assert payload["cost_breakdown"]["input_cost"] == 0.001
|
|
assert payload["cost_breakdown"]["output_cost"] == 0.002
|
|
assert payload["cost_breakdown"]["tool_usage_cost"] == 0.0005
|
|
assert payload["cost_breakdown"]["total_cost"] == 0.0035
|
|
assert payload["response_cost"] == 0.0035
|
|
|
|
print("✅ Cost breakdown test passed!")
|
|
|
|
|
|
def test_cost_breakdown_missing_in_standard_logging_payload():
|
|
"""
|
|
Test that cost breakdown field is None when not available (e.g., for embedding calls)
|
|
"""
|
|
from litellm.litellm_core_utils.litellm_logging import (
|
|
get_standard_logging_object_payload,
|
|
Logging,
|
|
)
|
|
from datetime import datetime
|
|
|
|
# Create a mock logging object without cost breakdown
|
|
logging_obj = Logging(
|
|
model="gpt-5.5",
|
|
messages=[{"role": "user", "content": "Hello"}],
|
|
stream=False,
|
|
call_type="embedding", # Non-completion call type
|
|
start_time=datetime.now(),
|
|
litellm_call_id="test-123",
|
|
function_id="test-function",
|
|
)
|
|
|
|
# No cost breakdown stored
|
|
|
|
# Mock response object
|
|
mock_response = {
|
|
"object": "list",
|
|
"data": [{"embedding": [0.1, 0.2, 0.3]}],
|
|
"model": "text-embedding-3-small",
|
|
"usage": {"prompt_tokens": 10, "total_tokens": 10},
|
|
}
|
|
|
|
kwargs = {
|
|
"model": "text-embedding-3-small",
|
|
"input": ["Hello"],
|
|
"response_cost": 0.0001,
|
|
"custom_llm_provider": "openai",
|
|
}
|
|
|
|
start_time = datetime.now()
|
|
end_time = datetime.now()
|
|
|
|
# Get the standard logging payload
|
|
payload = get_standard_logging_object_payload(
|
|
kwargs=kwargs,
|
|
init_response_obj=mock_response,
|
|
start_time=start_time,
|
|
end_time=end_time,
|
|
logging_obj=logging_obj,
|
|
status="success",
|
|
)
|
|
|
|
# Verify the cost breakdown field is None for non-completion calls
|
|
assert payload is not None
|
|
assert payload["cost_breakdown"] is None
|
|
assert payload["response_cost"] == 0.0001
|
|
|
|
print("✅ Cost breakdown missing test passed!")
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"use_combined_usage_object",
|
|
[False, True],
|
|
ids=["normal_usage_dict", "combined_usage_object"],
|
|
)
|
|
def test_usage_dict_roundtrip_in_payload(use_combined_usage_object):
|
|
"""
|
|
Regression test: verify that usage data flows correctly through
|
|
get_standard_logging_object_payload without unnecessary Pydantic round-trips.
|
|
|
|
Checks:
|
|
- usage_object in StandardLoggingMetadata is a plain dict with correct token values
|
|
- prompt_tokens, completion_tokens, total_tokens on the payload match the usage dict
|
|
- Works for both normal usage dict path and combined_usage_object (realtime API) path
|
|
"""
|
|
from litellm.litellm_core_utils.litellm_logging import (
|
|
get_standard_logging_object_payload,
|
|
Logging,
|
|
)
|
|
from datetime import datetime
|
|
|
|
logging_obj = Logging(
|
|
model="gpt-5.5",
|
|
messages=[{"role": "user", "content": "Hi"}],
|
|
stream=False,
|
|
call_type="completion",
|
|
start_time=datetime.now(),
|
|
litellm_call_id="test-usage-roundtrip",
|
|
function_id="test-fn",
|
|
)
|
|
|
|
mock_response = {
|
|
"id": "chatcmpl-usage-test",
|
|
"object": "chat.completion",
|
|
"model": "gpt-5.5",
|
|
"usage": {
|
|
"prompt_tokens": 42,
|
|
"completion_tokens": 58,
|
|
"total_tokens": 100,
|
|
},
|
|
"choices": [
|
|
{
|
|
"index": 0,
|
|
"message": {"role": "assistant", "content": "Hello!"},
|
|
"finish_reason": "stop",
|
|
}
|
|
],
|
|
}
|
|
|
|
kwargs = {
|
|
"model": "gpt-5.5",
|
|
"messages": [{"role": "user", "content": "Hi"}],
|
|
"response_cost": 0.01,
|
|
"custom_llm_provider": "openai",
|
|
}
|
|
|
|
if use_combined_usage_object:
|
|
kwargs["combined_usage_object"] = Usage(
|
|
prompt_tokens=42, completion_tokens=58, total_tokens=100
|
|
)
|
|
|
|
start_time = datetime.now()
|
|
end_time = datetime.now()
|
|
|
|
payload = get_standard_logging_object_payload(
|
|
kwargs=kwargs,
|
|
init_response_obj=mock_response,
|
|
start_time=start_time,
|
|
end_time=end_time,
|
|
logging_obj=logging_obj,
|
|
status="success",
|
|
)
|
|
|
|
assert payload is not None
|
|
|
|
# Top-level token fields must match
|
|
assert payload["prompt_tokens"] == 42
|
|
assert payload["completion_tokens"] == 58
|
|
assert payload["total_tokens"] == 100
|
|
|
|
# usage_object in metadata must be a plain dict (not a Pydantic model)
|
|
usage_obj = payload["metadata"]["usage_object"]
|
|
assert isinstance(usage_obj, dict)
|
|
assert usage_obj["prompt_tokens"] == 42
|
|
assert usage_obj["completion_tokens"] == 58
|
|
assert usage_obj["total_tokens"] == 100
|
|
|
|
|
|
def test_standard_logging_payload_uses_actual_model_for_azure_router():
|
|
from litellm.litellm_core_utils.litellm_logging import (
|
|
Logging,
|
|
get_standard_logging_object_payload,
|
|
)
|
|
|
|
logging_obj = Logging(
|
|
model="azure_ai/model-router",
|
|
messages=[{"role": "user", "content": "Hello"}],
|
|
stream=False,
|
|
call_type="completion",
|
|
start_time=datetime.now(),
|
|
litellm_call_id="test-azure-router-opt-in",
|
|
function_id="test-fn",
|
|
)
|
|
|
|
kwargs = {
|
|
"model": "azure_ai/model-router",
|
|
"messages": [{"role": "user", "content": "Hello"}],
|
|
"response_cost": 0.00001,
|
|
"custom_llm_provider": "azure_ai",
|
|
}
|
|
mock_response = {
|
|
"id": "chatcmpl-azure-router-opt-in",
|
|
"object": "chat.completion",
|
|
"model": "azure_ai/gpt-5-nano-2025-08-07",
|
|
"usage": {"prompt_tokens": 10, "completion_tokens": 20, "total_tokens": 30},
|
|
"choices": [
|
|
{
|
|
"index": 0,
|
|
"message": {"role": "assistant", "content": "hello"},
|
|
"finish_reason": "stop",
|
|
}
|
|
],
|
|
}
|
|
|
|
payload = get_standard_logging_object_payload(
|
|
kwargs=kwargs,
|
|
init_response_obj=mock_response,
|
|
start_time=datetime.now(),
|
|
end_time=datetime.now(),
|
|
logging_obj=logging_obj,
|
|
status="success",
|
|
)
|
|
assert payload is not None
|
|
assert payload["model"] == "azure_ai/gpt-5-nano-2025-08-07"
|
|
|
|
|
|
def test_standard_logging_payload_uses_actual_model_for_azure_router_with_underscore():
|
|
from litellm.litellm_core_utils.litellm_logging import (
|
|
Logging,
|
|
get_standard_logging_object_payload,
|
|
)
|
|
|
|
logging_obj = Logging(
|
|
model="azure_ai/model_router",
|
|
messages=[{"role": "user", "content": "Hello"}],
|
|
stream=False,
|
|
call_type="completion",
|
|
start_time=datetime.now(),
|
|
litellm_call_id="test-azure-router-underscore",
|
|
function_id="test-fn",
|
|
)
|
|
|
|
kwargs = {
|
|
"model": "azure_ai/model_router",
|
|
"messages": [{"role": "user", "content": "Hello"}],
|
|
"response_cost": 0.00001,
|
|
"custom_llm_provider": "azure_ai",
|
|
}
|
|
mock_response = {
|
|
"id": "chatcmpl-azure-router-underscore",
|
|
"object": "chat.completion",
|
|
"model": "azure_ai/gpt-5-nano-2025-08-07",
|
|
"usage": {"prompt_tokens": 10, "completion_tokens": 20, "total_tokens": 30},
|
|
"choices": [
|
|
{
|
|
"index": 0,
|
|
"message": {"role": "assistant", "content": "hello"},
|
|
"finish_reason": "stop",
|
|
}
|
|
],
|
|
}
|
|
|
|
payload = get_standard_logging_object_payload(
|
|
kwargs=kwargs,
|
|
init_response_obj=mock_response,
|
|
start_time=datetime.now(),
|
|
end_time=datetime.now(),
|
|
logging_obj=logging_obj,
|
|
status="success",
|
|
)
|
|
assert payload is not None
|
|
assert payload["model"] == "azure_ai/gpt-5-nano-2025-08-07"
|
|
|
|
|
|
def test_merge_litellm_metadata_basic():
|
|
"""
|
|
Test that merge_litellm_metadata correctly merges metadata and litellm_metadata.
|
|
User API key fields (from metadata) should take precedence over model-related fields (from litellm_metadata).
|
|
"""
|
|
litellm_params = {
|
|
"metadata": {
|
|
"user_api_key": "test-key-123",
|
|
"user_api_key_user_id": "user-456",
|
|
"user_api_key_team_id": "team-789",
|
|
},
|
|
"litellm_metadata": {
|
|
"model_group": "gpt-4-group",
|
|
"model_info": {"id": "model-123"},
|
|
"tags": ["tag1", "tag2"],
|
|
},
|
|
}
|
|
|
|
result = StandardLoggingPayloadSetup.merge_litellm_metadata(litellm_params)
|
|
|
|
# Check that user API key fields are present
|
|
assert result["user_api_key"] == "test-key-123"
|
|
assert result["user_api_key_user_id"] == "user-456"
|
|
assert result["user_api_key_team_id"] == "team-789"
|
|
|
|
# Check that model-related fields are present
|
|
assert result["model_group"] == "gpt-4-group"
|
|
assert result["model_info"] == {"id": "model-123"}
|
|
assert result["tags"] == ["tag1", "tag2"]
|
|
|
|
|
|
def test_merge_litellm_metadata_precedence():
|
|
"""
|
|
Test that metadata fields take precedence over litellm_metadata when there are conflicts.
|
|
"""
|
|
litellm_params = {
|
|
"metadata": {
|
|
"tags": ["user-tag1", "user-tag2"],
|
|
"custom_field": "from_metadata",
|
|
},
|
|
"litellm_metadata": {
|
|
"tags": ["model-tag1", "model-tag2"], # This should NOT overwrite
|
|
"custom_field": "from_litellm_metadata", # This should NOT overwrite
|
|
"model_group": "gpt-4-group", # This should be included
|
|
},
|
|
}
|
|
|
|
result = StandardLoggingPayloadSetup.merge_litellm_metadata(litellm_params)
|
|
|
|
# metadata values should take precedence
|
|
assert result["tags"] == ["user-tag1", "user-tag2"]
|
|
assert result["custom_field"] == "from_metadata"
|
|
|
|
# litellm_metadata values should only be included if not in metadata
|
|
assert result["model_group"] == "gpt-4-group"
|
|
|
|
|
|
def test_merge_litellm_metadata_skip_non_serializable():
|
|
"""
|
|
Test that non-serializable objects like UserAPIKeyAuth are skipped.
|
|
"""
|
|
from litellm.proxy._types import UserAPIKeyAuth
|
|
|
|
user_api_key_auth = UserAPIKeyAuth(
|
|
api_key="test-key",
|
|
user_id="test-user",
|
|
team_id="test-team",
|
|
)
|
|
|
|
litellm_params = {
|
|
"metadata": {
|
|
"user_api_key": "test-key-123",
|
|
"user_api_key_auth": user_api_key_auth, # This should be skipped
|
|
"safe_field": "safe_value",
|
|
},
|
|
"litellm_metadata": {
|
|
"model_group": "gpt-4-group",
|
|
},
|
|
}
|
|
|
|
result = StandardLoggingPayloadSetup.merge_litellm_metadata(litellm_params)
|
|
|
|
# user_api_key_auth should be skipped
|
|
assert "user_api_key_auth" not in result
|
|
|
|
# Other fields should be present
|
|
assert result["user_api_key"] == "test-key-123"
|
|
assert result["safe_field"] == "safe_value"
|
|
assert result["model_group"] == "gpt-4-group"
|
|
|
|
|
|
def test_merge_litellm_metadata_empty_params():
|
|
"""
|
|
Test that merge_litellm_metadata handles empty or missing metadata gracefully.
|
|
"""
|
|
# Test with empty litellm_params
|
|
result = StandardLoggingPayloadSetup.merge_litellm_metadata({})
|
|
assert result == {}
|
|
|
|
# Test with only metadata
|
|
litellm_params = {
|
|
"metadata": {
|
|
"user_api_key": "test-key",
|
|
}
|
|
}
|
|
result = StandardLoggingPayloadSetup.merge_litellm_metadata(litellm_params)
|
|
assert result == {"user_api_key": "test-key"}
|
|
|
|
# Test with only litellm_metadata
|
|
litellm_params = {
|
|
"litellm_metadata": {
|
|
"model_group": "gpt-4-group",
|
|
}
|
|
}
|
|
result = StandardLoggingPayloadSetup.merge_litellm_metadata(litellm_params)
|
|
assert result == {"model_group": "gpt-4-group"}
|
|
|
|
# Test with None values
|
|
litellm_params = {
|
|
"metadata": None,
|
|
"litellm_metadata": None,
|
|
}
|
|
result = StandardLoggingPayloadSetup.merge_litellm_metadata(litellm_params)
|
|
assert result == {}
|
|
|
|
|
|
def test_merge_litellm_metadata_bedrock_passthrough_scenario():
|
|
"""
|
|
Test merge_litellm_metadata in a Bedrock passthrough scenario where both
|
|
user API key metadata and model metadata need to be merged.
|
|
|
|
This is the specific scenario that was fixed - bedrock passthrough requests
|
|
should include complete user authentication metadata in logging.
|
|
"""
|
|
litellm_params = {
|
|
"metadata": {
|
|
# User API key fields from authentication
|
|
"user_api_key": "sk-bedrock-test-key-123",
|
|
"user_api_key_hash": "hashed-key-123",
|
|
"user_api_key_user_id": "bedrock-user-456",
|
|
"user_api_key_team_id": "bedrock-team-789",
|
|
"user_api_key_org_id": "bedrock-org-101",
|
|
"user_api_key_alias": "bedrock-key-alias",
|
|
"user_api_key_team_alias": "bedrock-team-alias",
|
|
"user_api_key_end_user_id": "end-user-123",
|
|
"user_api_key_request_route": "/bedrock/model/invoke",
|
|
},
|
|
"litellm_metadata": {
|
|
# Model-related fields from Bedrock configuration
|
|
"model_group": "bedrock-claude-group",
|
|
"model_info": {
|
|
"id": "anthropic.claude-3-sonnet",
|
|
"mode": "chat",
|
|
},
|
|
"aws_region_name": "us-east-1",
|
|
"tags": ["production", "bedrock"],
|
|
},
|
|
}
|
|
|
|
result = StandardLoggingPayloadSetup.merge_litellm_metadata(litellm_params)
|
|
|
|
# Verify all user API key fields are present
|
|
assert result["user_api_key"] == "sk-bedrock-test-key-123"
|
|
assert result["user_api_key_hash"] == "hashed-key-123"
|
|
assert result["user_api_key_user_id"] == "bedrock-user-456"
|
|
assert result["user_api_key_team_id"] == "bedrock-team-789"
|
|
assert result["user_api_key_org_id"] == "bedrock-org-101"
|
|
assert result["user_api_key_alias"] == "bedrock-key-alias"
|
|
assert result["user_api_key_team_alias"] == "bedrock-team-alias"
|
|
assert result["user_api_key_end_user_id"] == "end-user-123"
|
|
assert result["user_api_key_request_route"] == "/bedrock/model/invoke"
|
|
|
|
# Verify all model-related fields are present
|
|
assert result["model_group"] == "bedrock-claude-group"
|
|
assert result["model_info"] == {
|
|
"id": "anthropic.claude-3-sonnet",
|
|
"mode": "chat",
|
|
}
|
|
assert result["aws_region_name"] == "us-east-1"
|
|
assert result["tags"] == ["production", "bedrock"]
|
|
|
|
# Verify total number of fields (9 user fields + 4 model fields = 13)
|
|
assert len(result) == 13
|