From 01da1ed9b6d56e656acb98bac7d3d85d2819a2d5 Mon Sep 17 00:00:00 2001
From: Xuan Son Nguyen <son@huggingface.co>
Date: Sat, 7 Dec 2024 16:35:13 +0100
Subject: [PATCH] fix /slots endpoint

---
 examples/server/server.cpp | 1 +
 examples/server/utils.hpp  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index 0b84a3c1c..bd47ad178 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -2233,6 +2233,7 @@ struct server_context {
 
                     auto res = std::make_unique<server_task_result_metrics>();
                     res->id                  = task.id;
+                    res->slots_data          = slots_data;
                     res->n_idle_slots        = n_idle_slots;
                     res->n_processing_slots  = n_processing_slots;
                     res->n_tasks_deferred    = queue_tasks.queue_tasks_deferred.size();
diff --git a/examples/server/utils.hpp b/examples/server/utils.hpp
index a96116ac3..c9fe7d966 100644
--- a/examples/server/utils.hpp
+++ b/examples/server/utils.hpp
@@ -327,12 +327,12 @@ static std::string llama_get_chat_template(const struct llama_model * model) {
     std::string template_key = "tokenizer.chat_template";
     // call with NULL buffer to get the total size of the string
     int32_t res = llama_model_meta_val_str(model, template_key.c_str(), NULL, 0);
-    if (res < 0) {
+    if (res < 2) {
         return "";
     } else {
         std::vector<char> model_template(res, 0);
         llama_model_meta_val_str(model, template_key.c_str(), model_template.data(), model_template.size());
-        return std::string(model_template.data(), model_template.size());
+        return std::string(model_template.data(), model_template.size() - 1);
     }
 }