scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-10 03:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 85

Fix end user cost tracking in the responses API (#15124)

Browse source 
#13860
This commit is contained in:
Georg Wölflein 2025-10-03 00:13:57 +02:00 • committed by GitHub
parent f8f4207994
commit dbfa8ec921
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
litellm/utils.py
View file

@ -90,6 +90,7 @@ from litellm.litellm_core_utils.cached_imports import (
get_set_callbacks,
)
from litellm.litellm_core_utils.core_helpers import (
get_litellm_metadata_from_kwargs,
map_finish_reason,
process_response_headers,
)
@ -7582,7 +7583,7 @@ def get_end_user_id_for_cost_tracking(
service_type: "litellm_logging" or "prometheus" - used to allow prometheus only disable cost tracking.
"""
_metadata = cast(dict, litellm_params.get("metadata", {}) or {})
_metadata = cast(dict, get_litellm_metadata_from_kwargs(dict(litellm_params=litellm_params)))
end_user_id = cast(
Optional[str],

38
tests/litellm_utils_tests/test_utils.py
View file

@ -1426,6 +1426,44 @@ def test_get_end_user_id_for_cost_tracking_prometheus_only(
)
@pytest.mark.parametrize(
"litellm_params, expected_end_user_id",
[
# Test with only metadata field (old behavior)
({"metadata": {"user_api_key_end_user_id": "user_from_metadata"}}, "user_from_metadata"),
# Test with only litellm_metadata field (new behavior)
({"litellm_metadata": {"user_api_key_end_user_id": "user_from_litellm_metadata"}}, "user_from_litellm_metadata"),
# Test with both fields - metadata should take precedence for user_api_key fields
({"metadata": {"user_api_key_end_user_id": "user_from_metadata"},
"litellm_metadata": {"user_api_key_end_user_id": "user_from_litellm_metadata"}},
"user_from_metadata"),
# Test with user_api_key_end_user_id in litellm_params (should take precedence over metadata)
({"user_api_key_end_user_id": "user_from_params",
"metadata": {"user_api_key_end_user_id": "user_from_metadata"}},
"user_from_params"),
# Test with empty metadata but valid litellm_metadata
({"metadata": {}, "litellm_metadata": {"user_api_key_end_user_id": "user_from_litellm_metadata"}},
"user_from_litellm_metadata"),
# Test with no metadata fields
({}, None),
],
)
def test_get_end_user_id_for_cost_tracking_metadata_handling(
litellm_params, expected_end_user_id
):
"""
Test that get_end_user_id_for_cost_tracking correctly handles both metadata and litellm_metadata
fields using the get_litellm_metadata_from_kwargs helper function.
"""
from litellm.utils import get_end_user_id_for_cost_tracking
# Ensure cost tracking is enabled for this test
litellm.disable_end_user_cost_tracking = False
result = get_end_user_id_for_cost_tracking(litellm_params=litellm_params)
assert result == expected_end_user_id
def test_is_prompt_caching_enabled_error_handling():
"""
Assert that `is_prompt_caching_valid_prompt` safely handles errors in `token_counter`.