scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-11-01 07:03:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 128

fix(proxy): merge opt-in fallback groups only when their deployments share provider and opt-in list

Browse source
This commit is contained in:
mateo-berri 2026-10-31 03:15:20 -07:00
parent 31e7af423d
commit 19c0adde54
2 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
litellm/proxy/auth/auth_utils.py
View file

@ -556,27 +556,30 @@ class _OptInGroups:
vertex_target: tuple[str, ...]
def _deployment_id(deployment: Mapping[str, object]) -> str | None:
match deployment.get("model_info"):
case {"id": str(deployment_id)} if deployment_id:
return deployment_id
case _:
return None
_OptInKey = tuple[str | tuple[str, str | None], ...]
def _same_deployments_key(model_group: str, llm_router: Router) -> frozenset[tuple[str | None, str | None]] | str:
deployments: Final = _model_group_deployments(model_group, llm_router)
key: Final = tuple(
(_deployment_id(deployment), _deployment_provider(deployment["litellm_params"])) for deployment in deployments
def _opt_in_key(litellm_params: LiteLLMParamsTypedDict) -> _OptInKey:
return tuple(
item if isinstance(item, str) else ("api_base", item.get("api_base"))
for item in deployment_clientside_auth_params(litellm_params) or ()
)
return frozenset(key) if key and all(deployment_id for deployment_id, _ in key) else model_group
def _same_answer_key(model_group: str, llm_router: Router) -> frozenset[tuple[str | None, _OptInKey]] | str:
deployments: Final = _model_group_deployments(model_group, llm_router)
key: Final = frozenset(
(_deployment_provider(deployment["litellm_params"]), _opt_in_key(deployment["litellm_params"]))
for deployment in deployments
)
return key or model_group
def _distinct_opt_in_groups(model_groups: frozenset[str], llm_router: Router | None) -> tuple[str, ...]:
if llm_router is None:
return tuple(sorted(model_groups))
return tuple(
{_same_deployments_key(model_group, llm_router): model_group for model_group in sorted(model_groups)}.values()
{_same_answer_key(model_group, llm_router): model_group for model_group in sorted(model_groups)}.values()
)

20
tests/unit/proxy/auth/test_auth_utils.py
View file

@ -5299,6 +5299,26 @@ class TestIsRequestBodySafeBlocksVertexTargetOverrides:
with pytest.raises(ValueError, match="vertex_location"):
is_request_body_safe(request_body, {}, router, "vertex_ai/gemini-2.5-flash", route="/v1/chat/completions")
def test_a_pinned_group_sharing_a_deployment_id_with_an_opted_in_group_is_still_checked(self) -> None:
router: Final = Router(
model_list=[
{
"model_name": name,
"litellm_params": {
"model": "vertex_ai/gemini-2.5-flash",
"vertex_location": "europe-west4",
"configurable_clientside_auth_params": opt_in,
},
"model_info": {"id": "shared-id"},
}
for name, opt_in in (("a-pinned", []), ("z-optin", ["vertex_location"]))
]
)
request_body: Final = {"model": "a-pinned", "vertex_location": "us-central1", "fallbacks": ["z-optin"]}
with pytest.raises(ValueError, match="vertex_location"):
is_request_body_safe(request_body, {}, router, "a-pinned", route="/v1/chat/completions")
@pytest.mark.parametrize(
"model, is_allowed", [("public-alias", True), ("gemini-optin", False)], ids=["alias", "aliased_target"]
)