[Fix] Proxy: Repair Merge Fallout In Router-Override Fallback Auth

Conflict resolution for #26968 dropped the `Iterator` typing import
(NameError at module load), left a dead `fallback_models = cast(...)`
block, and the new tests called `_enforce_key_and_fallback_model_access`
without the now-required `request` kwarg.
This commit is contained in:
Yuneng Jiang 2026-05-01 17:48:51 -07:00
parent dbc3b1935f
commit b484c51a1c
No known key found for this signature in database
2 changed files with 5 additions and 5 deletions

View file

@ -11,7 +11,7 @@ import asyncio
import re
import secrets
from datetime import datetime, timezone
from typing import Any, List, Optional, Tuple, Union, cast
from typing import Any, Iterator, List, Optional, Tuple, Union, cast
import fastapi
from fastapi import HTTPException, Request, WebSocket, status
@ -2271,10 +2271,6 @@ async def _enforce_key_and_fallback_model_access(
route=route,
request=request,
)
fallback_models = cast(
Optional[List[ALL_FALLBACK_MODEL_VALUES]],
request_data.get("fallbacks", None),
)
if model is not None:
await can_key_call_model(

View file

@ -94,6 +94,7 @@ async def test_router_override_fallbacks_validated_against_key_allowlist():
valid_token=valid_token,
request_data=request_data,
route="/v1/chat/completions",
request=None,
llm_model_list=None,
llm_router=None,
)
@ -144,6 +145,7 @@ async def test_router_override_all_fallback_fields_validated(fallback_field):
valid_token=valid_token,
request_data=request_data,
route="/v1/chat/completions",
request=None,
llm_model_list=None,
llm_router=None,
)
@ -190,6 +192,7 @@ async def test_top_level_fallback_fields_validated(fallback_field):
valid_token=valid_token,
request_data=request_data,
route="/v1/chat/completions",
request=None,
llm_model_list=None,
llm_router=None,
)
@ -226,6 +229,7 @@ async def test_router_override_without_fallbacks_does_not_break_auth():
valid_token=valid_token,
request_data=request_data,
route="/v1/chat/completions",
request=None,
llm_model_list=None,
llm_router=None,
)