tool-call: allow empty tools w/ auto + grammar

ochafik · ochafik · commit 76f5d27b94d2 · 2025-02-16T20:47:36.000Z
diff --git a/examples/server/utils.hpp b/examples/server/utils.hpp
@@ -601,7 +601,7 @@ static json oaicompat_completion_params_parse(
     inputs.use_jinja             = use_jinja;
     inputs.parallel_tool_calls   = json_value(body, "parallel_tool_calls", false);
     inputs.extract_reasoning     = reasoning_format != COMMON_REASONING_FORMAT_NONE;
-    if (inputs.tool_choice != COMMON_CHAT_TOOL_CHOICE_NONE && llama_params.contains("grammar")) {
+    if (!inputs.tools.empty() && inputs.tool_choice != COMMON_CHAT_TOOL_CHOICE_NONE && llama_params.contains("grammar")) {
         throw std::runtime_error("Cannot use custom grammar constraints with tools.");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ static json oaicompat_completion_params_parse(`
`601`	`601`	`inputs.use_jinja = use_jinja;`
`602`	`602`	`inputs.parallel_tool_calls = json_value(body, "parallel_tool_calls", false);`
`603`	`603`	`inputs.extract_reasoning = reasoning_format != COMMON_REASONING_FORMAT_NONE;`
`604`		`- if (inputs.tool_choice != COMMON_CHAT_TOOL_CHOICE_NONE && llama_params.contains("grammar")) {`
	`604`	`+ if (!inputs.tools.empty() && inputs.tool_choice != COMMON_CHAT_TOOL_CHOICE_NONE && llama_params.contains("grammar")) {`
`605`	`605`	`throw std::runtime_error("Cannot use custom grammar constraints with tools.");`
`606`	`606`	`}`
`607`	`607`