common/chat : unify and fix LFM2/LFM2.5 tool parser (#24178)

2026-06-05 14:31:56 -05:00
parent e82beaa60d
commit da87e9b612
4 changed files with 143 additions and 133 deletions
@@ -132,9 +132,13 @@ class common_chat_peg_builder : public common_peg_parser_builder {
    // Helper for Python-style function call format: name(arg1="value1", arg2=123)
    // Used by LFM2 and similar templates
    common_peg_parser python_style_tool_calls(const nlohmann::ordered_json & tools,
-                                              bool                           parallel_tool_calls);
+                                              bool                           parallel_tool_calls,
+                                              bool                           allow_json_literals);

  private:
+    // Python values plus JSON true/false/null.
+    common_peg_parser python_or_json_value();
+
    // Implementation helpers for standard_json_tools — one per JSON tool call layout mode
    common_peg_parser build_json_tools_function_is_key(const nlohmann::ordered_json & tools,
                                                       const std::string &            args_key,
@@ -195,4 +199,3 @@ struct tagged_peg_parser {

 tagged_peg_parser build_tagged_peg_parser(
    const std::function<common_peg_parser(common_peg_parser_builder & builder)> & fn);
-