scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-14 23:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 102

fix(proxy): replace assert in team member user resolution (P2)
Some checks failed
Unit Tests: Security / security (push) Has been cancelled
Details
Unit Tests: Caching (Redis) / caching-redis (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / assert-shard-coverage (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / proxy-utils (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / auth-checks (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / budgets (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / custom-logging (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / db-and-spend (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / endpoints-and-responses (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / guardrails-hooks (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / jwt-and-keys (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / key-generation (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / logging-misc (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / proxy-runtime (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / proxy-server-core (push) Has been cancelled
Details
Unit Tests: Proxy DB Operations / schema-migration (push) Has been cancelled
Details

Browse source 
Use explicit HTTPException when user_id and user_email are both missing
so behavior is preserved under python -O. Add unit test via model_construct.

Made-with: Cursor
This commit is contained in:
Milan 2026-05-01 02:08:02 +03:00
parent e7950b348d
commit 2bb9b2b177
No known key found for this signature in database
2 changed files with 84 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
litellm/proxy/management_endpoints/team_endpoints.py
View file

@ -2673,7 +2673,11 @@ def _resolve_team_member_user_id_from_request(
) -> str:
if data.user_id is not None:
return data.user_id
assert data.user_email is not None
if data.user_email is None:
raise HTTPException(
status_code=400,
detail={"error": "Either user_id or user_email needs to be passed in"},
)
for member in returned_team_info["team_info"].members_with_roles:
if member.user_email is not None and member.user_email == data.user_email:
if member.user_id is None:

120
tests/test_litellm/proxy/test_team_member_update.py
View file

@ -21,6 +21,7 @@ from litellm.proxy.management_endpoints.team_endpoints import team_member_update
# Helpers
# ---------------------------------------------------------------------------
def _make_request():
scope = {"type": "http", "method": "POST", "path": "/team/member_update"}
return Request(scope)
@ -75,6 +76,7 @@ def _mock_prisma(team_table, team_budget_duration=None):
# Tests for budget_duration resolution logic
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_team_member_update_explicit_budget_duration():
"""
@ -91,16 +93,18 @@ async def test_team_member_update_explicit_budget_duration():
budget_duration="30d",
)
with patch("litellm.proxy.proxy_server.prisma_client", prisma), \
patch("litellm.proxy.proxy_server.premium_user", True), \
patch(
"litellm.proxy.management_endpoints.team_endpoints.team_info",
new=AsyncMock(return_value=_team_info_response(team_table)),
), \
patch(
"litellm.proxy.management_endpoints.team_endpoints._upsert_budget_and_membership",
new=AsyncMock(),
) as mock_upsert:
with (
patch("litellm.proxy.proxy_server.prisma_client", prisma),
patch("litellm.proxy.proxy_server.premium_user", True),
patch(
"litellm.proxy.management_endpoints.team_endpoints.team_info",
new=AsyncMock(return_value=_team_info_response(team_table)),
),
patch(
"litellm.proxy.management_endpoints.team_endpoints._upsert_budget_and_membership",
new=AsyncMock(),
) as mock_upsert,
):
await team_member_update(data, _make_request(), _admin_auth())
mock_upsert.assert_awaited_once()
@ -122,20 +126,27 @@ async def test_team_member_update_explicit_null_budget_duration():
# Simulate the client sending {"budget_duration": null} by including the
# field in the model_fields_set while keeping the value None.
data = TeamMemberUpdateRequest.model_validate(
{"team_id": "team-1", "user_id": "user-A", "max_budget_in_team": 5.0, "budget_duration": None}
{
"team_id": "team-1",
"user_id": "user-A",
"max_budget_in_team": 5.0,
"budget_duration": None,
}
)
assert "budget_duration" in data.model_fields_set # sanity check
with patch("litellm.proxy.proxy_server.prisma_client", prisma), \
patch("litellm.proxy.proxy_server.premium_user", True), \
patch(
"litellm.proxy.management_endpoints.team_endpoints.team_info",
new=AsyncMock(return_value=_team_info_response(team_table)),
), \
patch(
"litellm.proxy.management_endpoints.team_endpoints._upsert_budget_and_membership",
new=AsyncMock(),
) as mock_upsert:
with (
patch("litellm.proxy.proxy_server.prisma_client", prisma),
patch("litellm.proxy.proxy_server.premium_user", True),
patch(
"litellm.proxy.management_endpoints.team_endpoints.team_info",
new=AsyncMock(return_value=_team_info_response(team_table)),
),
patch(
"litellm.proxy.management_endpoints.team_endpoints._upsert_budget_and_membership",
new=AsyncMock(),
) as mock_upsert,
):
await team_member_update(data, _make_request(), _admin_auth())
mock_upsert.assert_awaited_once()
@ -162,16 +173,18 @@ async def test_team_member_update_inherits_team_budget_duration():
)
assert "budget_duration" not in data.model_fields_set # sanity check
with patch("litellm.proxy.proxy_server.prisma_client", prisma), \
patch("litellm.proxy.proxy_server.premium_user", True), \
patch(
"litellm.proxy.management_endpoints.team_endpoints.team_info",
new=AsyncMock(return_value=_team_info_response(team_table)),
), \
patch(
"litellm.proxy.management_endpoints.team_endpoints._upsert_budget_and_membership",
new=AsyncMock(),
) as mock_upsert:
with (
patch("litellm.proxy.proxy_server.prisma_client", prisma),
patch("litellm.proxy.proxy_server.premium_user", True),
patch(
"litellm.proxy.management_endpoints.team_endpoints.team_info",
new=AsyncMock(return_value=_team_info_response(team_table)),
),
patch(
"litellm.proxy.management_endpoints.team_endpoints._upsert_budget_and_membership",
new=AsyncMock(),
) as mock_upsert,
):
await team_member_update(data, _make_request(), _admin_auth())
mock_upsert.assert_awaited_once()
@ -197,16 +210,18 @@ async def test_team_member_update_no_team_budget_duration_defaults_to_none():
max_budget_in_team=5.0,
)
with patch("litellm.proxy.proxy_server.prisma_client", prisma), \
patch("litellm.proxy.proxy_server.premium_user", True), \
patch(
"litellm.proxy.management_endpoints.team_endpoints.team_info",
new=AsyncMock(return_value=_team_info_response(team_table)),
), \
patch(
"litellm.proxy.management_endpoints.team_endpoints._upsert_budget_and_membership",
new=AsyncMock(),
) as mock_upsert:
with (
patch("litellm.proxy.proxy_server.prisma_client", prisma),
patch("litellm.proxy.proxy_server.premium_user", True),
patch(
"litellm.proxy.management_endpoints.team_endpoints.team_info",
new=AsyncMock(return_value=_team_info_response(team_table)),
),
patch(
"litellm.proxy.management_endpoints.team_endpoints._upsert_budget_and_membership",
new=AsyncMock(),
) as mock_upsert,
):
await team_member_update(data, _make_request(), _admin_auth())
mock_upsert.assert_awaited_once()
@ -215,10 +230,33 @@ async def test_team_member_update_no_team_budget_duration_defaults_to_none():
prisma.db.litellm_budgettable.find_unique.assert_not_awaited()
def test_resolve_team_member_user_id_without_identifier_raises():
"""
_resolve_team_member_user_id_from_request must not rely on ``assert`` for
invariants (stripped under ``python -O``); missing identifiers raise 400.
"""
from litellm.proxy.management_endpoints.team_endpoints import (
_resolve_team_member_user_id_from_request,
)
team_table = _make_team_table()
info = _team_info_response(team_table)
data = TeamMemberUpdateRequest.model_construct(
team_id="team-1", user_id=None, user_email=None
)
with pytest.raises(HTTPException) as exc_info:
_resolve_team_member_user_id_from_request(data, info)
assert exc_info.value.status_code == 400
assert exc_info.value.detail == {
"error": "Either user_id or user_email needs to be passed in"
}
# ---------------------------------------------------------------------------
# Role / premium-user guard tests
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_ateam_member_update_admin_requires_premium(monkeypatch):
# Arrange: patch prisma_client and premium_user