xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2025-12-13 04:25:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Misc] refactor: simplify input validation and num_requests handling in _convert_v1_inputs (#18482)

Browse Source 
Signed-off-by: googs1025 <googs1025@gmail.com>
This commit is contained in:
CYJiang 2025-05-23 10:15:32 +08:00 committed by GitHub
parent 4b0da7b60e
commit fae453f8ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vllm/entrypoints/llm.py
View File

@ -1306,27 +1306,25 @@ class LLM:
): ):
# skip_tokenizer_init is now checked in engine # skip_tokenizer_init is now checked in engine
if prompts is None and prompt_token_ids is None:
raise ValueError(
"Either prompts or prompt_token_ids must be provided.")
if prompts is not None and prompt_token_ids is not None \
and len(prompts) != len(prompt_token_ids):
raise ValueError(
"The lengths of prompts and prompt_token_ids must be the same."
)
if prompts is not None: if prompts is not None:
prompts = [p["content"] for p in parse_and_batch_prompt(prompts)] prompts = [p["content"] for p in parse_and_batch_prompt(prompts)]
if prompt_token_ids is not None: if prompt_token_ids is not None:
prompt_token_ids = [ prompt_token_ids = [
p["content"] for p in parse_and_batch_prompt(prompt_token_ids) p["content"] for p in parse_and_batch_prompt(prompt_token_ids)
] ]
num_requests = None
if prompts is not None: if prompts is not None:
num_requests = len(prompts) num_requests = len(prompts)
if prompt_token_ids is not None: elif prompt_token_ids is not None:
if (num_requests is not None
and num_requests != len(prompt_token_ids)):
raise ValueError("The lengths of prompts and prompt_token_ids "
"must be the same.")
num_requests = len(prompt_token_ids) num_requests = len(prompt_token_ids)
if num_requests is None:
raise ValueError("Either prompts or prompt_token_ids must be "
"provided.")
parsed_prompts: list[PromptType] = [] parsed_prompts: list[PromptType] = []
for i in range(num_requests): for i in range(num_requests):
item: PromptType item: PromptType