Commit afe77e18f for llama.cpp
commit afe77e18fadc2e673c6a6299495a443e17378ce4
Author: Aldehir Rojas <hello@alde.dev>
Date: Sat Nov 21 15:27:25 2026 -0600
chat : pass reasoning_effort = none if supported (#32763)
diff --git a/common/jinja/caps.cpp b/common/jinja/caps.cpp
index cf14c71c5..1f967daf6 100644
--- a/common/jinja/caps.cpp
+++ b/common/jinja/caps.cpp
@@ -593,7 +593,7 @@ caps caps_get(jinja::program & prog) {
if (result.supports_reasoning_effort) {
JJ_DEBUG("%s\n", ">>> Running capability check: reasoning effort levels");
- static const std::vector<std::string> candidates = { "minimal", "low", "medium", "high", "xhigh", "max" };
+ static const std::vector<std::string> candidates = { "none", "minimal", "low", "medium", "high", "xhigh", "max" };
// renders a single user turn with the given effort, nothing when the template raises
const auto render = [&](const std::string & effort) {
@@ -631,7 +631,10 @@ caps caps_get(jinja::program & prog) {
for (const auto & level : candidates) {
const auto rendered = render(level);
if (!rendered) {
- rejected.push_back(level);
+ // "none" also turns thinking off, so the server does not answer it with an error
+ if (level != "none") {
+ rejected.push_back(level);
+ }
continue;
}
if (rendered == unknown) {
diff --git a/tests/test-chat.cpp b/tests/test-chat.cpp
index 302ef319f..c4332941b 100644
--- a/tests/test-chat.cpp
+++ b/tests/test-chat.cpp
@@ -8720,7 +8720,7 @@ static void test_reasoning_effort_caps() {
assert_equals(json(expected).dump(), common_chat_templates_get_caps(tmpls.get()).at("reasoning_effort_levels").dump());
};
- const std::vector<std::string> all_levels = { "minimal", "low", "medium", "high", "xhigh", "max" };
+ const std::vector<std::string> all_levels = { "none", "minimal", "low", "medium", "high", "xhigh", "max" };
assert_effort_levels("models/templates/deepseek-ai-DeepSeek-V4.jinja", { "max" });
assert_effort_levels("models/templates/deepseek-ai-DeepSeek-V4-Flash-0731.jinja", { "high", "max" });
@@ -8730,7 +8730,8 @@ static void test_reasoning_effort_caps() {
assert_effort_levels("models/templates/upstage-Solar-Open-100B.jinja", { "low" });
assert_effort_levels("models/templates/muse-glimmer.jinja", all_levels);
assert_effort_levels("models/templates/openai-gpt-oss-120b.jinja", all_levels);
- assert_effort_levels("models/templates/Cohere2MoE.jinja", {});
+ assert_effort_levels("models/templates/Cohere2MoE.jinja", { "none" });
+ assert_effort_levels("models/templates/thinkingmachines-Inkling-2-Small.jinja", { "none", "minimal", "low", "medium", "high", "max" });
assert_effort_levels("models/templates/Qwen-Qwen3-0.6B.jinja", {});
auto assert_effort_rejected = [](const std::string & path, const std::vector<std::string> & expected) {
diff --git a/tools/server/server-common.cpp b/tools/server/server-common.cpp
index eb5781e74..8d4c022e9 100644
--- a/tools/server/server-common.cpp
+++ b/tools/server/server-common.cpp
@@ -1641,13 +1641,18 @@ json oaicompat_chat_params_parse(
// Parse the OAI "reasoning_effort" field; "none" disables reasoning.
if (body.contains("reasoning_effort")) {
auto reasoning_effort = json_value(body, "reasoning_effort", std::string(""));
+ const auto levels = caps.at("reasoning_effort_levels").get<std::vector<std::string>>();
if (reasoning_effort == "none") {
inputs.enable_thinking = false;
- inputs.chat_template_kwargs.erase("reasoning_effort");
+ // Some models use reasoning_effort = none and some throw an exception, so check the model's list of effort levels first
+ if (std::find(levels.begin(), levels.end(), reasoning_effort) != levels.end()) {
+ inputs.chat_template_kwargs["reasoning_effort"] = json(reasoning_effort).dump();
+ } else {
+ inputs.chat_template_kwargs.erase("reasoning_effort");
+ }
} else if (!reasoning_effort.empty()) {
const auto rejected = caps.at("reasoning_effort_rejected").get<std::vector<std::string>>();
if (std::find(rejected.begin(), rejected.end(), reasoning_effort) != rejected.end()) {
- const auto levels = caps.at("reasoning_effort_levels").get<std::vector<std::string>>();
throw std::invalid_argument("reasoning_effort \"" + reasoning_effort + "\" is not supported by the chat template, supported levels: " + string_join(levels, ", "));
}
inputs.chat_template_kwargs["reasoning_effort"] = json(reasoning_effort).dump();