nikola/llama_cpp
1
0
Fork 0
Code Issues Pull Requests Actions 26 Packages Projects Releases Wiki Activity

Autoparser: True streaming (#20177)

Browse Source 
* Relax atomicity constraint for nicer, more pleasent, True Streaming parsing

* Whitespace

* Remove redundant atomics
This commit is contained in:
Piotr Wilkin (ilintar)
2026-03-07 01:55:33 +01:00
committed by GitHub
parent 2f2923f895
commit c024d85908
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/chat-auto-parser-generator.cpp
+23 -5
View File
@@ -239,8 +239,6 @@ common_peg_parser analyze_tools::build_tool_parser_tag_json(parser_build_context
if (!function.close.empty()) { if (!function.close.empty()) {
func_parser = func_parser + function.close; func_parser = func_parser + function.close;
} }
func_parser = p.atomic(func_parser);
tool_choice |= p.rule("tool-" + name, func_parser); tool_choice |= p.rule("tool-" + name, func_parser);
}); });
@@ -357,13 +355,31 @@ common_peg_parser analyze_tools::build_tool_parser_tag_tagged(parser_build_conte
// Build call_id parser based on position (if supported) // Build call_id parser based on position (if supported)
common_peg_parser call_id_section = p.eps(); common_peg_parser call_id_section = p.eps();
bool have_call_id = false;
if (call_id.pos == call_id_position::BETWEEN_FUNC_AND_ARGS && !call_id.prefix.empty() && if (call_id.pos == call_id_position::BETWEEN_FUNC_AND_ARGS && !call_id.prefix.empty() &&
!call_id.suffix.empty()) { !call_id.suffix.empty()) {
call_id_section = p.optional(call_id.prefix + p.tool_id(p.until(call_id.suffix))) + call_id.suffix; have_call_id = true;
call_id_section = p.optional(call_id.prefix + p.tool_id(p.until(call_id.suffix)) + call_id.suffix);
} }
auto func_parser = p.tool_open(function.name_prefix + p.tool_name(p.literal(name)) + function.name_suffix) + bool matched_atomic = false;
common_peg_parser func_parser = p.eps();
if (!function.name_suffix.empty()) {
func_parser = p.tool_open(function.name_prefix + p.tool_name(p.literal(name)) + function.name_suffix) +
call_id_section + p.space() + args_seq; call_id_section + p.space() + args_seq;
matched_atomic = true;
} else if (have_call_id) {
func_parser = p.atomic(p.tool_open(function.name_prefix + p.tool_name(p.literal(name)) + function.name_suffix) +
call_id_section) + p.space() + args_seq;
matched_atomic = true;
} else if (!arguments.name_prefix.empty() && properties.size() > 0) {
func_parser = p.atomic(p.tool_open(function.name_prefix + p.tool_name(p.literal(name)) + function.name_suffix) +
call_id_section + p.space() + p.peek(p.literal(arguments.name_prefix))) + args_seq;
matched_atomic = true;
} else {
func_parser = p.tool_open(function.name_prefix + p.tool_name(p.literal(name)) + function.name_suffix) +
call_id_section + p.space() + args_seq;
}
if (!function.close.empty()) { if (!function.close.empty()) {
func_parser = func_parser + p.space() + p.tool_close(p.literal(function.close)); func_parser = func_parser + p.space() + p.tool_close(p.literal(function.close));
@@ -377,8 +393,10 @@ common_peg_parser analyze_tools::build_tool_parser_tag_tagged(parser_build_conte
func_parser = func_parser =
func_parser + p.tool_close(p.space()); // force this to process tool closing callbacks in mapper func_parser + p.tool_close(p.space()); // force this to process tool closing callbacks in mapper
} }
if (!matched_atomic) {
func_parser = p.atomic(func_parser); func_parser = p.atomic(func_parser);
}
tool_choice |= p.rule("tool-" + name, func_parser); tool_choice |= p.rule("tool-" + name, func_parser);
}); });