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

fix: move OpenAI tool-name sanitization to after args=locals() to prevent key leakage

Browse source 
The intermediate variables _litellm_provider_for_tools and
_sanitize_openai_fn_tool_names were declared before args=locals(), so
they were captured in the args snapshot and forwarded as extraneous keys
to every provider (including Bedrock), causing a 400 error.

Moving the block after args=locals() keeps those variables out of the
snapshot entirely. The sanitized tools/tool_choice values are written
back into args[] so downstream consumers (fallback handler etc.) see
the rewritten values.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Sameer Kankute 2026-05-04 18:14:53 +05:30
parent 25a5429a35
commit f0df19af21
No known key found for this signature in database
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
litellm/main.py
View file

@ -1164,6 +1164,20 @@ def completion( # type: ignore # noqa: PLR0915
raise ValueError("model param not passed in.")
# validate messages
messages = validate_and_fix_openai_messages(messages=messages)
tools = validate_and_fix_openai_tools(tools=tools)
# validate tool_choice
tool_choice = validate_chat_completion_tool_choice(tool_choice=tool_choice)
# validate optional params
stop = validate_openai_optional_params(stop=stop)
# normalize camelCase thinking keys (e.g. budgetTokens -> budget_tokens)
thinking = validate_and_fix_thinking_param(thinking=thinking)
######### unpacking kwargs #####################
args = locals()
# OpenAI tool-name sanitization — must run AFTER args = locals() so that the
# intermediate provider-detection variables are never captured by locals() and
# never forwarded as extra keys to the upstream API (e.g. Bedrock).
begin_openai_tool_name_mapping_scope()
try:
_, _litellm_provider_for_tools, _, _ = get_llm_provider(
@ -1178,7 +1192,7 @@ def completion( # type: ignore # noqa: PLR0915
)
except Exception:
_sanitize_openai_fn_tool_names = False
tools = validate_and_fix_openai_tools(
args["tools"] = tools = validate_and_fix_openai_tools(
tools=tools,
sanitize_openai_function_tool_names=_sanitize_openai_fn_tool_names,
)
@ -1195,19 +1209,10 @@ def completion( # type: ignore # noqa: PLR0915
_sanitized_tc_name = _get_sanitized(_fn["name"])
if _sanitized_tc_name != _fn["name"]:
tool_choice = {
args["tool_choice"] = tool_choice = {
**tool_choice,
"function": {**_fn, "name": _sanitized_tc_name},
}
# validate tool_choice
tool_choice = validate_chat_completion_tool_choice(tool_choice=tool_choice)
# validate optional params
stop = validate_openai_optional_params(stop=stop)
# normalize camelCase thinking keys (e.g. budgetTokens -> budget_tokens)
thinking = validate_and_fix_thinking_param(thinking=thinking)
######### unpacking kwargs #####################
args = locals()
skip_mcp_handler = kwargs.pop("_skip_mcp_handler", False)
if not skip_mcp_handler and tools: