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

Skip org limit check when non-throughput fields are updated

Browse source 
Only run org validation (get_org_object + _check_org_key_limits) when
the update actually touches throughput-related fields (tpm_limit,
rpm_limit, or organization_id). Previously, any update to a key
belonging to an org would trigger the check, which would fail with a
400 if the org had been deleted — blocking unrelated field changes.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
yuneng-jiang 2026-03-13 15:38:42 -07:00
parent 133471f882
commit 1038a119ce
2 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
litellm/proxy/management_endpoints/key_management_endpoints.py
View file

@ -1963,11 +1963,16 @@ async def update_key_fn(
user_api_key_cache=user_api_key_cache,
)
# Check org key limits if organization_id is being set or already exists on the key
# Check org key limits only when throughput-related fields or organization_id change
_org_id_to_check = data.organization_id or getattr(
existing_key_row, "organization_id", None
)
if _org_id_to_check is not None:
_throughput_fields_changed = (
data.organization_id is not None
or data.tpm_limit is not None
or data.rpm_limit is not None
)
if _org_id_to_check is not None and _throughput_fields_changed:
org_table = await get_org_object(
org_id=_org_id_to_check,
user_api_key_cache=user_api_key_cache,

36
tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py
View file

@ -6921,6 +6921,42 @@ async def test_check_org_key_limits_on_update_excludes_self():
)
def test_update_key_skips_org_check_when_no_throughput_fields_changed():
"""
Test that the org limit check guard condition correctly skips validation
when only non-throughput fields change on a key that belongs to an org.
This prevents blocking updates when the org has been deleted.
"""
# Updating only key_alias — no throughput fields changed
data = UpdateKeyRequest(key="sk-test-key", key_alias="new-alias")
_throughput_fields_changed = (
data.organization_id is not None
or data.tpm_limit is not None
or data.rpm_limit is not None
)
assert _throughput_fields_changed is False
# Updating tpm_limit — throughput field changed
data_with_tpm = UpdateKeyRequest(key="sk-test-key", tpm_limit=5000)
_throughput_fields_changed_tpm = (
data_with_tpm.organization_id is not None
or data_with_tpm.tpm_limit is not None
or data_with_tpm.rpm_limit is not None
)
assert _throughput_fields_changed_tpm is True
# Updating organization_id — org change triggers check
data_with_org = UpdateKeyRequest(
key="sk-test-key", organization_id="new-org"
)
_throughput_fields_changed_org = (
data_with_org.organization_id is not None
or data_with_org.tpm_limit is not None
or data_with_org.rpm_limit is not None
)
assert _throughput_fields_changed_org is True
def test_update_key_request_has_organization_id():
"""
Test that UpdateKeyRequest accepts organization_id field.