From c0f4d54870568c2977db9327223c5c2546bda018 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Sun, 22 Oct 2023 22:24:39 +0300 Subject: [PATCH] server : add comment about changing slot_state to bool --- examples/server/server.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index 9aef21dd3..c3279dbc9 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -158,6 +158,7 @@ struct task_result { json result_json; }; +// TODO: can become bool if we can't find use of more states enum slot_state { IDLE, @@ -188,11 +189,14 @@ struct slot_params struct slot_image { - clip_image_u8 img_data; + int32_t id; + bool request_encode_image = false; float* image_embedding = nullptr; - int image_tokens = 0; - int id; + int32_t image_tokens = 0; + + clip_image_u8 img_data; + std::string prefix_prompt; // before of this image }; @@ -769,8 +773,8 @@ struct llama_server_context { for (const auto &img : *images_data) { - slot_image img_sl; std::string data_b64 = img["data"].get(); + slot_image img_sl; img_sl.id = img.count("id") != 0 ? img["id"].get() : slot->images.size(); int width, height, channels; std::vector image_buffer = base64_decode(data_b64);