From 5fd5d234e2dd470d4fcc95718da2819ef26b5982 Mon Sep 17 00:00:00 2001 From: mateo-berri <277851410+mateo-berri@users.noreply.github.com> Date: Wed, 28 Oct 2026 18:36:00 -0700 Subject: [PATCH] refactor(auth): check team ownership in model_checks instead of new Router methods --- litellm/proxy/auth/auth_checks.py | 3 +- litellm/proxy/auth/model_checks.py | 28 ++++++++ litellm/proxy/proxy_server.py | 10 +-- litellm/proxy/utils.py | 4 +- litellm/router.py | 31 -------- .../anthropic/messages/test_safeguards.py | 4 +- tests/unit/proxy/auth/test_model_checks.py | 68 ++++++++++++++++++ .../proxy/batches_endpoints/test_endpoints.py | 4 -- .../proxy/hooks/test_batch_file_validation.py | 21 ++---- .../test_team_model_name_translation.py | 14 ++-- ...test_filter_models_by_team_access_group.py | 12 ++-- ...test_proxy_server_endpoints_and_startup.py | 1 - .../test_vector_store_endpoints.py | 5 -- tests/unit/test_router/test_router.py | 72 ------------------- 14 files changed, 131 insertions(+), 146 deletions(-) diff --git a/litellm/proxy/auth/auth_checks.py b/litellm/proxy/auth/auth_checks.py index 890276eb696..cd488383f52 100644 --- a/litellm/proxy/auth/auth_checks.py +++ b/litellm/proxy/auth/auth_checks.py @@ -97,6 +97,7 @@ from litellm.proxy.auth.model_access_denied import ( customer_model_access_denied_client_message, model_access_denied_client_message, ) +from litellm.proxy.auth.model_checks import model_owned_by_other_teams from litellm.proxy.auth.route_checks import RouteChecks from litellm.proxy.common_utils.auth_cache_invalidation_pubsub import ( broadcast_evictions, @@ -5546,7 +5547,7 @@ def raise_when_key_reaches_only_other_teams_deployments( return requested_models: Final = (model,) if isinstance(model, str) else tuple(model) foreign_model: Final = next( - (name for name in requested_models if llm_router.model_owned_by_other_teams(name, valid_token.team_id)), + (name for name in requested_models if model_owned_by_other_teams(llm_router, name, valid_token.team_id)), None, ) if foreign_model is None: diff --git a/litellm/proxy/auth/model_checks.py b/litellm/proxy/auth/model_checks.py index 58eeecaac67..6cc507d43ac 100644 --- a/litellm/proxy/auth/model_checks.py +++ b/litellm/proxy/auth/model_checks.py @@ -81,6 +81,34 @@ def _get_models_from_access_groups( return kept_models + member_models +def _model_name_usable_by_team(llm_router: Router, model_name: str, team_id: str | None) -> bool: + return any( + Router.deployment_usable_by_team(deployment, team_id) + for deployment in llm_router.deployments_named(model_name) or () + ) + + +def access_groups_usable_by_team(llm_router: Router, team_id: str | None) -> Mapping[str, Sequence[str]]: + return MappingProxyType( + { + group: usable_group_models + for group, model_names in llm_router.get_model_access_groups().items() + if ( + usable_group_models := tuple( + name for name in model_names if _model_name_usable_by_team(llm_router, name, team_id) + ) + ) + } + ) + + +def model_owned_by_other_teams(llm_router: Router, model_name: str, team_id: str | None) -> bool: + deployments: Final = tuple(llm_router.deployments_named(model_name) or ()) + return bool(deployments) and not any( + Router.deployment_usable_by_team(deployment, team_id) for deployment in deployments + ) + + async def get_mcp_server_ids( user_api_key_dict: UserAPIKeyAuth, ) -> list[str]: diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 4cad608dd61..f5d9a90410e 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -430,6 +430,7 @@ from litellm.proxy.auth.master_key_boot_check import ( with_stored_secrets_counted, ) from litellm.proxy.auth.model_checks import ( + access_groups_usable_by_team, expand_wildcard_deployments_for_model_info, get_all_fallbacks, get_complete_model_list, @@ -15909,13 +15910,14 @@ def _resolve_model_grant_to_deployment_ids( if not models or SpecialModelNames.all_proxy_models.value in models: return tuple(llm_router.get_model_ids(exclude_team_models=True)) - access_groups: Final = llm_router.get_model_access_groups_usable_by_team(None) + access_groups: Final = access_groups_usable_by_team(llm_router, None) granted_model_names: Final = tuple(name for model in models for name in (model, *access_groups.get(model, ()))) return tuple( model_id for name in granted_model_names - for deployment in llm_router.get_deployments_usable_by_team(name, None) - if (model_id := deployment.get("model_info", {}).get("id", None)) is not None + for deployment in (llm_router.get_model_list(model_name=name) or ()) + if Router.deployment_usable_by_team(deployment, None) + and (model_id := deployment.get("model_info", {}).get("id", None)) is not None ) @@ -16652,7 +16654,7 @@ async def _gather_team_accessible_model_ids( """Collect model IDs the team can use from router config and DB.""" team_accessible_model_ids: Final[set[str]] = set() access_groups: Final[Mapping[str, Sequence[str]]] = ( - llm_router.get_model_access_groups_usable_by_team(team_id) if llm_router else MappingProxyType({}) + access_groups_usable_by_team(llm_router, team_id) if llm_router else MappingProxyType({}) ) if not team_object.models or SpecialModelNames.all_proxy_models.value in team_object.models: diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py index 04160c2612e..fdb9f22e980 100644 --- a/litellm/proxy/utils.py +++ b/litellm/proxy/utils.py @@ -9540,7 +9540,9 @@ def access_groups_visible_to_caller( ) -> Mapping[str, Sequence[str]]: if team_id is None and is_proxy_admin(user_api_key_dict): return llm_router.get_model_access_groups() - return llm_router.get_model_access_groups_usable_by_team(team_id) + from litellm.proxy.auth.model_checks import access_groups_usable_by_team + + return access_groups_usable_by_team(llm_router, team_id) async def get_available_models_for_user( diff --git a/litellm/router.py b/litellm/router.py index 7a1e4745c29..fc888495e99 100644 --- a/litellm/router.py +++ b/litellm/router.py @@ -14103,37 +14103,6 @@ class Router: return access_groups - def _model_name_usable_by_team(self, model_name: str, team_id: str | None) -> bool: - return any( - self.deployment_usable_by_team(deployment, team_id) - for deployment in self.deployments_named(model_name) or () - ) - - def get_model_access_groups_usable_by_team(self, team_id: str | None) -> Mapping[str, Sequence[str]]: - return MappingProxyType( - { - group: usable_group_models - for group, model_names in self.get_model_access_groups().items() - if ( - usable_group_models := tuple( - name for name in model_names if self._model_name_usable_by_team(name, team_id) - ) - ) - } - ) - - def get_deployments_usable_by_team(self, model_name: str, team_id: str | None) -> tuple[DeploymentTypedDict, ...]: - return tuple( - deployment - for deployment in self.get_model_list(model_name=model_name, team_id=team_id) or () - if self.deployment_usable_by_team(deployment, team_id) - ) - - def model_owned_by_other_teams(self, model_name: str, team_id: str | None) -> bool: - if self.get_deployments_usable_by_team(model_name, team_id): - return False - return bool(self.get_model_list(model_name=model_name)) - def is_model_access_group_for_wildcard_route(self, model_access_group: str) -> bool: """ Return True if model access group is a wildcard route diff --git a/tests/unit/llms/anthropic/messages/test_safeguards.py b/tests/unit/llms/anthropic/messages/test_safeguards.py index 203a4bf33da..f34df017905 100644 --- a/tests/unit/llms/anthropic/messages/test_safeguards.py +++ b/tests/unit/llms/anthropic/messages/test_safeguards.py @@ -345,8 +345,8 @@ class _Router: ) -> dict[str, list[str]]: return {} - def model_owned_by_other_teams(self, model_name: str, team_id: str | None) -> bool: - return False + def deployments_named(self, model_name: str) -> None: + return None async def acompletion(self, **kwargs: object) -> ModelResponse: self.calls.append(kwargs) diff --git a/tests/unit/proxy/auth/test_model_checks.py b/tests/unit/proxy/auth/test_model_checks.py index 83761620cc9..fcb1f0bd61e 100644 --- a/tests/unit/proxy/auth/test_model_checks.py +++ b/tests/unit/proxy/auth/test_model_checks.py @@ -1521,3 +1521,71 @@ def test_prefixed_alias_over_a_bare_catch_all_lists_ids_that_route_through_it(mo ] assert f"team-partial-route/{_ROUTE_OPENAI_ID}" in v1_models assert unrouted_ids == [] + + +def _router_with_global_and_team_b_deployments(): + from litellm import Router + + return Router( + model_list=[ + { + "model_name": "bedrock-nova", + "litellm_params": {"model": "bedrock/us.amazon.nova-micro-v1:0"}, + "model_info": {"id": "global-nova", "access_groups": ["bedrock-group"]}, + }, + { + "model_name": "model_name_team-b_1111", + "litellm_params": {"model": "bedrock/us.amazon.nova-micro-v1:0"}, + "model_info": { + "id": "team-b-nova", + "team_id": "team-b", + "team_public_model_name": "team-b-nova", + "access_groups": ["bedrock-group"], + }, + }, + { + "model_name": "model_name_team-b_2222", + "litellm_params": {"model": "bedrock/us.amazon.nova-lite-v1:0"}, + "model_info": { + "id": "team-b-lite", + "team_id": "team-b", + "team_public_model_name": "team-b-lite", + "access_groups": ["team-b-only"], + }, + }, + ], + ) + + +def test_access_groups_usable_by_team_drops_other_teams_deployments() -> None: + from litellm.proxy.auth.model_checks import access_groups_usable_by_team + + router: Final = _router_with_global_and_team_b_deployments() + + assert access_groups_usable_by_team(router, None) == {"bedrock-group": ("bedrock-nova",)} + assert access_groups_usable_by_team(router, "team-a") == {"bedrock-group": ("bedrock-nova",)} + assert access_groups_usable_by_team(router, "team-b") == { + "bedrock-group": ("bedrock-nova", "model_name_team-b_1111"), + "team-b-only": ("model_name_team-b_2222",), + } + + +@pytest.mark.parametrize( + ("model_name", "team_id", "owned_by_other_teams"), + [ + ("model_name_team-b_1111", None, True), + ("model_name_team-b_1111", "team-a", True), + ("model_name_team-b_1111", "team-b", False), + ("bedrock-nova", None, False), + ("bedrock-nova", "team-a", False), + ("bedrock-nova", "team-b", False), + ("team-b-nova", None, False), + ("unknown-model", None, False), + ], +) +def test_model_owned_by_other_teams(model_name: str, team_id: str | None, owned_by_other_teams: bool) -> None: + from litellm.proxy.auth.model_checks import model_owned_by_other_teams + + router: Final = _router_with_global_and_team_b_deployments() + + assert model_owned_by_other_teams(router, model_name, team_id) is owned_by_other_teams diff --git a/tests/unit/proxy/batches_endpoints/test_endpoints.py b/tests/unit/proxy/batches_endpoints/test_endpoints.py index 2d975581571..37d64a1fc79 100644 --- a/tests/unit/proxy/batches_endpoints/test_endpoints.py +++ b/tests/unit/proxy/batches_endpoints/test_endpoints.py @@ -194,7 +194,6 @@ def harness(monkeypatch: pytest.MonkeyPatch): router = MagicMock(spec=Router) router.model_group_alias = {} router.get_model_access_groups = MagicMock(return_value={}) - router.model_owned_by_other_teams = MagicMock(return_value=False) router.resolve_model_name_from_model_id = MagicMock(side_effect=lambda model_id: model_id) router.model_list = [] router.acreate_batch = AsyncMock(return_value=make_batch()) @@ -1454,7 +1453,6 @@ def retrieve_harness(): router = MagicMock(spec=Router) router.model_group_alias = {} router.get_model_access_groups = MagicMock(return_value={}) - router.model_owned_by_other_teams = MagicMock(return_value=False) router.resolve_model_name_from_model_id = MagicMock(side_effect=lambda model_id: model_id) router.model_list = [] router.aretrieve_batch = AsyncMock(return_value=make_batch()) @@ -2038,7 +2036,6 @@ def list_harness(): router = MagicMock(spec=Router) router.model_group_alias = {} router.get_model_access_groups = MagicMock(return_value={}) - router.model_owned_by_other_teams = MagicMock(return_value=False) router.resolve_model_name_from_model_id = MagicMock(side_effect=lambda model_id: model_id) router.model_list = [] router.alist_batches = AsyncMock(return_value=FakeListPage([])) @@ -2457,7 +2454,6 @@ def cancel_harness(): router = MagicMock(spec=Router) router.model_group_alias = {} router.get_model_access_groups = MagicMock(return_value={}) - router.model_owned_by_other_teams = MagicMock(return_value=False) router.resolve_model_name_from_model_id = MagicMock(side_effect=lambda model_id: model_id) router.model_list = [] router.acancel_batch = AsyncMock(return_value=make_batch()) diff --git a/tests/unit/proxy/hooks/test_batch_file_validation.py b/tests/unit/proxy/hooks/test_batch_file_validation.py index f35dfc301c0..8eeee2e6468 100644 --- a/tests/unit/proxy/hooks/test_batch_file_validation.py +++ b/tests/unit/proxy/hooks/test_batch_file_validation.py @@ -7,7 +7,6 @@ VERIA-39 regression tests: models the caller is not authorized to use. """ -from typing import Final from unittest.mock import AsyncMock, MagicMock, patch import pytest @@ -16,12 +15,6 @@ from fastapi import HTTPException from litellm.proxy._types import LitellmUserRoles, UserAPIKeyAuth -def _router_without_other_teams_deployments() -> MagicMock: - router: Final = MagicMock() - router.model_owned_by_other_teams.return_value = False - return router - - def _models(file_content_as_dict): """Distinct body.model values, mirroring how the rate limiter collects the models from a streamed batch file before the access check.""" @@ -634,7 +627,7 @@ async def test_pre_call_does_not_skip_for_spoofed_provider(): ) user = UserAPIKeyAuth(api_key="sk-ok", user_id="alice", models=["*"]) - mock_router = _router_without_other_teams_deployments() + mock_router = MagicMock() mock_router.model_list = [] mock_router.resolve_model_name_from_model_id.return_value = "my-openai-model" @@ -706,7 +699,7 @@ async def test_count_input_file_usage_decodes_model_embedded_file_id(): ) as mock_afile_content, patch( "litellm.proxy.proxy_server.llm_router", - _router_without_other_teams_deployments(), + MagicMock(), ), patch( "litellm.proxy.openai_files_endpoints.common_utils.get_credentials_for_model", @@ -1431,7 +1424,7 @@ async def test_pre_call_enforces_project_otpm_limit_for_batch(): with ( patch("litellm.proxy.proxy_server.general_settings", {}), - patch("litellm.proxy.proxy_server.llm_router", _router_without_other_teams_deployments()), + patch("litellm.proxy.proxy_server.llm_router", MagicMock()), patch( "litellm.proxy.openai_files_endpoints.common_utils.get_credentials_for_model", return_value={"custom_llm_provider": "openai"}, @@ -1485,7 +1478,7 @@ async def test_pre_call_enforces_project_itpm_limit_for_batch(): with ( patch("litellm.proxy.proxy_server.general_settings", {}), - patch("litellm.proxy.proxy_server.llm_router", _router_without_other_teams_deployments()), + patch("litellm.proxy.proxy_server.llm_router", MagicMock()), patch( "litellm.proxy.openai_files_endpoints.common_utils.get_credentials_for_model", return_value={"custom_llm_provider": "openai"}, @@ -1545,7 +1538,7 @@ async def test_pre_call_enforces_project_otpm_limit_for_non_routing_row_model(): with ( patch("litellm.proxy.proxy_server.general_settings", {}), - patch("litellm.proxy.proxy_server.llm_router", _router_without_other_teams_deployments()), + patch("litellm.proxy.proxy_server.llm_router", MagicMock()), patch( "litellm.proxy.openai_files_endpoints.common_utils.get_credentials_for_model", return_value={"custom_llm_provider": "openai"}, @@ -1612,7 +1605,7 @@ async def test_pre_call_charges_each_row_model_against_its_own_project_quota(): with ( patch("litellm.proxy.proxy_server.general_settings", {}), - patch("litellm.proxy.proxy_server.llm_router", _router_without_other_teams_deployments()), + patch("litellm.proxy.proxy_server.llm_router", MagicMock()), patch( "litellm.proxy.openai_files_endpoints.common_utils.get_credentials_for_model", return_value={"custom_llm_provider": "openai"}, @@ -2139,7 +2132,7 @@ def _enqueued_batch_patches(): afile_content_mock = AsyncMock(return_value=mock_content) return afile_content_mock, ( patch("litellm.proxy.proxy_server.general_settings", {}), - patch("litellm.proxy.proxy_server.llm_router", _router_without_other_teams_deployments()), + patch("litellm.proxy.proxy_server.llm_router", MagicMock()), patch( "litellm.proxy.openai_files_endpoints.common_utils.get_credentials_for_model", return_value={"custom_llm_provider": "openai"}, diff --git a/tests/unit/proxy/proxy_server/test_team_model_name_translation.py b/tests/unit/proxy/proxy_server/test_team_model_name_translation.py index 59797d853d9..37642f75222 100644 --- a/tests/unit/proxy/proxy_server/test_team_model_name_translation.py +++ b/tests/unit/proxy/proxy_server/test_team_model_name_translation.py @@ -923,7 +923,7 @@ async def test_v1_models_translates_team_model_for_access_group_key(monkeypatch) router = MagicMock() router.get_model_names.return_value = ["model_name_teamX_uuid9"] router.get_model_access_groups.return_value = {"grp-a": ["model_name_teamX_uuid9"]} - router.get_model_access_groups_usable_by_team.return_value = {"grp-a": ["model_name_teamX_uuid9"]} + router.deployments_named.return_value = (team_dep,) router.get_fully_blocked_model_names.return_value = set() router.get_model_listing_info.return_value = None router.model_list = [team_dep] @@ -963,7 +963,7 @@ async def test_v1_models_keeps_internal_names_when_public_name_flag_disabled( router = MagicMock() router.get_model_names.return_value = ["model_name_teamX_uuid9"] router.get_model_access_groups.return_value = {"grp-a": ["model_name_teamX_uuid9"]} - router.get_model_access_groups_usable_by_team.return_value = {"grp-a": ["model_name_teamX_uuid9"]} + router.deployments_named.return_value = (team_dep,) router.get_fully_blocked_model_names.return_value = set() router.get_model_listing_info.return_value = None router.model_list = [team_dep] @@ -997,7 +997,7 @@ async def test_v1_models_translates_team_model_with_metadata(monkeypatch): router = MagicMock() router.get_model_names.return_value = ["model_name_teamX_uuid9"] router.get_model_access_groups.return_value = {"grp-a": ["model_name_teamX_uuid9"]} - router.get_model_access_groups_usable_by_team.return_value = {"grp-a": ["model_name_teamX_uuid9"]} + router.deployments_named.return_value = (team_dep,) router.get_fully_blocked_model_names.return_value = set() router.get_model_listing_info.return_value = None router.model_list = [team_dep] @@ -1042,7 +1042,7 @@ async def test_v1_models_metadata_fallbacks_use_internal_routing_key(monkeypatch router = MagicMock() router.get_model_names.return_value = ["model_name_teamX_uuid9"] router.get_model_access_groups.return_value = {"grp-a": ["model_name_teamX_uuid9"]} - router.get_model_access_groups_usable_by_team.return_value = {"grp-a": ["model_name_teamX_uuid9"]} + router.deployments_named.return_value = (team_dep,) router.get_fully_blocked_model_names.return_value = set() router.get_model_listing_info.return_value = None router.model_list = [team_dep] @@ -1098,7 +1098,7 @@ async def test_v1_models_metadata_does_not_leak_other_team_fallbacks(monkeypatch router = MagicMock() router.get_model_names.return_value = ["model_name_teamX_uuid9"] router.get_model_access_groups.return_value = {"grp-a": ["model_name_teamX_uuid9"]} - router.get_model_access_groups_usable_by_team.return_value = {"grp-a": ["model_name_teamX_uuid9"]} + router.deployments_named.return_value = (team_x,) router.get_fully_blocked_model_names.return_value = set() router.get_model_listing_info.return_value = None router.model_list = [team_x, team_y] @@ -1145,7 +1145,7 @@ async def test_v1_models_team_alias_inherits_token_limits_and_chat_mode(monkeypa 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_model_access_groups_usable_by_team.return_value = {"grp-a": ["model_name_teamX_terra_uuid"]} + router.deployments_named.return_value = (team_dep,) router.get_fully_blocked_model_names.return_value = set() router.get_model_listing_info.return_value = DeploymentModelListingInfo( cost_map_keys=("azure/gpt-4.1",), @@ -1194,7 +1194,7 @@ async def test_v1_models_team_image_alias_inherits_image_generation_mode(monkeyp 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_model_access_groups_usable_by_team.return_value = {"grp-a": ["model_name_teamX_image_uuid"]} + router.deployments_named.return_value = (team_dep,) router.get_fully_blocked_model_names.return_value = set() router.get_model_listing_info.return_value = DeploymentModelListingInfo( cost_map_keys=("openai/gpt-image-1",), diff --git a/tests/unit/proxy/test_filter_models_by_team_access_group.py b/tests/unit/proxy/test_filter_models_by_team_access_group.py index 73e919f0a4d..9e117c7511e 100644 --- a/tests/unit/proxy/test_filter_models_by_team_access_group.py +++ b/tests/unit/proxy/test_filter_models_by_team_access_group.py @@ -59,10 +59,11 @@ async def test_filter_resolves_access_group_names(): # Router mock mock_router = MagicMock() # get_model_access_groups returns {group_name: [model_names]} - mock_router.get_model_access_groups_usable_by_team.return_value = { + mock_router.get_model_access_groups.return_value = { "Group-A": ["gpt-4o", "gpt-5"], "Group-B": ["claude-3"], } + mock_router.deployments_named.return_value = ({"model_info": {}},) # get_model_list returns deployments matching a model_name def fake_get_model_list(model_name=None, team_id=None): @@ -114,10 +115,11 @@ async def test_filter_resolves_mix_of_access_groups_and_literal_names(): all_models = [gpt4o, gpt5, claude, mistral] mock_router = MagicMock() - mock_router.get_model_access_groups_usable_by_team.return_value = { + mock_router.get_model_access_groups.return_value = { "Group-A": ["gpt-4o", "gpt-5"], "Group-B": ["claude-3"], } + mock_router.deployments_named.return_value = ({"model_info": {}},) def fake_get_model_list(model_name=None, team_id=None): return [m for m in all_models if m["model_name"] == model_name] @@ -159,10 +161,11 @@ async def test_filter_excludes_models_from_other_access_group(): all_models = [gpt4o, claude, llama] mock_router = MagicMock() - mock_router.get_model_access_groups_usable_by_team.return_value = { + mock_router.get_model_access_groups.return_value = { "Group-A": ["gpt-4o"], "Group-B": ["claude-3", "llama-4"], } + mock_router.deployments_named.return_value = ({"model_info": {}},) def fake_get_model_list(model_name=None, team_id=None): return [m for m in all_models if m["model_name"] == model_name] @@ -198,9 +201,10 @@ async def test_filter_db_fallback_receives_resolved_model_names(): all_models = [gpt4o] mock_router = MagicMock() - mock_router.get_model_access_groups_usable_by_team.return_value = { + mock_router.get_model_access_groups.return_value = { "Group-A": ["gpt-4o", "gpt-5"], } + mock_router.deployments_named.return_value = ({"model_info": {}},) # get_model_list returns nothing — forces reliance on the DB fallback mock_router.get_model_list = MagicMock(return_value=[]) diff --git a/tests/unit/proxy/test_proxy_server_endpoints_and_startup.py b/tests/unit/proxy/test_proxy_server_endpoints_and_startup.py index 34b4932417d..55d1587669a 100644 --- a/tests/unit/proxy/test_proxy_server_endpoints_and_startup.py +++ b/tests/unit/proxy/test_proxy_server_endpoints_and_startup.py @@ -5915,7 +5915,6 @@ async def test_model_info_v1_oci_secrets_not_leaked(): mock_router.model_list = [mock_model_data] mock_router.get_model_names.return_value = ["oci-grok-test"] mock_router.get_model_access_groups.return_value = {} - mock_router.get_model_access_groups_usable_by_team.return_value = {} # Mock global variables with ( diff --git a/tests/unit/proxy/vector_store_endpoints/test_vector_store_endpoints.py b/tests/unit/proxy/vector_store_endpoints/test_vector_store_endpoints.py index ec3cd1f69b4..48642a9b50d 100644 --- a/tests/unit/proxy/vector_store_endpoints/test_vector_store_endpoints.py +++ b/tests/unit/proxy/vector_store_endpoints/test_vector_store_endpoints.py @@ -348,7 +348,6 @@ async def test_vector_store_file_list_resolves_single_openai_team_deployment(): request.headers = {} llm_router = MagicMock() - llm_router.model_owned_by_other_teams.return_value = False llm_router.get_deployment_credentials_with_provider.return_value = { "api_key": "sk-team-openai", "api_base": "https://api.openai.com/v1", @@ -382,7 +381,6 @@ async def test_vector_store_file_list_wildcard_model_hint_falls_back_to_team_dep request.headers = {} llm_router = MagicMock() - llm_router.model_owned_by_other_teams.return_value = False llm_router.model_group_alias = {} llm_router.get_deployment_credentials_with_provider.side_effect = [ None, @@ -446,7 +444,6 @@ async def test_vector_store_file_list_uses_single_team_model_for_router_routing( request.headers = {} llm_router = MagicMock() - llm_router.model_owned_by_other_teams.return_value = False llm_router.get_model_access_groups.return_value = {} llm_router.get_deployment_credentials_with_provider.return_value = None @@ -507,7 +504,6 @@ async def test_vector_store_file_list_does_not_guess_ambiguous_team_deployment() request.headers = {} llm_router = MagicMock() - llm_router.model_owned_by_other_teams.return_value = False llm_router.get_deployment_credentials_with_provider.side_effect = [ { "api_key": "sk-team-openai-1", @@ -567,7 +563,6 @@ async def test_vector_store_file_list_requires_explicit_openai_provider_for_team request.headers = {} llm_router = MagicMock() - llm_router.model_owned_by_other_teams.return_value = False llm_router.get_deployment_credentials_with_provider.return_value = { "api_key": "sk-unknown-provider", "api_base": "https://example.com/v1", diff --git a/tests/unit/test_router/test_router.py b/tests/unit/test_router/test_router.py index fa31bb43ab5..300c9cff6ff 100644 --- a/tests/unit/test_router/test_router.py +++ b/tests/unit/test_router/test_router.py @@ -9874,78 +9874,6 @@ def test_deployment_usable_by_team_uses_dynamic_model_info_get(): assert litellm.Router.deployment_usable_by_team({"model_info": ModelInfo()}, "team-a") is False -def _make_router_with_global_and_team_b_deployments() -> litellm.Router: - return litellm.Router( - model_list=[ - { - "model_name": "bedrock-nova", - "litellm_params": {"model": "bedrock/us.amazon.nova-micro-v1:0"}, - "model_info": {"id": "global-nova", "access_groups": ["bedrock-group"]}, - }, - { - "model_name": "model_name_team-b_1111", - "litellm_params": {"model": "bedrock/us.amazon.nova-micro-v1:0"}, - "model_info": { - "id": "team-b-nova", - "team_id": "team-b", - "team_public_model_name": "team-b-nova", - "access_groups": ["bedrock-group"], - }, - }, - { - "model_name": "model_name_team-b_2222", - "litellm_params": {"model": "bedrock/us.amazon.nova-lite-v1:0"}, - "model_info": { - "id": "team-b-lite", - "team_id": "team-b", - "team_public_model_name": "team-b-lite", - "access_groups": ["team-b-only"], - }, - }, - ], - ) - - -def test_get_model_access_groups_usable_by_team_drops_other_teams_deployments(): - router = _make_router_with_global_and_team_b_deployments() - - assert router.get_model_access_groups_usable_by_team(None) == {"bedrock-group": ("bedrock-nova",)} - assert router.get_model_access_groups_usable_by_team("team-a") == {"bedrock-group": ("bedrock-nova",)} - assert router.get_model_access_groups_usable_by_team("team-b") == { - "bedrock-group": ("bedrock-nova", "model_name_team-b_1111"), - "team-b-only": ("model_name_team-b_2222",), - } - - -def test_get_deployments_usable_by_team_drops_other_teams_deployments(): - router = _make_router_with_global_and_team_b_deployments() - - def ids(model_name: str, team_id: str | None) -> list[str]: - return [d["model_info"]["id"] for d in router.get_deployments_usable_by_team(model_name, team_id)] - - assert ids("bedrock-nova", None) == ["global-nova"] - assert ids("bedrock-nova", "team-a") == ["global-nova"] - assert ids("model_name_team-b_1111", None) == [] - assert ids("model_name_team-b_1111", "team-a") == [] - assert ids("model_name_team-b_1111", "team-b") == ["team-b-nova"] - assert ids("team-b-nova", "team-b") == ["team-b-nova"] - - -def test_model_owned_by_other_teams(): - router = _make_router_with_global_and_team_b_deployments() - - assert router.model_owned_by_other_teams("model_name_team-b_1111", None) is True - assert router.model_owned_by_other_teams("model_name_team-b_1111", "team-a") is True - assert router.model_owned_by_other_teams("model_name_team-b_1111", "team-b") is False - assert router.model_owned_by_other_teams("bedrock-nova", "team-a") is False - assert router.model_owned_by_other_teams("bedrock-nova", None) is False - assert router.model_owned_by_other_teams("bedrock-nova", "team-b") is False - assert router.model_owned_by_other_teams("team-b-nova", None) is False - assert router.model_owned_by_other_teams("unknown-model", None) is False - - - - def test_get_deployment_credentials_with_provider_skips_other_team_wildcard(): """ Global wildcard resolution must skip a team-scoped wildcard deployment for