vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-04-28 03:30:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

common/autoparser : allow space after tool call (#22073)

Browse source
This commit is contained in:
Aldehir Rojas 2026-04-19 06:28:35 -05:00 • committed by GitHub
parent 471540ae8a
commit d5b780a676
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/chat-auto-parser-generator.cpp
View file

@ -443,14 +443,14 @@ common_peg_parser analyze_tools::build_tool_parser_tag_tagged(parser_build_conte
if (!format.per_call_start.empty()) { if (!format.per_call_start.empty()) {
auto wrapped_call = format.per_call_start + p.space() + tool_choice + p.space() + format.per_call_end; auto wrapped_call = format.per_call_start + p.space() + tool_choice + p.space() + format.per_call_end;
if (inputs.parallel_tool_calls) { if (inputs.parallel_tool_calls) {
tool_calls = p.trigger_rule("tool-call", wrapped_call + p.zero_or_more(p.space() + wrapped_call)); tool_calls = p.trigger_rule("tool-call", wrapped_call + p.zero_or_more(p.space() + wrapped_call) + p.space());
} else { } else {
tool_calls = p.trigger_rule("tool-call", wrapped_call); tool_calls = p.trigger_rule("tool-call", wrapped_call + p.space());
} }
if (!format.section_start.empty()) { if (!format.section_start.empty()) {
tool_calls = p.trigger_rule("tool-calls", tool_calls = p.trigger_rule("tool-calls",
p.literal(format.section_start) + p.space() + tool_calls + p.space() + p.literal(format.section_start) + p.space() + tool_calls + p.space() +
(format.section_end.empty() ? p.end() : p.literal(format.section_end))); (format.section_end.empty() ? p.end() : p.literal(format.section_end) + p.space()));
} }
} else { } else {
std::string separator = ", "; // Default std::string separator = ", "; // Default

12
tests/test-chat.cpp
View file

@ -1796,7 +1796,7 @@ static void test_template_output_peg_parsers(bool detailed_debug) {
"<function=special_function>\n" "<function=special_function>\n"
"<parameter=arg1>\n1\n</parameter>\n" "<parameter=arg1>\n1\n</parameter>\n"
"</function>\n" "</function>\n"
"</tool_call>") "</tool_call>\n")
.enable_thinking(false) .enable_thinking(false)
.reasoning_format(COMMON_REASONING_FORMAT_AUTO) .reasoning_format(COMMON_REASONING_FORMAT_AUTO)
.tools({ special_function_tool }) .tools({ special_function_tool })
@ -1809,7 +1809,7 @@ static void test_template_output_peg_parsers(bool detailed_debug) {
"<function=special_function>\n" "<function=special_function>\n"
"<parameter=arg1>\n1\n</parameter>\n" "<parameter=arg1>\n1\n</parameter>\n"
"</function>\n" "</function>\n"
"</tool_call>") "</tool_call>\n")
.reasoning_format(COMMON_REASONING_FORMAT_AUTO) .reasoning_format(COMMON_REASONING_FORMAT_AUTO)
.tools({ special_function_tool }) .tools({ special_function_tool })
.expect(message_assist_call_thoughts) .expect(message_assist_call_thoughts)
@ -1826,7 +1826,7 @@ static void test_template_output_peg_parsers(bool detailed_debug) {
"<parameter=arg1>\n1\n</parameter>\n" "<parameter=arg1>\n1\n</parameter>\n"
"<parameter=arg2>\n2\n</parameter>\n" "<parameter=arg2>\n2\n</parameter>\n"
"</function>\n" "</function>\n"
"</tool_call>") "</tool_call>\n")
.enable_thinking(false) .enable_thinking(false)
.reasoning_format(COMMON_REASONING_FORMAT_AUTO) .reasoning_format(COMMON_REASONING_FORMAT_AUTO)
.parallel_tool_calls(true) .parallel_tool_calls(true)
@ -1849,7 +1849,7 @@ static void test_template_output_peg_parsers(bool detailed_debug) {
"hello()\n" "hello()\n"
"</parameter>\n" "</parameter>\n"
"</function>\n" "</function>\n"
"</tool_call>") "</tool_call>\n")
.enable_thinking(false) .enable_thinking(false)
.reasoning_format(COMMON_REASONING_FORMAT_AUTO) .reasoning_format(COMMON_REASONING_FORMAT_AUTO)
.tools({ .tools({
@ -1892,7 +1892,7 @@ static void test_template_output_peg_parsers(bool detailed_debug) {
"hello()\n" "hello()\n"
"</parameter>\n" "</parameter>\n"
"</function>\n" "</function>\n"
"</tool_call>" "</tool_call>\n"
) )
.enable_thinking(true) .enable_thinking(true)
.reasoning_format(COMMON_REASONING_FORMAT_AUTO) .reasoning_format(COMMON_REASONING_FORMAT_AUTO)
@ -1908,7 +1908,7 @@ static void test_template_output_peg_parsers(bool detailed_debug) {
"hello()\n" "hello()\n"
"</parameter>\n" "</parameter>\n"
"</function>\n" "</function>\n"
"</tool_call>") "</tool_call>\n")
.expect_tool_calls({ .expect_tool_calls({
{ "python", "{\"code\": \"def hello():\\n print(\\\"Hello, world!\\\")\\n\\nhello()\"}", {} }, { "python", "{\"code\": \"def hello():\\n print(\\\"Hello, world!\\\")\\n\\nhello()\"}", {} },
}) })