happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert to OAI-compatible args (#20213) 

* Revert to OAI-compatible args

* Apply workaround::func_args_not_string
This commit is contained in:
Piotr Wilkin (ilintar) 2026-03-08 11:33:03 +01:00 committed by GitHub
parent ff52ee964d
commit b283f6d5b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/chat.cpp
View File

@ -129,7 +129,7 @@ json common_chat_msg::to_json_oaicompat(bool concat_typed_text) const {
{"type", "function"}, {"type", "function"},
{"function", { {"function", {
{"name", tool_call.name}, {"name", tool_call.name},
{"arguments", json::parse(tool_call.arguments)}, {"arguments", json(tool_call.arguments)},
}}, }},
}; };
if (!tool_call.id.empty()) { if (!tool_call.id.empty()) {
@ -1353,6 +1353,8 @@ static common_chat_params common_chat_templates_apply_jinja(const struct common_
params.add_bos = tmpls->add_bos; params.add_bos = tmpls->add_bos;
params.add_eos = tmpls->add_eos; params.add_eos = tmpls->add_eos;
workaround::func_args_not_string(params.messages);
if (!tmpl.original_caps().supports_system_role) { if (!tmpl.original_caps().supports_system_role) {
workaround::system_message_not_supported(params.messages); workaround::system_message_not_supported(params.messages);
} }

4
tests/test-chat.cpp
View File

@ -1434,9 +1434,7 @@ static void test_msgs_oaicompat_json_conversion() {
" \"type\": \"function\",\n" " \"type\": \"function\",\n"
" \"function\": {\n" " \"function\": {\n"
" \"name\": \"python\",\n" " \"name\": \"python\",\n"
" \"arguments\": {\n" " \"arguments\": \"{\\\"code\\\":\\\"print('hey')\\\"}\"\n"
" \"code\": \"print('hey')\"\n"
" }\n"
" }\n" " }\n"
" }\n" " }\n"
" ]\n" " ]\n"