Simplify default chatml logic

Olivier Chafik · Olivier Chafik · commit d73448de1c15 · 2025-02-03T19:22:53.000Z
diff --git a/common/common.cpp b/common/common.cpp
@@ -1879,8 +1879,9 @@ std::string common_chat_format_example(const common_chat_template & tmpl, bool u
 
 common_chat_templates common_chat_templates_from_model(const struct llama_model * model, const std::string & chat_template_override)
 {
-    std::string default_template_src = chat_template_override == "chatml" ? CHATML_TEMPLATE_SRC : chat_template_override;
-    std::string template_tool_use_src = chat_template_override == "chatml" ? CHATML_TEMPLATE_SRC : "";
+    std::string default_template_src;
+    std::string template_tool_use_src;
+
     bool has_explicit_template = !chat_template_override.empty();
     if (chat_template_override.empty()) {
         auto str = llama_model_chat_template(model, /* name */ nullptr);
@@ -1893,6 +1894,8 @@ common_chat_templates common_chat_templates_from_model(const struct llama_model
             template_tool_use_src = str;
             has_explicit_template = true;
         }
+    } else {
+        default_template_src = chat_template_override;
     }
     if (default_template_src.empty() || default_template_src == "chatml") {
         if (!template_tool_use_src.empty()) {

Original file line number	Diff line number	Diff line change
`@@ -1879,8 +1879,9 @@ std::string common_chat_format_example(const common_chat_template & tmpl, bool u`
`1879`	`1879`
`1880`	`1880`	`common_chat_templates common_chat_templates_from_model(const struct llama_model * model, const std::string & chat_template_override)`
`1881`	`1881`	`{`
`1882`		`- std::string default_template_src = chat_template_override == "chatml" ? CHATML_TEMPLATE_SRC : chat_template_override;`
`1883`		`- std::string template_tool_use_src = chat_template_override == "chatml" ? CHATML_TEMPLATE_SRC : "";`
	`1882`	`+ std::string default_template_src;`
	`1883`	`+ std::string template_tool_use_src;`
	`1884`	`+`
`1884`	`1885`	`bool has_explicit_template = !chat_template_override.empty();`
`1885`	`1886`	`if (chat_template_override.empty()) {`
`1886`	`1887`	`auto str = llama_model_chat_template(model, /* name */ nullptr);`
`@@ -1893,6 +1894,8 @@ common_chat_templates common_chat_templates_from_model(const struct llama_model`
`1893`	`1894`	`template_tool_use_src = str;`
`1894`	`1895`	`has_explicit_template = true;`
`1895`	`1896`	`}`
	`1897`	`+ } else {`
	`1898`	`+ default_template_src = chat_template_override;`
`1896`	`1899`	`}`
`1897`	`1900`	`if (default_template_src.empty() \|\| default_template_src == "chatml") {`
`1898`	`1901`	`if (!template_tool_use_src.empty()) {`