Skip to content

Commit 88c9b54

Browse files
author
ochafik
committed
server: simplify handle_tasks signature
1 parent 419e995 commit 88c9b54

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

examples/server/server.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2431,7 +2431,7 @@ static void handle_tasks(
24312431
httplib::Response & res,
24322432
server_context & ctx_server,
24332433
const std::function<std::unordered_set<int>(const std::function<bool()> &)> & create_tasks,
2434-
const std::function<void(const std::unordered_set<int> &, httplib::DataSink & sink, const std::function<bool()> &)> & payload)
2434+
const std::function<void(const std::unordered_set<int> &, httplib::DataSink & sink)> & payload)
24352435
{
24362436
struct State {
24372437
std::unordered_set<int> task_ids;
@@ -2446,15 +2446,15 @@ static void handle_tasks(
24462446
res.set_content_provider(MIMETYPE_JSON, [create_tasks, payload, state, &ctx_server](size_t, httplib::DataSink & sink) {
24472447
auto is_alive = [&sink]() { return sink.is_writable(); };
24482448
state->task_ids = create_tasks(is_alive);
2449-
payload(state->task_ids, sink, is_alive);
2449+
payload(state->task_ids, sink);
24502450
ctx_server.queue_results.remove_waiting_task_ids(state->task_ids);
24512451
return false;
24522452
}, resource_releaser);
24532453
} else {
24542454
res.set_chunked_content_provider("text/event-stream", [create_tasks, payload, state, &ctx_server](size_t, httplib::DataSink & sink) {
24552455
auto is_alive = [&sink]() { return sink.is_writable(); };
24562456
state->task_ids = create_tasks(is_alive);
2457-
payload(state->task_ids, sink, is_alive);
2457+
payload(state->task_ids, sink);
24582458
ctx_server.queue_results.remove_waiting_task_ids(state->task_ids);
24592459
return false;
24602460
}, resource_releaser);
@@ -2958,7 +2958,7 @@ int main(int argc, char ** argv) {
29582958
ctx_server.queue_tasks.post(tasks);
29592959

29602960
return server_task::get_list_id(tasks);
2961-
}, [stream, &res, &ctx_server](const std::unordered_set<int> & task_ids, httplib::DataSink & sink, const std::function<bool()> &) {
2961+
}, [stream, &res, &ctx_server](const std::unordered_set<int> & task_ids, httplib::DataSink & sink) {
29622962
if (!stream) {
29632963
ctx_server.receive_cmpl_results(task_ids, [&res, &sink](std::vector<server_task_result> & results) {
29642964
if (results.size() == 1) {
@@ -3013,7 +3013,7 @@ int main(int argc, char ** argv) {
30133013
ctx_server.queue_tasks.post(tasks);
30143014

30153015
return server_task::get_list_id(tasks);
3016-
}, [data, verbose, stream, &res, &ctx_server](const std::unordered_set<int> & task_ids, httplib::DataSink & sink, const std::function<bool()> & is_alive) {
3016+
}, [data, verbose, stream, &res, &ctx_server](const std::unordered_set<int> & task_ids, httplib::DataSink & sink) {
30173017
const auto completion_id = gen_chatcmplid();
30183018
if (!stream) {
30193019
ctx_server.receive_cmpl_results(task_ids, [completion_id, data, verbose, &sink, &res](std::vector<server_task_result> & results) {
@@ -3143,7 +3143,7 @@ int main(int argc, char ** argv) {
31433143
ctx_server.queue_tasks.post(tasks);
31443144

31453145
return server_task::get_list_id(tasks);
3146-
}, [is_openai, &ctx_server, &res, body](const std::unordered_set<int> & task_ids, httplib::DataSink & sink, const std::function<bool()> &) {
3146+
}, [is_openai, &ctx_server, &res, body](const std::unordered_set<int> & task_ids, httplib::DataSink & sink) {
31473147
bool error = false;
31483148
json responses = json::array();
31493149

0 commit comments

Comments
 (0)