Skip to content

fix(server): preserve tool result adjacency in compat converters #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
marksverdhei wants to merge 1 commit into
base: ht
Choose a base branch
from
Draft

fix(server): preserve tool result adjacency in compat converters #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions tests/test-chat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,6 +1900,54 @@ static void test_convert_responses_to_chatcmpl() {
}
}

static void test_compat_tool_result_ordering() {
LOG_DBG("%s\n", __func__);

{
const json input = json::parse(R"({
"messages": [
{"role": "assistant", "content": [
{"type": "tool_use", "id": "call_1", "name": "lookup", "input": {}}
]},
{"role": "user", "content": [
{"type": "text", "text": "Use this result."},
{"type": "tool_result", "tool_use_id": "call_1", "content": "done"}
]}
]
})");

const json result = server_chat_convert_anthropic_to_oai(input);
const auto & messages = result.at("messages");
assert_equals((size_t) 3, messages.size());
assert_equals(std::string("assistant"), messages[0].at("role").get<std::string>());
assert_equals(std::string("tool"), messages[1].at("role").get<std::string>());
assert_equals(std::string("call_1"), messages[1].at("tool_call_id").get<std::string>());
assert_equals(std::string("user"), messages[2].at("role").get<std::string>());
}

{
const json input = json::parse(R"({
"contents": [
{"role": "model", "parts": [
{"functionCall": {"name": "lookup", "args": {}}}
]},
{"role": "user", "parts": [
{"text": "Use this result."},
{"functionResponse": {"name": "lookup", "response": {"value": "done"}}}
]}
]
})");

const json result = server_chat_convert_gemini_to_oai(input);
const auto & messages = result.at("messages");
assert_equals((size_t) 3, messages.size());
assert_equals(std::string("assistant"), messages[0].at("role").get<std::string>());
assert_equals(std::string("tool"), messages[1].at("role").get<std::string>());
assert_equals(std::string("lookup"), messages[1].at("tool_call_id").get<std::string>());
assert_equals(std::string("user"), messages[2].at("role").get<std::string>());
}
}

// Shared LFM2 parser cases - all variants use one output format and parser
static void test_lfm2_parser(const std::string & template_path, bool detailed_debug) {
auto tst = peg_tester(template_path, detailed_debug);
Expand Down Expand Up @@ -5935,6 +5983,7 @@ int main(int argc, char ** argv) {
test_msg_token_delimiters_split();
test_tools_oaicompat_json_conversion();
test_convert_responses_to_chatcmpl();
test_compat_tool_result_ordering();
test_developer_role_to_system_workaround();
test_template_generation_prompt();
test_template_output_peg_parsers(detailed_debug);
Expand Down
16 changes: 8 additions & 8 deletions tools/server/server-chat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,10 @@ json server_chat_convert_anthropic_to_oai(const json & body) {
}
}

for (const auto & tool_msg : tool_results) {
oai_messages.push_back(tool_msg);
}

if (!converted_content.empty() || has_tool_calls || !reasoning_content.empty()) {
json new_msg = {{"role", role}};
if (!converted_content.empty()) {
Expand All @@ -467,10 +471,6 @@ json server_chat_convert_anthropic_to_oai(const json & body) {
}
oai_messages.push_back(new_msg);
}

for (const auto & tool_msg : tool_results) {
oai_messages.push_back(tool_msg);
}
}
}

Expand Down Expand Up @@ -706,6 +706,10 @@ json server_chat_convert_gemini_to_oai(const json & body) {
}
}

for (const auto & tool_msg : tool_results) {
oai_messages.push_back(tool_msg);
}

if (!converted_content.empty() || has_tool_calls) {
json new_msg = {{"role", role}};
if (!converted_content.empty()) {
Expand All @@ -722,10 +726,6 @@ json server_chat_convert_gemini_to_oai(const json & body) {
}
oai_messages.push_back(new_msg);
}

for (const auto & tool_msg : tool_results) {
oai_messages.push_back(tool_msg);
}
}
}
}
Expand Down
Loading