1430c35948
Build Actions Cache / ubuntu-24-vulkan-cache (push) Has been cancelled
Build Actions Cache / ubuntu-24-spacemit-cache (push) Has been cancelled
Build Actions Cache / windows-2022-rocm-cache (push) Has been cancelled
CI / macOS-latest-cmake-arm64 (push) Has been cancelled
CI / macOS-latest-cmake-x64 (push) Has been cancelled
CI / macOS-latest-cmake-arm64-webgpu (push) Has been cancelled
CI / ubuntu-cpu-cmake (arm64, ubuntu-22.04-arm) (push) Has been cancelled
CI / ubuntu-cpu-cmake (ppc64le, ubuntu-24.04-ppc64le) (push) Has been cancelled
CI / ubuntu-cpu-cmake (s390x, ubuntu-24.04-s390x) (push) Has been cancelled
CI / ubuntu-cpu-cmake (x64, ubuntu-22.04) (push) Has been cancelled
CI / ubuntu-latest-cmake-sanitizer (Debug, ADDRESS) (push) Has been cancelled
CI / ubuntu-latest-cmake-sanitizer (Debug, THREAD) (push) Has been cancelled
CI / ubuntu-latest-cmake-sanitizer (Debug, UNDEFINED) (push) Has been cancelled
CI / ubuntu-latest-llguidance (push) Has been cancelled
CI / ubuntu-latest-cmake-rpc (push) Has been cancelled
CI / ubuntu-24-cmake-vulkan-deb (push) Has been cancelled
CI / ubuntu-24-cmake-vulkan (push) Has been cancelled
CI / ubuntu-24-cmake-webgpu (push) Has been cancelled
CI / ubuntu-24-wasm-webgpu (push) Has been cancelled
CI / ubuntu-22-cmake-hip (push) Has been cancelled
CI / ubuntu-22-cmake-musa (push) Has been cancelled
CI / ubuntu-22-cmake-sycl (push) Has been cancelled
CI / ubuntu-22-cmake-sycl-fp16 (push) Has been cancelled
CI / build-linux-cross (push) Has been cancelled
CI / build-cmake-pkg (push) Has been cancelled
CI / macOS-latest-cmake-ios (push) Has been cancelled
CI / macOS-latest-cmake-tvos (push) Has been cancelled
CI / macOS-latest-cmake-visionos (push) Has been cancelled
CI / windows-msys2 (Release, clang-x86_64, CLANG64) (push) Has been cancelled
CI / windows-msys2 (Release, ucrt-x86_64, UCRT64) (push) Has been cancelled
CI / windows-latest-cmake (arm64, llvm-arm64, -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON) (push) Has been cancelled
CI / windows-latest-cmake (arm64, llvm-arm64-opencl-adreno, -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/opencl-arm64-release" -DGGML_OPENCL=ON -DGGML_OPENCL_USE_ADRENO_KERNELS=ON) (push) Has been cancelled
CI / windows-latest-cmake (x64, cpu-x64 (static), -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DBUILD_SHARED_LIBS=OFF) (push) Has been cancelled
CI / windows-latest-cmake (x64, openblas-x64, -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_BLAS=… (push) Has been cancelled
CI / windows-latest-cmake (x64, vulkan-x64, -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON) (push) Has been cancelled
CI / ubuntu-latest-cmake-cuda (push) Has been cancelled
CI / windows-2022-cmake-cuda (12.4) (push) Has been cancelled
CI / windows-latest-cmake-sycl (push) Has been cancelled
CI / windows-latest-cmake-hip (push) Has been cancelled
CI / ios-xcode-build (push) Has been cancelled
CI / android-build (push) Has been cancelled
CI / android-ndk-build (arm64-cpu, -D ANDROID_ABI=arm64-v8a -D ANDROID_PLATFORM=android-31 -D CMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -D GGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv8.5-a+fp16+i8mm -G Ninja -D LLAMA_OPENSSL=O… (push) Has been cancelled
CI / android-ndk-build (arm64-snapdragon, --preset arm64-android-snapdragon-release) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (aarch64, Release, 310p, off) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (aarch64, Release, 910b, off) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (aarch64, Release, 910b, on) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (x86, Release, 310p, off) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (x86, Release, 910b, off) (push) Has been cancelled
CI / openEuler-latest-cmake-cann (x86, Release, 910b, on) (push) Has been cancelled
CI / ggml-ci-x64-cpu-low-perf (push) Has been cancelled
CI / ggml-ci-arm64-cpu-low-perf (push) Has been cancelled
CI / ggml-ci-x64-cpu-high-perf (push) Has been cancelled
CI / ggml-ci-arm64-cpu-high-perf (push) Has been cancelled
CI / ggml-ci-arm64-cpu-high-perf-sve (push) Has been cancelled
CI / ggml-ci-x64-nvidia-cuda (push) Has been cancelled
CI / ggml-ci-x64-nvidia-vulkan-cm (push) Has been cancelled
CI / ggml-ci-x64-nvidia-vulkan-cm2 (push) Has been cancelled
CI / ggml-ci-x64-cpu-amx (push) Has been cancelled
CI / ggml-ci-mac-metal (push) Has been cancelled
CI / ggml-ci-mac-webgpu (push) Has been cancelled
CI / ggml-ci-mac-vulkan (push) Has been cancelled
CI / ggml-ci-x64-linux-intel-vulkan (push) Has been cancelled
CI / ggml-ci-arm64-cpu-kleidiai (push) Has been cancelled
CI / ubuntu-cpu-cmake-riscv64-native (push) Has been cancelled
CI / ubuntu-cmake-sanitizer-riscv64-native (Debug, ADDRESS) (push) Has been cancelled
CI / ubuntu-cmake-sanitizer-riscv64-native (Debug, THREAD) (push) Has been cancelled
CI / ubuntu-cmake-sanitizer-riscv64-native (Debug, UNDEFINED) (push) Has been cancelled
CI / ubuntu-llguidance-riscv64-native (push) Has been cancelled
CI / ubuntu-cmake-rpc-riscv64-native (push) Has been cancelled
CI / ggml-ci-arm64-graviton4-kleidiai (push) Has been cancelled
EditorConfig Checker / editorconfig (push) Has been cancelled
Release / macOS-arm64 (push) Has been cancelled
Release / macOS-x64 (push) Has been cancelled
Release / ubuntu-22-cpu (s390x, ubuntu-24.04-s390x) (push) Has been cancelled
Release / ubuntu-22-cpu (x64, ubuntu-22.04) (push) Has been cancelled
Release / ubuntu-22-vulkan (push) Has been cancelled
Release / windows-cpu (arm64) (push) Has been cancelled
Release / windows-cpu (x64) (push) Has been cancelled
Release / windows (arm64, opencl-adreno, -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/opencl-arm64-release" -DGGML_OPENCL=ON -DGGML_OPENCL_USE_ADRENO_KERNELS=ON, ggml-opencl) (push) Has been cancelled
Release / windows (x64, vulkan, -DGGML_VULKAN=ON, ggml-vulkan) (push) Has been cancelled
Release / windows-cuda (12.4) (push) Has been cancelled
Release / windows-cuda (13.1) (push) Has been cancelled
Release / windows-sycl (push) Has been cancelled
Release / ubuntu-22-rocm (7.2, x64, gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1151;gfx1150;gfx1200;gfx1201) (push) Has been cancelled
Release / windows-hip (gfx1150;gfx1151;gfx1200;gfx1201;gfx1100;gfx1101;gfx1102;gfx1030;gfx1031;gfx1032, radeon) (push) Has been cancelled
Release / ios-xcode-build (push) Has been cancelled
Release / openEuler-cann (aarch64, Release, 310p, off) (push) Has been cancelled
Release / openEuler-cann (aarch64, Release, 910b, on) (push) Has been cancelled
Release / openEuler-cann (x86, Release, 310p, off) (push) Has been cancelled
Release / openEuler-cann (x86, Release, 910b, on) (push) Has been cancelled
Server-Metal / server-metal (GPUx2, backend-sampling) (push) Has been cancelled
Server-Metal / server-metal (GPUx2) (push) Has been cancelled
Server-Metal / server-metal (GPUx1) (push) Has been cancelled
Server-Metal / server-metal (GPUx1, backend-sampling) (push) Has been cancelled
Server / server (RelWithDebInfo, ADDRESS) (push) Has been cancelled
Server / server (RelWithDebInfo, UNDEFINED) (push) Has been cancelled
Server / server (Release, , ) (push) Has been cancelled
Server / server (Release, LLAMA_ARG_BACKEND_SAMPLING=1, ) (push) Has been cancelled
Server / server-windows (push) Has been cancelled
CI / macOS-latest-swift (generic/platform=iOS) (push) Has been cancelled
CI / macOS-latest-swift (generic/platform=macOS) (push) Has been cancelled
CI / macOS-latest-swift (generic/platform=tvOS) (push) Has been cancelled
Release / release (push) Has been cancelled
Close inactive issues / close-issues (push) Has been cancelled
Publish Docker image / Push Docker image to Docker Hub (map[cuda_version:12.4.0 dockerfile:.devops/cuda.Dockerfile free_disk_space:true full:true light:true platforms:linux/amd64 runs_on:ubuntu-22.04 server:true tag:cuda cuda12 ubuntu_version:22.04]) (push) Has been cancelled
Publish Docker image / Push Docker image to Docker Hub (map[cuda_version:13.1.0 dockerfile:.devops/cuda-new.Dockerfile free_disk_space:true full:true light:true platforms:linux/amd64 runs_on:ubuntu-22.04 server:true tag:cuda13 ubuntu_version:24.04]) (push) Has been cancelled
Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/cpu.Dockerfile free_disk_space:false full:true light:true platforms:linux/amd64 runs_on:ubuntu-22.04 server:true tag:cpu]) (push) Has been cancelled
Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/intel.Dockerfile free_disk_space:true full:true light:true platforms:linux/amd64 runs_on:ubuntu-22.04 server:true tag:intel]) (push) Has been cancelled
Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/musa.Dockerfile free_disk_space:true full:true light:true platforms:linux/amd64 runs_on:ubuntu-22.04 server:true tag:musa]) (push) Has been cancelled
Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/rocm.Dockerfile free_disk_space:true full:true light:true platforms:linux/amd64 runs_on:ubuntu-22.04 server:true tag:rocm]) (push) Has been cancelled
Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/s390x.Dockerfile free_disk_space:false full:true light:true platforms:linux/s390x runs_on:ubuntu-22.04-s390x server:true tag:s390x]) (push) Has been cancelled
Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/vulkan.Dockerfile free_disk_space:false full:true light:true platforms:linux/amd64 runs_on:ubuntu-22.04 server:true tag:vulkan]) (push) Has been cancelled
Publish Docker image / Create and push git tag (push) Has been cancelled
Update Winget Package / Update Winget Package (push) Has been cancelled
455 lines
20 KiB
C++
455 lines
20 KiB
C++
#include "chat-auto-parser.h"
|
|
#include "chat-peg-parser.h"
|
|
#include "chat.h"
|
|
#include "common.h"
|
|
#include "json-schema-to-grammar.h"
|
|
#include "log.h"
|
|
#include "nlohmann/json.hpp"
|
|
|
|
#include <stdexcept>
|
|
#include <string>
|
|
|
|
using json = nlohmann::ordered_json;
|
|
|
|
// Helper to iterate over tools/functions
|
|
static void foreach_function(const json & tools, const std::function<void(const json &)> & fn) {
|
|
for (const auto & tool : tools) {
|
|
if (!tool.contains("type") || tool.at("type") != "function" || !tool.contains("function")) {
|
|
continue;
|
|
}
|
|
fn(tool);
|
|
}
|
|
}
|
|
|
|
namespace autoparser {
|
|
|
|
parser_build_context::parser_build_context(common_chat_peg_builder & p, const templates_params & inputs) :
|
|
p(p),
|
|
inputs(inputs),
|
|
reasoning_parser(p.eps()) {}
|
|
|
|
common_chat_params peg_generator::generate_parser(const common_chat_template & tmpl,
|
|
const struct templates_params & inputs) {
|
|
// Run differential analysis to extract template structure
|
|
struct autoparser autoparser;
|
|
autoparser.analyze_template(tmpl);
|
|
return generate_parser(tmpl, inputs, autoparser);
|
|
}
|
|
|
|
common_chat_params peg_generator::generate_parser(const common_chat_template & tmpl,
|
|
const struct templates_params & inputs,
|
|
const autoparser & autoparser) {
|
|
// Build the parser using the analysis results
|
|
auto parser = autoparser.build_parser(inputs);
|
|
|
|
// Create the result structure
|
|
common_chat_params data;
|
|
data.prompt = common_chat_template_direct_apply(tmpl, inputs);
|
|
data.format = COMMON_CHAT_FORMAT_PEG_NATIVE;
|
|
data.preserved_tokens = autoparser.preserved_tokens;
|
|
data.parser = parser.save();
|
|
|
|
// Build grammar if tools are present
|
|
bool has_tools =
|
|
autoparser.tools.format.mode != tool_format::NONE && inputs.tools.is_array() && !inputs.tools.empty();
|
|
std::string trigger_marker = !autoparser.tools.format.section_start.empty() ? autoparser.tools.format.section_start :
|
|
autoparser.tools.format.per_call_start;
|
|
|
|
bool has_response_format = !inputs.json_schema.empty() && inputs.json_schema.is_object();
|
|
bool include_grammar = has_response_format || (has_tools &&
|
|
((inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_AUTO && !trigger_marker.empty()) ||
|
|
inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED));
|
|
|
|
if (include_grammar) {
|
|
data.grammar_lazy = !has_response_format && inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_AUTO;
|
|
data.grammar = build_grammar([&](const common_grammar_builder & builder) {
|
|
foreach_function(inputs.tools, [&](const json & tool) {
|
|
const auto & function = tool.at("function");
|
|
auto schema = function.at("parameters");
|
|
builder.resolve_refs(schema);
|
|
});
|
|
parser.build_grammar(builder, data.grammar_lazy);
|
|
});
|
|
|
|
// Set grammar triggers based on tool section markers (fall back to per-call markers)
|
|
if (data.grammar_lazy) {
|
|
data.grammar_triggers = {
|
|
{ COMMON_GRAMMAR_TRIGGER_TYPE_WORD, trigger_marker }
|
|
};
|
|
}
|
|
}
|
|
|
|
return data;
|
|
}
|
|
|
|
common_peg_arena autoparser::build_parser(const templates_params & inputs) const {
|
|
if (!analysis_complete) {
|
|
throw std::invalid_argument("Cannot call build_parser on autoparser without performing analysis first, call analyze_template(...)");
|
|
}
|
|
return build_chat_peg_parser([&](common_chat_peg_builder & p) {
|
|
// If the template uses Python dict format (single-quoted strings in JSON structures),
|
|
// pre-register a json-string rule that accepts both quote styles. This must happen
|
|
// before any call to p.json() so that all JSON parsing inherits the flexible rule.
|
|
if (tools.format.uses_python_dicts) {
|
|
p.rule("json-string", p.quoted_string());
|
|
}
|
|
|
|
parser_build_context ctx(p, inputs);
|
|
bool extract_reasoning = inputs.reasoning_format != COMMON_REASONING_FORMAT_NONE;
|
|
bool enable_thinking = inputs.enable_thinking;
|
|
|
|
ctx.extracting_reasoning = extract_reasoning && enable_thinking && reasoning.mode != reasoning_mode::NONE;
|
|
ctx.content = &content;
|
|
|
|
// Build reasoning parser
|
|
ctx.reasoning_parser = reasoning.build_parser(ctx);
|
|
|
|
bool has_tools = inputs.tools.is_array() && !inputs.tools.empty();
|
|
bool has_response_format = inputs.json_schema.is_object() && !inputs.json_schema.empty();
|
|
|
|
if (has_response_format) {
|
|
auto response_format = p.rule("response-format", p.content(p.schema(p.json(), "response-format-schema", inputs.json_schema)));
|
|
return ctx.reasoning_parser + p.space() + p.choice({
|
|
p.literal("```json") + p.space() + response_format + p.space() + p.literal("```"),
|
|
response_format
|
|
}) + p.end();
|
|
}
|
|
|
|
if (has_tools && inputs.tool_choice != COMMON_CHAT_TOOL_CHOICE_NONE && jinja_caps.supports_tool_calls) {
|
|
return tools.build_parser(ctx);
|
|
}
|
|
|
|
return content.build_parser(ctx);
|
|
});
|
|
}
|
|
|
|
common_peg_parser analyze_reasoning::build_parser(parser_build_context & ctx) const {
|
|
auto & p = ctx.p;
|
|
|
|
if (!ctx.extracting_reasoning) {
|
|
return p.eps();
|
|
}
|
|
|
|
bool thinking_forced_open = (mode == reasoning_mode::FORCED_OPEN);
|
|
bool thinking_forced_closed = (mode == reasoning_mode::FORCED_CLOSED);
|
|
|
|
if (thinking_forced_open || thinking_forced_closed) {
|
|
// Thinking is forced open OR forced closed with enable_thinking=true
|
|
// In both cases, expect only the closing tag (opening was in template)
|
|
// However, since we might have incorrectly detected the open/close pattern,
|
|
// we admit an optional starting marker
|
|
return p.optional(p.literal(start)) + p.reasoning(p.until(end)) + end;
|
|
}
|
|
if (mode == reasoning_mode::TAG_BASED || mode == reasoning_mode::TOOLS_ONLY) {
|
|
// Standard tag-based reasoning OR tools-only mode (reasoning appears with tools)
|
|
// Both use the same tag-based pattern if markers are available
|
|
if (!start.empty() && !end.empty()) {
|
|
return p.optional(start + p.reasoning(p.until(end)) + end);
|
|
}
|
|
} else if (mode == reasoning_mode::DELIMITER) {
|
|
return p.optional(p.reasoning(p.until(end)) + end);
|
|
}
|
|
|
|
return p.eps();
|
|
}
|
|
|
|
common_peg_parser analyze_content::build_parser(parser_build_context & ctx) const {
|
|
auto & p = ctx.p;
|
|
|
|
if (is_always_wrapped()) {
|
|
if (ctx.extracting_reasoning) {
|
|
return ctx.reasoning_parser + start + p.content(p.until(end)) + end + p.end();
|
|
}
|
|
return p.content(p.until(start)) + start + p.content(p.until(end)) + end + p.end();
|
|
}
|
|
return ctx.reasoning_parser + p.content(p.rest()) + p.end();
|
|
}
|
|
|
|
common_peg_parser analyze_content::build_optional_wrapped(parser_build_context & ctx) const {
|
|
auto & p = ctx.p;
|
|
|
|
if (is_always_wrapped()) {
|
|
return p.optional(start + p.content(p.until(end)) + end);
|
|
}
|
|
return p.eps();
|
|
}
|
|
|
|
common_peg_parser analyze_tools::build_parser(parser_build_context & ctx) const {
|
|
switch (format.mode) {
|
|
case tool_format::JSON_NATIVE:
|
|
return build_tool_parser_json_native(ctx);
|
|
case tool_format::TAG_WITH_JSON:
|
|
return build_tool_parser_tag_json(ctx);
|
|
case tool_format::TAG_WITH_TAGGED:
|
|
return build_tool_parser_tag_tagged(ctx);
|
|
default:
|
|
LOG_ERR("[ERROR] Template seems to support tool calls, but failed to determine tool format. Tool calling will not work properly. "
|
|
"Check for a fixed template for your model in the models/templates directory of your llama.cpp installation or "
|
|
"report an issue at https://github.com/ggml-org/llama.cpp/issues\n");
|
|
return ctx.p.eps();
|
|
}
|
|
}
|
|
|
|
common_peg_parser analyze_tools::build_tool_parser_json_native(parser_build_context & ctx) const {
|
|
auto & p = ctx.p;
|
|
const auto & inputs = ctx.inputs;
|
|
bool force_tools = inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED;
|
|
|
|
// Build effective field names with dot notation if function_field is set
|
|
std::string name_field = format.name_field;
|
|
std::string args_field = format.args_field;
|
|
|
|
if (!format.function_field.empty() && format.function_field != "function" &&
|
|
name_field.find('.') == std::string::npos) {
|
|
name_field = format.function_field + "." + name_field;
|
|
args_field = format.function_field + "." + args_field;
|
|
}
|
|
|
|
auto tools_parser = p.standard_json_tools(
|
|
format.section_start, format.section_end, inputs.tools, inputs.parallel_tool_calls,
|
|
inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED, name_field, args_field, format.tools_array_wrapped,
|
|
format.fun_name_is_key, format.id_field, format.gen_id_field, format.parameter_order);
|
|
|
|
// Handle content wrappers if present
|
|
if (ctx.content && ctx.content->is_always_wrapped()) {
|
|
auto wrapped_content = ctx.content->build_optional_wrapped(ctx);
|
|
return ctx.reasoning_parser + wrapped_content + tools_parser + p.end();
|
|
}
|
|
|
|
std::string tool_start = "{";
|
|
if (!format.section_start.empty()) {
|
|
tool_start = format.section_start;
|
|
} else if (!format.per_call_start.empty()) {
|
|
tool_start = format.per_call_start;
|
|
}
|
|
|
|
return ctx.reasoning_parser + (force_tools ? p.eps() : p.optional(p.content(p.until(tool_start)))) + tools_parser +
|
|
p.end();
|
|
}
|
|
|
|
common_peg_parser analyze_tools::build_tool_parser_tag_json(parser_build_context & ctx) const {
|
|
auto & p = ctx.p;
|
|
const auto & inputs = ctx.inputs;
|
|
bool force_tools = inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED;
|
|
|
|
common_peg_parser tool_choice = p.choice();
|
|
|
|
foreach_function(inputs.tools, [&](const json & tool) {
|
|
const auto & func = tool.at("function");
|
|
std::string name = func.at("name");
|
|
const auto & schema = func.at("parameters");
|
|
|
|
// Build call_id parser based on position (if supported)
|
|
common_peg_parser call_id_section = p.eps();
|
|
if (call_id.pos == call_id_position::BETWEEN_FUNC_AND_ARGS && !call_id.prefix.empty() &&
|
|
!call_id.suffix.empty()) {
|
|
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) +
|
|
call_id_section + p.tool_args(p.schema(p.json(), "tool-" + name + "-schema", schema));
|
|
if (!function.close.empty()) {
|
|
func_parser = func_parser + function.close;
|
|
}
|
|
tool_choice |= p.rule("tool-" + name, func_parser);
|
|
});
|
|
|
|
auto require_calls = inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED;
|
|
|
|
common_peg_parser tool_calls = p.eps();
|
|
|
|
if (!format.per_call_start.empty()) {
|
|
auto wrapped_call = format.per_call_start + tool_choice + format.per_call_end;
|
|
if (inputs.parallel_tool_calls) {
|
|
tool_calls = p.trigger_rule("tool-call", wrapped_call + p.zero_or_more(p.space() + wrapped_call));
|
|
} else {
|
|
tool_calls = p.trigger_rule("tool-call", wrapped_call);
|
|
}
|
|
if (!format.section_start.empty()) {
|
|
tool_calls = p.trigger_rule("tool-calls",
|
|
p.literal(format.section_start) + p.space() + tool_calls + p.space() +
|
|
(format.section_end.empty() ? p.end() : p.literal(format.section_end)));
|
|
}
|
|
} else {
|
|
std::string separator = ", "; // Default
|
|
if (inputs.parallel_tool_calls) {
|
|
tool_calls = p.trigger_rule("tool-call", format.section_start + tool_choice +
|
|
p.zero_or_more(separator + tool_choice) + format.section_end);
|
|
} else {
|
|
tool_calls = p.trigger_rule("tool-call", format.section_start + tool_choice + format.section_end);
|
|
}
|
|
}
|
|
|
|
if (!require_calls) {
|
|
tool_calls = p.optional(tool_calls);
|
|
}
|
|
|
|
std::string trigger_marker = !format.section_start.empty() ? format.section_start : format.per_call_start;
|
|
auto content_before_tools = trigger_marker.empty() ? p.eps() : p.until(trigger_marker);
|
|
return ctx.reasoning_parser + (force_tools ? p.eps() : p.optional(p.content(content_before_tools))) + tool_calls +
|
|
p.end();
|
|
}
|
|
|
|
common_peg_parser analyze_tools::build_tool_parser_tag_tagged(parser_build_context & ctx) const {
|
|
auto & p = ctx.p;
|
|
const auto & inputs = ctx.inputs;
|
|
bool force_tools = inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED;
|
|
|
|
common_peg_parser tool_choice = p.choice();
|
|
|
|
foreach_function(inputs.tools, [&](const json & tool) {
|
|
const auto & func = tool.at("function");
|
|
std::string name = func.at("name");
|
|
const auto & params = func.at("parameters");
|
|
|
|
if (!params.contains("properties") || !params.at("properties").is_object()) {
|
|
return;
|
|
}
|
|
|
|
const auto & properties = params.at("properties");
|
|
std::set<std::string> required;
|
|
if (params.contains("required") && params.at("required").is_array()) {
|
|
params.at("required").get_to(required);
|
|
}
|
|
|
|
// Build parser for each argument, separating required and optional
|
|
std::vector<common_peg_parser> required_parsers;
|
|
std::vector<common_peg_parser> optional_parsers;
|
|
for (const auto & [param_name, param_schema] : properties.items()) {
|
|
bool is_required = required.find(param_name) != required.end();
|
|
std::string type = "object";
|
|
auto type_obj = param_schema.contains("type") ? param_schema.at("type") : json::object();
|
|
if (type_obj.is_string()) {
|
|
type_obj.get_to(type);
|
|
} else if (type_obj.is_object()) {
|
|
if (type_obj.contains("type") && type_obj.at("type").is_string()) {
|
|
type_obj.at("type").get_to(type);
|
|
}
|
|
}
|
|
|
|
auto arg = p.tool_arg(
|
|
p.tool_arg_open(arguments.name_prefix + p.tool_arg_name(p.literal(param_name)) +
|
|
arguments.name_suffix) +
|
|
arguments.value_prefix +
|
|
(type == "string" ? p.tool_arg_string_value(p.schema(p.until(arguments.value_suffix),
|
|
"tool-" + name + "-arg-" + param_name + "-schema",
|
|
param_schema, true)) :
|
|
p.tool_arg_json_value(p.schema(
|
|
p.json(), "tool-" + name + "-arg-" + param_name + "-schema", param_schema, format.uses_python_dicts)) +
|
|
p.space()) +
|
|
p.tool_arg_close(p.literal(arguments.value_suffix)));
|
|
|
|
auto named_arg = p.rule("tool-" + name + "-arg-" + param_name, arg);
|
|
if (is_required) {
|
|
required_parsers.push_back(named_arg);
|
|
} else {
|
|
optional_parsers.push_back(named_arg);
|
|
}
|
|
}
|
|
|
|
// Build required arg sequence in definition order
|
|
common_peg_parser args_seq = p.eps();
|
|
for (size_t i = 0; i < required_parsers.size(); i++) {
|
|
if (i > 0) {
|
|
args_seq = args_seq + p.space();
|
|
}
|
|
args_seq = args_seq + required_parsers[i];
|
|
}
|
|
|
|
// Build optional args with flexible ordering
|
|
if (!optional_parsers.empty()) {
|
|
common_peg_parser any_opt = p.choice();
|
|
for (const auto & opt : optional_parsers) {
|
|
any_opt |= opt;
|
|
}
|
|
args_seq = args_seq + p.repeat(p.space() + any_opt, 0, (int) optional_parsers.size());
|
|
}
|
|
|
|
// Build call_id parser based on position (if supported)
|
|
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() &&
|
|
!call_id.suffix.empty()) {
|
|
have_call_id = true;
|
|
call_id_section = p.optional(call_id.prefix + p.tool_id(p.until(call_id.suffix)) + call_id.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;
|
|
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()) {
|
|
func_parser = func_parser + p.space() + p.tool_close(p.literal(function.close));
|
|
} else if (!format.per_call_end.empty()) {
|
|
// When there's no func_close but there is a per_call_end marker, use peek() to ensure
|
|
// we only emit tool_close when we can actually see the closing marker. This prevents
|
|
// premature closing during partial parsing when we've seen e.g. "</" which could be
|
|
// either "</tool_call>" (end) or "<arg_key>" prefix that failed to match.
|
|
func_parser = func_parser + p.tool_close(p.peek(p.literal(format.per_call_end)));
|
|
} else {
|
|
func_parser =
|
|
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);
|
|
}
|
|
|
|
tool_choice |= p.rule("tool-" + name, func_parser);
|
|
});
|
|
|
|
auto require_tools = inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED;
|
|
|
|
common_peg_parser tool_calls = p.eps();
|
|
|
|
if (!format.per_call_start.empty()) {
|
|
auto wrapped_call = format.per_call_start + p.space() + tool_choice + p.space() + format.per_call_end;
|
|
if (inputs.parallel_tool_calls) {
|
|
tool_calls = p.trigger_rule("tool-call", wrapped_call + p.zero_or_more(p.space() + wrapped_call));
|
|
} else {
|
|
tool_calls = p.trigger_rule("tool-call", wrapped_call);
|
|
}
|
|
if (!format.section_start.empty()) {
|
|
tool_calls = p.trigger_rule("tool-calls",
|
|
p.literal(format.section_start) + p.space() + tool_calls + p.space() +
|
|
(format.section_end.empty() ? p.end() : p.literal(format.section_end)));
|
|
}
|
|
} else {
|
|
std::string separator = ", "; // Default
|
|
|
|
if (inputs.parallel_tool_calls) {
|
|
tool_calls = p.trigger_rule("tool-call", format.section_start + p.space() + tool_choice +
|
|
p.zero_or_more(separator + tool_choice) + p.space() +
|
|
format.section_end);
|
|
} else {
|
|
tool_calls = p.trigger_rule(
|
|
"tool-call", format.section_start + p.space() + tool_choice + p.space() + format.section_end);
|
|
}
|
|
}
|
|
|
|
if (!require_tools) {
|
|
tool_calls = p.optional(tool_calls);
|
|
}
|
|
|
|
std::string trigger_marker = !format.section_start.empty() ? format.section_start : format.per_call_start;
|
|
auto content_before_tools = trigger_marker.empty() ? p.eps() : p.until(trigger_marker);
|
|
return ctx.reasoning_parser + (force_tools ? p.eps() : p.optional(p.content(content_before_tools))) + tool_calls +
|
|
p.end();
|
|
}
|
|
|
|
} // namespace autoparser
|