This commit is contained in:
Seongho Bae 2026-09-18 03:42:32 -07:00 • committed by GitHub
commit f824a5a399
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 40 additions and 8 deletions

View file

@ -2102,6 +2102,13 @@ def prepare_metadata_fields(data: BaseModel, non_default_values: dict, existing_
"""
Check LiteLLM_ManagementEndpoint_MetadataFields (proxy/_types.py) for fields that are allowed to be updated
"""
data_json: Final = _as_object_dict(data.model_dump(exclude_unset=True, exclude_none=True))
if "metadata" not in non_default_values and not any(
field in LiteLLM_ManagementEndpoint_MetadataFields or field in LiteLLM_ManagementEndpoint_MetadataFields_Premium
for field in data_json
):
return non_default_values
raise_on_invalid_key_logging_config(non_default_values.get("metadata"))
if "metadata" not in non_default_values: # allow user to set metadata to none
@ -2124,8 +2131,6 @@ def prepare_metadata_fields(data: BaseModel, non_default_values: dict, existing_
)
casted_metadata[reserved_field] = existing_value
data_json: Final = _as_object_dict(data.model_dump(exclude_unset=True, exclude_none=True))
try:
for k, v in data_json.items():
if k in LiteLLM_ManagementEndpoint_MetadataFields:

View file

@ -30,6 +30,9 @@ from litellm.proxy.management_endpoints.internal_user_endpoints import (
new_user,
ui_view_users,
)
from litellm.proxy.management_endpoints.key_management_endpoints import (
prepare_metadata_fields,
)
from litellm.proxy.proxy_server import app
client = TestClient(app)
@ -669,6 +672,22 @@ def test_update_user_request_pydantic_object():
assert data_json == {"user_email": "test@example.com"}
def test_update_internal_user_budget_omits_unchanged_metadata():
"""A scalar user update must not write metadata from an earlier read."""
request_data: Final = UpdateUserRequest(user_id="test-user", max_budget=100)
update_values: Final = _update_internal_user_params(
request_data.model_dump(exclude_unset=True), request_data
)
prepared_values: Final = prepare_metadata_fields(
data=request_data,
non_default_values=update_values,
existing_metadata={"owner_label": "earlier-value"},
)
assert "metadata" not in prepared_values
assert prepared_values["max_budget"] == 100
def test_update_internal_user_params_email():
"""
Test that _update_internal_user_params correctly processes an email-only update

View file

@ -1,6 +1,7 @@
from typing import Final
import json
from datetime import datetime, timedelta, timezone
from typing import Final
import litellm
import pytest
@ -1924,18 +1925,25 @@ async def test_update_rejects_whole_metadata_null_on_service_account_key():
@pytest.mark.asyncio
async def test_update_without_metadata_still_preserves_existing():
"""Omitting metadata entirely must not drop existing metadata fields."""
data = UpdateKeyRequest(key="sk-1", max_budget=100)
existing_key = LiteLLM_VerificationToken(
"""A budget-only update must preserve metadata written after the initial read."""
data: Final = UpdateKeyRequest(key="sk-1", max_budget=100)
existing_key: Final = LiteLLM_VerificationToken(
token="hashed",
team_id="IJ",
metadata={"service_account_id": "sa-123", "other": "kept"},
)
result = await prepare_key_update_data(data=data, existing_key_row=existing_key)
result: Final = await prepare_key_update_data(data=data, existing_key_row=existing_key)
assert result["metadata"]["service_account_id"] == "sa-123"
assert result["metadata"]["other"] == "kept"
current_row: Final = {
"max_budget": 50,
"metadata": {"service_account_id": "sa-123", "other": "concurrent-value"},
}
saved_row: Final = current_row | result
assert "metadata" not in result
assert saved_row["max_budget"] == 100
assert saved_row["metadata"] == current_row["metadata"]
@pytest.mark.asyncio