Skip to content
Merged
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion vllm/entrypoints/chat_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,9 @@ def resolve_chat_template_content_format(
model_config: ModelConfig,
trust_remote_code: Optional[bool] = None,
) -> _ChatTemplateContentFormat:
if given_format != "auto":
return given_format

detected_format = _resolve_chat_template_content_format(
chat_template,
tools,
Expand All @@ -461,7 +464,7 @@ def resolve_chat_template_content_format(
detected_format=detected_format,
)

return detected_format if given_format == "auto" else given_format
return detected_format



Expand Down