ggml-org
diff --git a/‎common/chat.cpp
Copy file name to clipboardExpand all lines: common/chat.cpp
+1-2Lines changed: 1 addition & 2 deletions b/‎common/chat.cpp
Copy file name to clipboardExpand all lines: common/chat.cpp
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎examples/server/utils.hpp
Copy file name to clipboardExpand all lines: examples/server/utils.hpp
+2-3Lines changed: 2 additions & 3 deletions b/‎examples/server/utils.hpp
Copy file name to clipboardExpand all lines: examples/server/utils.hpp
+2-3Lines changed: 2 additions & 3 deletions
@@ -1593,8 +1593,7 @@ static common_chat_params common_chat_templates_apply_jinja(
     params.tool_choice = inputs.tool_choice;
     params.grammar = inputs.grammar;
 
-    for(auto el: inputs.chat_template_kwargs)
-    {
+    for (auto el: inputs.chat_template_kwargs) {
         params.extra_context[el.first] = json::parse(el.second);
     }
 
 
@@ -641,8 +641,7 @@ static json oaicompat_completion_params_parse(
     inputs.add_generation_prompt = json_value(body, "add_generation_prompt", true);
 
     auto chat_template_kwargs_object = json_value(body, "chat_template_kwargs", json::object());
-    for (const auto & item: default_template_kwargs)
-    {
+    for (const auto & item: default_template_kwargs) {
         inputs.chat_template_kwargs[item.first] = item.second;
     }
     for (const auto & item : chat_template_kwargs_object.items()) {
@@ -666,7 +665,7 @@ static json oaicompat_completion_params_parse(
             throw std::runtime_error("Cannot have 2 or more assistant messages at the end of the list.");
         }
 
-        if(inputs.chat_template_kwargs.find("enable_thinking") != inputs.chat_template_kwargs.end()) {
+        if (inputs.chat_template_kwargs.find("enable_thinking") != inputs.chat_template_kwargs.end()) {
             throw std::runtime_error("Assistant response prefill is incompatible with enable_thinking.");
         }
Original file line number	Diff line number	Diff line change
`@@ -1593,8 +1593,7 @@ static common_chat_params common_chat_templates_apply_jinja(`
`1593`	`1593`	`params.tool_choice = inputs.tool_choice;`
`1594`	`1594`	`params.grammar = inputs.grammar;`
`1595`	`1595`
`1596`		`- for(auto el: inputs.chat_template_kwargs)`
`1597`		`- {`
	`1596`	`+ for (auto el: inputs.chat_template_kwargs) {`
`1598`	`1597`	`params.extra_context[el.first] = json::parse(el.second);`
`1599`	`1598`	`}`
`1600`	`1599`
Original file line number	Diff line number	Diff line change
`@@ -641,8 +641,7 @@ static json oaicompat_completion_params_parse(`
`641`	`641`	`inputs.add_generation_prompt = json_value(body, "add_generation_prompt", true);`
`642`	`642`
`643`	`643`	`auto chat_template_kwargs_object = json_value(body, "chat_template_kwargs", json::object());`
`644`		`- for (const auto & item: default_template_kwargs)`
`645`		`- {`
	`644`	`+ for (const auto & item: default_template_kwargs) {`
`646`	`645`	`inputs.chat_template_kwargs[item.first] = item.second;`
`647`	`646`	`}`
`648`	`647`	`for (const auto & item : chat_template_kwargs_object.items()) {`
`@@ -666,7 +665,7 @@ static json oaicompat_completion_params_parse(`
`666`	`665`	`throw std::runtime_error("Cannot have 2 or more assistant messages at the end of the list.");`
`667`	`666`	`}`
`668`	`667`
`669`		`- if(inputs.chat_template_kwargs.find("enable_thinking") != inputs.chat_template_kwargs.end()) {`
	`668`	`+ if (inputs.chat_template_kwargs.find("enable_thinking") != inputs.chat_template_kwargs.end()) {`
`670`	`669`	`throw std::runtime_error("Assistant response prefill is incompatible with enable_thinking.");`
`671`	`670`	`}`
`672`	`671`