From 6d5682909f4c896f8486a4bedd2a0740c88ff82d Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 28 Jan 2025 09:22:26 +0000 Subject: [PATCH] Cleanup dead code in llama_3_1 tool call code --- common/chat-handler.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/common/chat-handler.cpp b/common/chat-handler.cpp index 2348fab55..9aad9cc72 100644 --- a/common/chat-handler.cpp +++ b/common/chat-handler.cpp @@ -425,9 +425,7 @@ static common_chat_data common_chat_init_llama_3_1_python_tag_tool_calls(const c tool_rules.push_back( builder.add_rule( name + "-call", - "\"{\" " - // " ( \"\\\"type\\\": \\\"function\\\", \" | space ) " - "\"\\\"name\\\": \\\"" + name + "\\\", \\\"parameters\\\": \" " + + "\"{\\\"name\\\": \\\"" + name + "\\\", \\\"parameters\\\": \" " + builder.add_schema(name + "-args", parameters) + " \"}\"")); data.grammar_triggers.push_back({"{\"name\": \"" + name + "\"", /* .at_start = */ true}); @@ -444,7 +442,7 @@ static common_chat_data common_chat_init_llama_3_1_python_tag_tool_calls(const c }); data.format = "llama 3.1 tool calls"; data.parser = std::make_unique([params](const std::string & input) -> common_chat_msg { - static std::regex function_regex("\\{(?:\"type\": \"function\", |[\\s\\n\\r]*)\"name\": \"([^\"]+)\", \"parameters\": "); + static std::regex function_regex("\\{\"name\": \"([^\"]+)\", \"parameters\": "); static std::regex close_regex("\\}"); static std::regex builtin_call_regex("<\\|python_tag\\|>([^.(]+)\\.call\\((.*)\\)");