scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-02 02:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 101

Merge df39026752 into 5be0797d24

Browse source
This commit is contained in:
Junhyuk Lee 2026-06-01 09:24:55 -07:00 • committed by GitHub
commit 1967f6c7da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 61 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
litellm/proxy/spend_tracking/spend_tracking_utils.py
View file

@ -298,9 +298,10 @@ def get_logging_payload( # noqa: PLR0915
or standard_logging_payload["metadata"].get("user_api_key_hash")
or ""
)
end_user_id = end_user_id or standard_logging_payload["metadata"].get(
"user_api_key_end_user_id"
)
if not litellm.disable_end_user_cost_tracking:
end_user_id = end_user_id or standard_logging_payload["metadata"].get(
"user_api_key_end_user_id"
)
# BUG FIX: Don't overwrite api_key when standard_logging_payload is None
# The api_key was already extracted from metadata (line 243) and hashed (lines 256-259)
request_tags = (

57
tests/logging_callback_tests/test_spend_logs.py
View file

@ -558,3 +558,60 @@ def test_truncation_preserves_beginning_and_end():
kept_chars = expected_start_chars + expected_end_chars
expected_skipped = total_chars - kept_chars
assert str(expected_skipped) in truncated_content
def test_disable_end_user_cost_tracking_blocks_or_fallback():
"""
Regression test for https://github.com/BerriAI/litellm/issues/27038
When litellm.disable_end_user_cost_tracking=True, the or-fallback inside
get_logging_payload() must not repopulate end_user from
standard_logging_payload["metadata"]["user_api_key_end_user_id"].
"""
original = litellm.disable_end_user_cost_tracking
try:
litellm.disable_end_user_cost_tracking = True
input_args: dict = {
"kwargs": {
"model": "gpt-3.5-turbo",
"messages": [{"role": "user", "content": "Hello"}],
"litellm_params": {
"metadata": {
"user_api_key": "fake_key",
"user_api_key_end_user_id": "should-be-blocked",
}
},
"standard_logging_object": {
"metadata": {
"user_api_key_end_user_id": "should-be-blocked",
},
"request_tags": [],
"model_map_information": {"tpm": 0, "rpm": 0},
},
},
"response_obj": litellm.ModelResponse(
id="chatcmpl-test-disable-end-user",
choices=[
litellm.Choices(
finish_reason="stop",
index=0,
message=litellm.Message(content="Hi", role="assistant"),
)
],
model="gpt-3.5-turbo",
usage=litellm.Usage(
completion_tokens=1, prompt_tokens=1, total_tokens=2
),
),
"start_time": datetime.datetime.now(),
"end_time": datetime.datetime.now(),
}
payload: SpendLogsPayload = get_logging_payload(**input_args)
assert payload["end_user"] == "", (
f"Expected end_user='' when disable_end_user_cost_tracking=True, got {payload['end_user']!r}"
)
finally:
litellm.disable_end_user_cost_tracking = original