From 42937a53226167e0f0d5f112d01685a9e1f44caf Mon Sep 17 00:00:00 2001 From: ExtReMLapin <3909752+ExtReMLapin@users.noreply.github.com> Date: Mon, 11 Aug 2025 23:21:48 +0200 Subject: [PATCH] refactored changes to follow string tern op --- common/chat.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/common/chat.cpp b/common/chat.cpp index 7ac3686e12..932231facd 100644 --- a/common/chat.cpp +++ b/common/chat.cpp @@ -1640,19 +1640,13 @@ static common_chat_params common_chat_params_init_hermes_2_pro(const common_chat tool_call_alts.push_back( "( \"```\\n\" | \"```json\\n\" | \"```xml\\n\" ) space " + wrappable_tool_call + " space \"```\" space "); auto tool_call = builder.add_rule("tool_call", string_join(tool_call_alts, " | ")); - if (supports_thinking) - { + if (supports_thinking) { builder.add_rule("thinking", "\"\" [^\\x00]* \"\" space"); - builder.add_rule("root", - "(thinking)? space " + - (inputs.parallel_tool_calls ? "(" + tool_call + ")+" : tool_call)); } - else - { - builder.add_rule("root", - std::string(data.thinking_forced_open ? "( \"\" space )? " : "") + + builder.add_rule("root", + std::string(supports_thinking ? "(thinking)? space " : + data.thinking_forced_open ? "( \"\" space )? " : "") + (inputs.parallel_tool_calls ? "(" + tool_call + ")+" : tool_call)); - } // Trigger on some common known "good bad" outputs (only from the start and with a json that's about a specific argument name to avoid false positives) data.grammar_triggers.push_back({ COMMON_GRAMMAR_TRIGGER_TYPE_PATTERN_FULL,