[Misc] Use VLLMValidationError in chat completion tool and batch validators (#49214)

Signed-off-by: Umut Polat <52835619+umut-polat@users.noreply.github.com>
This commit is contained in:
Umut Polat
2026-07-21 11:38:20 +00:00
committed by GitHub
parent 5b3762a7f0
commit 040cbf95cc
@@ -687,9 +687,9 @@ class ChatCompletionRequest(OpenAIBaseModel):
skip_special_tokens=self.skip_special_tokens, skip_special_tokens=self.skip_special_tokens,
spaces_between_special_tokens=self.spaces_between_special_tokens, spaces_between_special_tokens=self.spaces_between_special_tokens,
include_stop_str_in_output=self.include_stop_str_in_output, include_stop_str_in_output=self.include_stop_str_in_output,
output_kind=RequestOutputKind.DELTA output_kind=(
if self.stream RequestOutputKind.DELTA if self.stream else RequestOutputKind.FINAL_ONLY
else RequestOutputKind.FINAL_ONLY, ),
structured_outputs=self.extract_structured_outputs(), structured_outputs=self.extract_structured_outputs(),
logit_bias=self.logit_bias, logit_bias=self.logit_bias,
bad_words=self.bad_words, bad_words=self.bad_words,
@@ -849,9 +849,10 @@ class ChatCompletionRequest(OpenAIBaseModel):
# Reject empty tools array, matching OpenAI API behavior # Reject empty tools array, matching OpenAI API behavior
if data.get("tools") == []: if data.get("tools") == []:
raise ValueError( raise VLLMValidationError(
"`tools` must not be an empty array. " "`tools` must not be an empty array. "
"Either provide at least one tool or omit the field entirely." "Either provide at least one tool or omit the field entirely.",
parameter="tools",
) )
# if "tool_choice" is not specified but tools are provided, # if "tool_choice" is not specified but tools are provided,
@@ -1075,13 +1076,15 @@ class BatchChatCompletionRequest(OpenAIBaseModel):
if isinstance(data, BatchChatCompletionRequest): if isinstance(data, BatchChatCompletionRequest):
data = data.model_dump(exclude_unset=True) data = data.model_dump(exclude_unset=True)
if data.get("use_beam_search"): if data.get("use_beam_search"):
raise ValueError( raise VLLMValidationError(
"Batch chat completions do not support beam search. " "Batch chat completions do not support beam search. "
"Please set `use_beam_search` to False." "Please set `use_beam_search` to False.",
parameter="use_beam_search",
) )
if data.get("logprob_token_ids") and not data.get("logprobs"): if data.get("logprob_token_ids") and not data.get("logprobs"):
raise ValueError( raise VLLMValidationError(
"when using `logprob_token_ids`, `logprobs` must be set to true." "when using `logprob_token_ids`, `logprobs` must be set to true.",
parameter="logprob_token_ids",
) )
response_format = data.get("response_format") response_format = data.get("response_format")
rf_type = ( rf_type = (
@@ -1095,8 +1098,10 @@ class BatchChatCompletionRequest(OpenAIBaseModel):
validate_structured_outputs_structural_tag(structured_outputs) validate_structured_outputs_structural_tag(structured_outputs)
n = data.get("n", 1) n = data.get("n", 1)
if n is not None and n != 1: if n is not None and n != 1:
raise ValueError( raise VLLMValidationError(
"Batch chat completions do not support `n > 1`. Please set `n` to 1." "Batch chat completions do not support `n > 1`. Please set `n` to 1.",
parameter="n",
value=n,
) )
return data return data