Unverified Commit fae453f8 authored by CYJiang's avatar CYJiang Committed by GitHub
Browse files

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


Signed-off-by: default avatargoogs1025 <googs1025@gmail.com>
parent 4b0da7b6
...@@ -1306,27 +1306,25 @@ class LLM: ...@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment