[Responses] Add tool_choice/tools validation to match OpenAI behavior (#40399)
Signed-off-by: sfeng33 <4florafeng@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent
98a242ff61
commit
8317cedc77
@@ -492,6 +492,46 @@ class ResponsesRequest(OpenAIBaseModel):
|
||||
data["input"] = processed_input
|
||||
return data
|
||||
|
||||
@model_validator(mode="before")
|
||||
@classmethod
|
||||
def check_tool_usage(cls, data):
|
||||
if not isinstance(data, dict):
|
||||
return data
|
||||
|
||||
tools = data.get("tools")
|
||||
tool_choice = data.get("tool_choice", "auto")
|
||||
has_tools = tools is not None and len(tools) > 0
|
||||
is_named_tool_choice = (
|
||||
isinstance(tool_choice, dict) and tool_choice.get("type") == "function"
|
||||
)
|
||||
|
||||
if not has_tools:
|
||||
if tool_choice in ("auto", "none"):
|
||||
data["tool_choice"] = "none"
|
||||
elif tool_choice == "required":
|
||||
raise VLLMValidationError(
|
||||
"Tool choice 'required' must be specified with 'tools' parameter.",
|
||||
parameter="tool_choice",
|
||||
)
|
||||
elif is_named_tool_choice:
|
||||
raise VLLMValidationError(
|
||||
"Tool choice 'function' not found in 'tools' parameter.",
|
||||
parameter="tool_choice",
|
||||
)
|
||||
elif is_named_tool_choice and tools is not None:
|
||||
tool_name = tool_choice.get("name")
|
||||
tool_names = {
|
||||
t.get("name") if isinstance(t, dict) else getattr(t, "name", None)
|
||||
for t in tools
|
||||
}
|
||||
if not tool_name or tool_name not in tool_names:
|
||||
raise VLLMValidationError(
|
||||
"Tool choice 'function' not found in 'tools' parameter.",
|
||||
parameter="tool_choice",
|
||||
)
|
||||
|
||||
return data
|
||||
|
||||
|
||||
class ResponsesResponse(OpenAIBaseModel):
|
||||
id: str = Field(default_factory=lambda: f"resp_{random_uuid()}")
|
||||
|
||||
@@ -718,9 +718,10 @@ class OpenAIServingResponses(OpenAIServing):
|
||||
request: ResponsesRequest,
|
||||
prev_response: ResponsesResponse | None,
|
||||
):
|
||||
if request.tool_choice != "auto":
|
||||
if request.tool_choice not in ("auto", "none"):
|
||||
raise NotImplementedError(
|
||||
"Only 'auto' tool_choice is supported in response API with Harmony"
|
||||
"Only 'auto' or 'none' tool_choice is supported "
|
||||
"in response API with Harmony"
|
||||
)
|
||||
|
||||
arrival_time = time.time()
|
||||
|
||||
Reference in New Issue
Block a user