only enable prompt formatting if explicitly enabled

CISC · web-flow · commit 07f9d4cfe693 · 2025-03-02T16:48:44.000+01:00
diff --git a/examples/main/main.cpp b/examples/main/main.cpp
@@ -277,6 +277,7 @@ int main(int argc, char ** argv) {
     };
 
     {
+        const bool explicit_chat_template = params.enable_chat_template && (params.use_jinja || !params.chat_template.empty());
         std::string prompt = params.enable_chat_template ? params.system_prompt : "";
 
         if (params.enable_chat_template && !prompt.empty()) {
@@ -285,7 +286,7 @@ int main(int argc, char ** argv) {
         }
 
         if (!params.conversation_mode) {
-            if (params.enable_chat_template && !params.prompt.empty()) {
+            if (explicit_chat_template && !params.prompt.empty()) {
                 // format and append the user prompt
                 prompt += chat_add_and_format("user", params.prompt);
             } else {

Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,7 @@ int main(int argc, char ** argv) {`
`277`	`277`	`};`
`278`	`278`
`279`	`279`	`{`
	`280`	`+ const bool explicit_chat_template = params.enable_chat_template && (params.use_jinja \|\| !params.chat_template.empty());`
`280`	`281`	`std::string prompt = params.enable_chat_template ? params.system_prompt : "";`
`281`	`282`
`282`	`283`	`if (params.enable_chat_template && !prompt.empty()) {`
`@@ -285,7 +286,7 @@ int main(int argc, char ** argv) {`
`285`	`286`	`}`
`286`	`287`
`287`	`288`	`if (!params.conversation_mode) {`
`288`		`- if (params.enable_chat_template && !params.prompt.empty()) {`
	`289`	`+ if (explicit_chat_template && !params.prompt.empty()) {`
`289`	`290`	`// format and append the user prompt`
`290`	`291`	`prompt += chat_add_and_format("user", params.prompt);`
`291`	`292`	`} else {`