[Frontend] early return chat format resolution when specified (#19735)

ea10dd9d · xzbdmw · GitHub · ead21102 · ea10dd9d
Unverified Commit ea10dd9d authored Jun 20, 2025 by xzbdmw Committed by GitHub Jun 19, 2025
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

vllm/entrypoints/chat_utils.py vllm/entrypoints/chat_utils.py +4 -1

No files found.
--- a/vllm/entrypoints/chat_utils.py
+++ b/vllm/entrypoints/chat_utils.py
@@ -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,
@@ -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