squall/vllm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Frontend] Fix multiple values for keyword argument error (#10075) (#10076)

Browse Source 
Signed-off-by: Lei <ylxx@live.com>
This commit is contained in:
Lei Yang 2024-11-07 17:07:19 +08:00 committed by GitHub
parent aa9078fa03
commit 0dfba97b42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vllm/entrypoints/openai/serving_engine.py
View File

@ -443,29 +443,28 @@ class OpenAIServing:
tokenizer, tokenizer,
) )
_chat_template_kwargs: Dict[str, Any] = dict(
chat_template=chat_template,
add_generation_prompt=add_generation_prompt,
continue_final_message=continue_final_message,
tools=tool_dicts,
documents=documents,
)
_chat_template_kwargs.update(chat_template_kwargs or {})
request_prompt: Union[str, List[int]] request_prompt: Union[str, List[int]]
is_mistral_tokenizer = isinstance(tokenizer, MistralTokenizer) is_mistral_tokenizer = isinstance(tokenizer, MistralTokenizer)
if is_mistral_tokenizer: if is_mistral_tokenizer:
request_prompt = apply_mistral_chat_template( request_prompt = apply_mistral_chat_template(
tokenizer, tokenizer,
messages=messages, messages=messages,
chat_template=chat_template, **_chat_template_kwargs,
add_generation_prompt=add_generation_prompt,
continue_final_message=continue_final_message,
tools=tool_dicts,
documents=documents,
**(chat_template_kwargs or {}),
) )
else: else:
request_prompt = apply_hf_chat_template( request_prompt = apply_hf_chat_template(
tokenizer, tokenizer,
conversation=conversation, conversation=conversation,
chat_template=chat_template, **_chat_template_kwargs,
add_generation_prompt=add_generation_prompt,
continue_final_message=continue_final_message,
tools=tool_dicts,
documents=documents,
**(chat_template_kwargs or {}),
) )
mm_data = await mm_data_future mm_data = await mm_data_future