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

fix(hosted_vllm): normalize flattened function tools

Browse source
This commit is contained in:
whning0513 2026-07-08 19:26:46 +08:00
parent 13b590c8ec
commit 71be4bc81d
2 changed files with 53 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
litellm/llms/hosted_vllm/chat/transformation.py
View file

@ -38,10 +38,11 @@ from ...openai.chat.gpt_transformation import OpenAIGPTConfig
class HostedVLLMChatConfig(OpenAIGPTConfig):
def _convert_custom_tools_to_function_tools(self, tools: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
def _convert_tools_to_function_tools(self, tools: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
"""
vLLM chat completions currently accepts only OpenAI function tools.
Convert custom tools into function tools so request validation does not fail.
Convert custom tools and flattened function tools so request validation
does not fail.
"""
converted_tools: List[Dict[str, Any]] = []
for idx, tool in enumerate(tools):
@ -49,18 +50,22 @@ class HostedVLLMChatConfig(OpenAIGPTConfig):
converted_tools.append(tool)
continue
if tool.get("type") != "custom":
if tool.get("type") == "custom":
source_tool = tool.get("custom", {})
if not isinstance(source_tool, dict):
source_tool = {}
tool_name = source_tool.get("name") or tool.get("name") or f"custom_tool_{idx}"
tool_description = source_tool.get("description") or tool.get("description")
tool_parameters = source_tool.get("input_schema") or tool.get("input_schema")
elif tool.get("type") == "function" and not isinstance(tool.get("function"), dict):
source_tool = tool
tool_name = source_tool.get("name") or f"function_tool_{idx}"
tool_description = source_tool.get("description")
tool_parameters = source_tool.get("parameters")
else:
converted_tools.append(tool)
continue
custom_tool = tool.get("custom", {})
if not isinstance(custom_tool, dict):
custom_tool = {}
tool_name = custom_tool.get("name") or tool.get("name") or f"custom_tool_{idx}"
tool_description = custom_tool.get("description") or tool.get("description")
tool_parameters = custom_tool.get("input_schema") or tool.get("input_schema")
if not isinstance(tool_parameters, dict):
tool_parameters = {
"type": "object",
@ -104,7 +109,7 @@ class HostedVLLMChatConfig(OpenAIGPTConfig):
_tools = _remove_additional_properties(_tools)
_tools = _remove_strict_from_schema(_tools)
if isinstance(_tools, list):
_tools = self._convert_custom_tools_to_function_tools(_tools)
_tools = self._convert_tools_to_function_tools(_tools)
if _tools is not None:
non_default_params["tools"] = _tools

36
tests/test_litellm/llms/hosted_vllm/chat/test_hosted_vllm_chat_transformation.py
View file

@ -436,3 +436,39 @@ def test_hosted_vllm_custom_tools_use_top_level_input_schema():
assert tools[0]["function"]["name"] == "search"
assert tools[0]["function"]["description"] == "Search docs"
assert tools[0]["function"]["parameters"] == input_schema
def test_hosted_vllm_flattens_function_tools_into_nested_function_shape():
config = HostedVLLMChatConfig()
input_schema = {
"type": "object",
"properties": {"site_id": {"type": "string"}},
"required": ["site_id"],
}
optional_params = config.map_openai_params(
non_default_params={
"tools": [
{
"type": "function",
"name": "matomo-matomo_site_list",
"description": "Get Matomo site details",
"parameters": input_schema,
}
]
},
optional_params={},
model="hosted_vllm/gpt-oss-120b",
drop_params=False,
)
tools = optional_params["tools"]
assert len(tools) == 1
assert tools[0] == {
"type": "function",
"function": {
"name": "matomo-matomo_site_list",
"description": "Get Matomo site details",
"parameters": input_schema,
},
}