From 81d9ce44a5968533c03e0a03b29e600bffb8c559 Mon Sep 17 00:00:00 2001 From: Piotr Wilkin Date: Sat, 7 Mar 2026 21:11:04 +0100 Subject: [PATCH 1/2] Revert to OAI-compatible args --- common/chat.cpp | 2 +- tests/test-chat.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/chat.cpp b/common/chat.cpp index 81c23430af9..6d71524858e 100644 --- a/common/chat.cpp +++ b/common/chat.cpp @@ -129,7 +129,7 @@ json common_chat_msg::to_json_oaicompat(bool concat_typed_text) const { {"type", "function"}, {"function", { {"name", tool_call.name}, - {"arguments", json::parse(tool_call.arguments)}, + {"arguments", json(tool_call.arguments)}, }}, }; if (!tool_call.id.empty()) { diff --git a/tests/test-chat.cpp b/tests/test-chat.cpp index 0bd95af5d43..7b44776713f 100644 --- a/tests/test-chat.cpp +++ b/tests/test-chat.cpp @@ -1434,9 +1434,7 @@ static void test_msgs_oaicompat_json_conversion() { " \"type\": \"function\",\n" " \"function\": {\n" " \"name\": \"python\",\n" - " \"arguments\": {\n" - " \"code\": \"print('hey')\"\n" - " }\n" + " \"arguments\": \"{\\\"code\\\":\\\"print('hey')\\\"}\"\n" " }\n" " }\n" " ]\n" From 1feb5f71da7af31f9380ac675ddd109aa7737412 Mon Sep 17 00:00:00 2001 From: Piotr Wilkin Date: Sun, 8 Mar 2026 01:38:06 +0100 Subject: [PATCH 2/2] Apply workaround::func_args_not_string --- common/chat.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/chat.cpp b/common/chat.cpp index 6d71524858e..dff7879af01 100644 --- a/common/chat.cpp +++ b/common/chat.cpp @@ -1353,6 +1353,8 @@ static common_chat_params common_chat_templates_apply_jinja(const struct common_ params.add_bos = tmpls->add_bos; params.add_eos = tmpls->add_eos; + workaround::func_args_not_string(params.messages); + if (!tmpl.original_caps().supports_system_role) { workaround::system_message_not_supported(params.messages); }