scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-08-28 05:25:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 36

fix(proxy): fall back on empty-string model_group in aggregated usage SQL

Browse source
This commit is contained in:
mateo-berri 2026-07-29 09:59:34 -07:00
parent 802ed1c74f
commit d17387e2e1
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
litellm/proxy/management_endpoints/common_daily_activity.py
View file

@ -575,11 +575,11 @@ def _build_aggregated_sql_query(
date,
api_key,
model,
COALESCE(model_group, model) AS model_group,
COALESCE(NULLIF(model_group, ''), model) AS model_group,
custom_llm_provider,
mcp_namespaced_tool_name,
endpoint,
GROUPING(date, api_key, model, COALESCE(model_group, model),
GROUPING(date, api_key, model, COALESCE(NULLIF(model_group, ''), model),
custom_llm_provider, mcp_namespaced_tool_name,
endpoint) AS group_level,
SUM(spend)::float AS spend,
@ -600,8 +600,8 @@ def _build_aggregated_sql_query(
(date, api_key),
(date, model),
(date, model, api_key),
(date, COALESCE(model_group, model)),
(date, COALESCE(model_group, model), api_key),
(date, COALESCE(NULLIF(model_group, ''), model)),
(date, COALESCE(NULLIF(model_group, ''), model), api_key),
(date, custom_llm_provider),
(date, custom_llm_provider, api_key),
(date, mcp_namespaced_tool_name),

15
tests/test_litellm/proxy/management_endpoints/test_common_daily_activity.py
View file

@ -911,12 +911,15 @@ class TestBuildAggregatedSqlQuery:
assert "api_key = $5" in sql
def test_model_group_rollups_fall_back_to_model_name(self):
"""Aggregated model_groups rollups must coalesce NULL model_group to model.
"""Aggregated model_groups rollups must fall back to model for group-less rows.
The (date, model_group) grouping level cannot recover the model column
after the fact (it is rolled up), so the fallback has to happen in SQL;
without it, group-less rows silently vanish from the model_groups
breakdown that the usage UI now renders by default.
breakdown that the usage UI now renders by default. Group-less rows are
stored as empty strings, not NULL (spend_tracking_utils defaults
model_group to ""), so a plain COALESCE is not enough: the fallback must
be NULLIF-wrapped to catch both
"""
sql, _ = _build_aggregated_sql_query(
table_name="litellm_dailyuserspend",
@ -929,13 +932,15 @@ class TestBuildAggregatedSqlQuery:
)
normalized = " ".join(sql.split())
assert "COALESCE(model_group, model) AS model_group" in normalized
fallback = "COALESCE(NULLIF(model_group, ''), model)"
assert f"{fallback} AS model_group" in normalized
assert (
"GROUPING(date, api_key, model, COALESCE(model_group, model), "
f"GROUPING(date, api_key, model, {fallback}, "
"custom_llm_provider, mcp_namespaced_tool_name, endpoint) AS group_level" in normalized
)
assert "(date, COALESCE(model_group, model)), (date, COALESCE(model_group, model), api_key)," in normalized
assert f"(date, {fallback}), (date, {fallback}, api_key)," in normalized
assert "(date, model_group)" not in normalized
assert "COALESCE(model_group, model)" not in normalized
@pytest.mark.asyncio