From 45f3f8cd1f03cec04839977e4f771bdbfd86e9a0 Mon Sep 17 00:00:00 2001 From: mateo-berri <277851410+mateo-berri@users.noreply.github.com> Date: Tue, 20 Oct 2026 06:59:31 -0700 Subject: [PATCH] fix(proxy): apply Ask AI key aliases before the global alias map, as auth does --- .../usage_endpoints/ai_usage_chat.py | 15 +++++++-------- .../usage_endpoints/test_ai_usage_chat.py | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/litellm/proxy/management_endpoints/usage_endpoints/ai_usage_chat.py b/litellm/proxy/management_endpoints/usage_endpoints/ai_usage_chat.py index 66f7516047a..833b3d5e565 100644 --- a/litellm/proxy/management_endpoints/usage_endpoints/ai_usage_chat.py +++ b/litellm/proxy/management_endpoints/usage_endpoints/ai_usage_chat.py @@ -564,20 +564,19 @@ async def resolve_usage_ai_chat_model( from litellm.proxy.proxy_server import llm_router team_aliased_model: Final = resolve_team_model_alias(_requested_model(model, router_settings), user_api_key_dict) - global_aliased_model: Final = litellm.model_alias_map.get(team_aliased_model, team_aliased_model) - key_aliases: Final = key_model_aliases_for_auth_check(user_api_key_dict) - key_aliased_model: Final = ( - key_aliases.get(global_aliased_model, global_aliased_model) if key_aliases is not None else global_aliased_model - ) + key_aliases: Final = key_model_aliases_for_auth_check(user_api_key_dict) or {} + key_aliased_model: Final = key_aliases.get(team_aliased_model, team_aliased_model) + global_aliased_model: Final = litellm.model_alias_map.get(key_aliased_model, key_aliased_model) + authorized_model: Final = key_aliases.get(global_aliased_model, global_aliased_model) if llm_router is None or router_settings is None: - return key_aliased_model + return authorized_model group_alias_target: Final = await _resolve_per_request_model_group_alias( - requested_model=key_aliased_model, + requested_model=authorized_model, router_settings=router_settings, user_api_key_dict=user_api_key_dict, llm_router=llm_router, ) - return group_alias_target or key_aliased_model + return group_alias_target or authorized_model async def _acompletion( diff --git a/tests/unit/proxy/management_endpoints/usage_endpoints/test_ai_usage_chat.py b/tests/unit/proxy/management_endpoints/usage_endpoints/test_ai_usage_chat.py index f78afb0fc21..0f28fbbe5f2 100644 --- a/tests/unit/proxy/management_endpoints/usage_endpoints/test_ai_usage_chat.py +++ b/tests/unit/proxy/management_endpoints/usage_endpoints/test_ai_usage_chat.py @@ -1575,6 +1575,24 @@ class TestUsageAiChatTeamModelRouting: assert b'"content": "from the aliased deployment"' in body assert b'"type": "error"' not in body + @pytest.mark.asyncio + async def test_key_alias_wins_over_a_global_alias_of_the_same_name(self): + import litellm + from litellm.proxy._types import UserAPIKeyAuth + + key_limited_to_its_alias_target: Final = UserAPIKeyAuth( + user_id="admin", + user_role=LitellmUserRoles.PROXY_ADMIN, + api_key="sk-test", + models=["prod-model"], + aliases={"prod-alias": "prod-model"}, + ) + with patch.dict(litellm.model_alias_map, {"prod-alias": "other-model"}): + body: Final = await self._endpoint_body(key_limited_to_its_alias_target) + + assert b'"content": "from the aliased deployment"' in body + assert b'"type": "error"' not in body + @pytest.mark.asyncio async def test_group_alias_to_a_model_the_key_cannot_call_is_denied_before_streaming(self): from litellm.proxy._types import ProxyException, UserAPIKeyAuth