Merge branch 'sync-minja-4' into r1-toolcall

ochafik · ochafik · commit d43e4f6c2201 · 2025-02-04T04:05:02.000Z
diff --git a/common/chat-template.hpp b/common/chat-template.hpp
@@ -463,12 +463,8 @@ class chat_template {
             {"messages", actual_messages},
             {"add_generation_prompt", inputs.add_generation_prompt},
         }));
-        if (opts.use_bos_token) {
-            context->set("bos_token", bos_token_);
-        }
-        if (opts.use_eos_token) {
-            context->set("eos_token", eos_token_);
-        }
+        context->set("bos_token", opts.use_bos_token ? bos_token_ : "");
+        context->set("eos_token", opts.use_eos_token ? eos_token_ : "");
         if (opts.define_strftime_now) {
             auto now = inputs.now;
             context->set("strftime_now", Value::callable([now](const std::shared_ptr<minja::Context> &, minja::ArgumentsValue & args) {
diff --git a/common/chat.cpp b/common/chat.cpp
@@ -175,7 +175,7 @@ static void foreach_function(const json & tools, const std::function<void(const
 }
 
 static std::string apply(
-    const common_chat_template & tmpl, 
+    const common_chat_template & tmpl,
     const nlohmann::ordered_json & messages,
     const nlohmann::ordered_json & tools,
     bool add_generation_prompt,

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ static void foreach_function(const json & tools, const std::function<void(const`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`static std::string apply(`
`178`		`- const common_chat_template & tmpl,`
	`178`	`+ const common_chat_template & tmpl,`
`179`	`179`	`const nlohmann::ordered_json & messages,`
`180`	`180`	`const nlohmann::ordered_json & tools,`
`181`	`181`	`bool add_generation_prompt,`