scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-12 23:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 89

Merge pull request #40554 from haydster7/fix/team-alias-model-metadata

Browse source 
fix(proxy): retain metadata when retrieving public team aliases
This commit is contained in:
ryan-crabbe-berri 2026-09-11 12:29:46 -07:00 • committed by GitHub
commit e790b450b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 108 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
litellm/proxy/proxy_server.py
View file

@ -10857,14 +10857,14 @@ async def model_info(
# Use the actual litellm model from the deployment to get provider info
_, provider, _, _ = litellm.get_llm_provider(model=deployment.litellm_params.model)
response_id: Final = internal_to_public.get(resolved_model_id, model_id)
return create_model_info_response(
model_id=response_id,
response: Final = create_model_info_response(
model_id=resolved_model_id,
provider=provider,
include_metadata=False,
fallback_type=None,
llm_router=llm_router,
)
return {**response, "id": internal_to_public.get(resolved_model_id, model_id)} # mutable-ok: response id differs
def _blocked_response_usage(original_response: object | None) -> "litellm.Usage":

106
tests/test_litellm/proxy/proxy_server/test_team_model_name_translation.py
View file

@ -27,6 +27,7 @@ from litellm.proxy.proxy_server import (
_get_proxy_model_info,
_translate_model_name_for_response,
)
from litellm.types.router import DeploymentModelListingInfo
def _team_row() -> dict:
@ -1089,6 +1090,101 @@ async def test_v1_models_metadata_does_not_leak_other_team_fallbacks(monkeypatch
]
@pytest.mark.asyncio
async def test_v1_models_team_alias_inherits_token_limits_and_chat_mode(monkeypatch):
team_dep = {
"model_name": "model_name_teamX_terra_uuid",
"litellm_params": {"model": "azure/gpt-4.1"},
"model_info": {
"id": "id-terra",
"team_id": "teamX",
"team_public_model_name": "GPT Terra",
"access_groups": ["grp-a"],
"mode": "chat",
"max_input_tokens": 876000,
"max_output_tokens": 128000,
},
}
router = MagicMock()
router.get_model_names.return_value = ["model_name_teamX_terra_uuid"]
router.get_model_access_groups.return_value = {"grp-a": ["model_name_teamX_terra_uuid"]}
router.get_fully_blocked_model_names.return_value = set()
router.get_model_listing_info.return_value = DeploymentModelListingInfo(
cost_map_keys=("azure/gpt-4.1",),
max_input_tokens=876000,
max_output_tokens=128000,
)
router.get_configured_mode.return_value = "chat"
router.model_list = [team_dep]
router.get_model_list.return_value = [team_dep]
router.get_model_group_info.return_value = None
monkeypatch.setattr(ps, "llm_router", router)
monkeypatch.setattr(ps, "user_model", None)
monkeypatch.setattr(ps, "general_settings", {"use_team_public_model_name": True})
key = UserAPIKeyAuth(user_id="user", api_key="***", models=["grp-a"], team_models=[])
response = await ps.model_list(user_api_key_dict=key, include_metadata=True)
assert response["data"] == [
{
"id": "GPT Terra",
"object": "model",
"created": 1677610602,
"owned_by": "openai",
"mode": "chat",
"max_input_tokens": 876000,
"max_output_tokens": 128000,
"metadata": {"fallbacks": []},
}
]
@pytest.mark.asyncio
async def test_v1_models_team_image_alias_inherits_image_generation_mode(monkeypatch):
team_dep = {
"model_name": "model_name_teamX_image_uuid",
"litellm_params": {"model": "openai/gpt-image-1"},
"model_info": {
"id": "id-image",
"team_id": "teamX",
"team_public_model_name": "image",
"access_groups": ["grp-a"],
"mode": "image_generation",
},
}
router = MagicMock()
router.get_model_names.return_value = ["model_name_teamX_image_uuid"]
router.get_model_access_groups.return_value = {"grp-a": ["model_name_teamX_image_uuid"]}
router.get_fully_blocked_model_names.return_value = set()
router.get_model_listing_info.return_value = DeploymentModelListingInfo(
cost_map_keys=("openai/gpt-image-1",),
max_input_tokens=None,
max_output_tokens=None,
)
router.get_configured_mode.return_value = "image_generation"
router.model_list = [team_dep]
router.get_model_list.return_value = [team_dep]
router.get_model_group_info.return_value = None
monkeypatch.setattr(ps, "llm_router", router)
monkeypatch.setattr(ps, "user_model", None)
monkeypatch.setattr(ps, "general_settings", {"use_team_public_model_name": True})
key = UserAPIKeyAuth(user_id="user", api_key="***", models=["grp-a"], team_models=[])
response = await ps.model_list(user_api_key_dict=key)
assert response["data"] == [
{
"id": "image",
"object": "model",
"created": 1677610602,
"owned_by": "openai",
"mode": "image_generation",
}
]
def test_translate_team_model_names_for_listing_swaps_and_dedupes():
"""Internal team routing keys -> public name; sibling deployments sharing a
public name collapse to one entry (order preserved); globals untouched."""
@ -1427,8 +1523,13 @@ async def test_retrieve_model_by_public_name_returns_200(monkeypatch):
team_row = _team_row()
router = _public_named_router(team_row)
deployment = MagicMock()
deployment.litellm_params.model = "azure/gpt-5.2-low-rpm-testing"
deployment.litellm_params.model = "azure/gpt-4.1"
router.get_deployment_by_model_group_name.return_value = deployment
router.get_model_listing_info.return_value = DeploymentModelListingInfo(
cost_map_keys=("azure/gpt-4.1",),
max_input_tokens=16384,
max_output_tokens=4096,
)
monkeypatch.setattr(ps, "llm_router", router)
monkeypatch.setattr(ps, "general_settings", {})
@ -1445,6 +1546,9 @@ async def test_retrieve_model_by_public_name_returns_200(monkeypatch):
resp = await ps.model_info(model_id="team-claude-sonnet", user_api_key_dict=key)
assert resp["id"] == "team-claude-sonnet"
assert resp.get("mode") == "chat"
assert resp.get("max_input_tokens") == 16384
assert resp.get("max_output_tokens") == 4096
# lookup happened by the internal routing key, not the public name
router.get_deployment_by_model_group_name.assert_called_once_with(
"model_name_team-abc-123_4a6b8"