Skip to content

[CI][Frontend] Return 422 instead of 500 for invalid Anthropic tool_choice #34590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vllm-bot merged 1 commit into from
Feb 16, 2026
Merged

[CI][Frontend] Return 422 instead of 500 for invalid Anthropic tool_choice #34590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/entrypoints/openai/test_openai_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ def test_openapi_stateless(case: schemathesis.Case):
# requires a longer timeout
("POST", "/v1/chat/completions"): LONG_TIMEOUT_SECONDS,
("POST", "/v1/completions"): LONG_TIMEOUT_SECONDS,
("POST", "/v1/messages"): LONG_TIMEOUT_SECONDS,
}.get(key, DEFAULT_TIMEOUT_SECONDS)

# No need to verify SSL certificate for localhost
Expand Down
8 changes: 7 additions & 1 deletion vllm/entrypoints/anthropic/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import time
from typing import Any, Literal

from pydantic import BaseModel, field_validator
from pydantic import BaseModel, field_validator, model_validator


class AnthropicError(BaseModel):
Expand Down Expand Up @@ -76,6 +76,12 @@ class AnthropicToolChoice(BaseModel):
type: Literal["auto", "any", "tool"]
name: str | None = None

@model_validator(mode="after")
def validate_name_required_for_tool(self) -> "AnthropicToolChoice":
if self.type == "tool" and not self.name:
raise ValueError("tool_choice.name is required when type is 'tool'")
return self


class AnthropicMessagesRequest(BaseModel):
"""Anthropic Messages API request"""
Expand Down