Skip to content

server : refactor multitask handling #9274

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.

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

Merged
merged 10 commits into from
Sep 2, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix embeddings
  • Loading branch information
ngxson committed Sep 1, 2024
commit 9f56c176697cade52acf01398ae4522006332af7
32 changes: 15 additions & 17 deletions examples/server/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3037,8 +3037,6 @@ int main(int argc, char ** argv) {
}, [&](json error_data) {
server_sent_event(sink, "error", error_data);
});
std::string done_event = "[DONE]"; // OAI-compat behavior
sink.write(done_event.c_str(), done_event.size());
sink.done();
return true;
};
Expand Down Expand Up @@ -3106,28 +3104,28 @@ int main(int argc, char ** argv) {
}

// create and queue the task
json responses;
json responses = json::array();
bool error = false;
{
std::vector<server_task> tasks = ctx_server.create_tasks_completion({{"prompt", prompt}}, SERVER_TASK_CMPL_TYPE_EMBEDDING);
ctx_server.queue_results.add_waiting_tasks(tasks);
ctx_server.queue_tasks.post(tasks);

// get the result
server_task_result result = ctx_server.queue_results.recv(tasks);
ctx_server.queue_results.remove_waiting_tasks(tasks);
if (!result.error) {
if (result.data.count("results")) {
// result for multi-task
responses = result.data.at("results");
} else {
// result for single task
responses = std::vector<json>{result.data};
std::vector<int> task_ids = server_task::get_list_id(tasks);

ctx_server.receive_cmpl_results(task_ids, [&](std::vector<server_task_result> & results) {
for (const auto & res : results) {
responses.push_back(res.data);
}
} else {
// error received, ignore everything else
res_error(res, result.data);
return;
}
}, [&](json error_data) {
res_error(res, error_data);
error = true;
});
}

if (error) {
return;
}

// write JSON response
Expand Down