scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-14 04:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 97

address review: always return watsonx model_id when present

Browse source 
The generic extractor resolves the 'model' body key first; a caller
can set model to an allowed name while Watsonx executes the
disallowed model_id. This makes model_id authoritative whenever
present on /watsonx routes, so the allowlist check runs on the
model that will actually serve the request.
This commit is contained in:
AUTHENSOR 2026-09-20 03:41:57 -07:00
parent 6f1bffddb7
commit 8bca92b644
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2036,15 +2036,15 @@ def get_model_from_request(
if vertex_match:
model = vertex_match.group(1)
# If still not found, read the Watsonx body key. Watsonx generation and
# chat requests carry the model under "model_id" (the native Watsonx ML
# API shape, and the key litellm's own Watsonx client writes), so without
# this branch the model resolves to None and the key's model allowlist is
# never checked on /watsonx routes.
if model is None and route.lower().startswith("/watsonx"):
# Watsonx routes carry the deployment name under "model_id" (the native
# Watsonx ML API shape). The generic "model" body key can also be set by
# the caller, but Watsonx executes model_id; both must be authorized,
# so model_id is checked whenever present on a /watsonx route,
# regardless of whether "model" already resolved.
if route.lower().startswith("/watsonx"):
watsonx_model: Final = request_data.get("model_id")
if isinstance(watsonx_model, str) and watsonx_model:
model = watsonx_model
return watsonx_model
if route.lower().startswith("/bedrock"):
bedrock_model: Final = _model_from_bedrock_route(route)