fix /slots endpoint

ngxson · ngxson · commit 01da1ed9b6d5 · 2024-12-07T16:35:13.000+01:00
diff --git 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
@@ -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);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -327,12 +327,12 @@ static std::string llama_get_chat_template(const struct llama_model * model) {`
`327`	`327`	`std::string template_key = "tokenizer.chat_template";`
`328`	`328`	`// call with NULL buffer to get the total size of the string`
`329`	`329`	`int32_t res = llama_model_meta_val_str(model, template_key.c_str(), NULL, 0);`
`330`		`- if (res < 0) {`
	`330`	`+ if (res < 2) {`
`331`	`331`	`return "";`
`332`	`332`	`} else {`
`333`	`333`	`std::vector<char> model_template(res, 0);`
`334`	`334`	`llama_model_meta_val_str(model, template_key.c_str(), model_template.data(), model_template.size());`
`335`		`- return std::string(model_template.data(), model_template.size());`
	`335`	`+ return std::string(model_template.data(), model_template.size() - 1);`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`