vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix CI by adding safe_json_to_str

Browse source
This commit is contained in:
Xuan Son Nguyen 2024-12-07 19:45:51 +01:00
parent 090a113417
commit 65d2e6d675
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/server/server.cpp
View file

@ -1657,7 +1657,7 @@ struct server_context {
slot.params = std::move(task.params); slot.params = std::move(task.params);
slot.prompt_tokens = std::move(task.prompt_tokens); slot.prompt_tokens = std::move(task.prompt_tokens);
SLT_DBG(slot, "launching slot : %s\n", slot.to_json().dump().c_str()); SLT_DBG(slot, "launching slot : %s\n", safe_json_to_str(slot.to_json()).c_str());
if (slot.n_predict > 0 && slot.params.n_predict > slot.n_predict) { if (slot.n_predict > 0 && slot.params.n_predict > slot.n_predict) {
// Might be better to reject the request with a 400 ? // Might be better to reject the request with a 400 ?
@ -2942,12 +2942,12 @@ int main(int argc, char ** argv) {
auto res_error = [](httplib::Response & res, const json & error_data) { auto res_error = [](httplib::Response & res, const json & error_data) {
json final_response {{"error", error_data}}; json final_response {{"error", error_data}};
res.set_content(final_response.dump(-1, ' ', false, json::error_handler_t::replace), MIMETYPE_JSON); res.set_content(safe_json_to_str(final_response), MIMETYPE_JSON);
res.status = json_value(error_data, "code", 500); res.status = json_value(error_data, "code", 500);
}; };
auto res_ok = [](httplib::Response & res, const json & data) { auto res_ok = [](httplib::Response & res, const json & data) {
res.set_content(data.dump(-1, ' ', false, json::error_handler_t::replace), MIMETYPE_JSON); res.set_content(safe_json_to_str(data), MIMETYPE_JSON);
res.status = 200; res.status = 200;
}; };
@ -3524,7 +3524,7 @@ int main(int argc, char ** argv) {
/* oaicompat_chat */ true); /* oaicompat_chat */ true);
}; };
const auto handle_models = [&params, &ctx_server](const httplib::Request &, httplib::Response & res) { const auto handle_models = [&params, &ctx_server, &res_ok](const httplib::Request &, httplib::Response & res) {
json models = { json models = {
{"object", "list"}, {"object", "list"},
{"data", { {"data", {
@ -3538,7 +3538,7 @@ int main(int argc, char ** argv) {
}} }}
}; };
res.set_content(models.dump(), MIMETYPE_JSON); res_ok(res, models);
}; };
const auto handle_tokenize = [&ctx_server, &res_ok](const httplib::Request & req, httplib::Response & res) { const auto handle_tokenize = [&ctx_server, &res_ok](const httplib::Request & req, httplib::Response & res) {

4
examples/server/utils.hpp
View file

@ -660,3 +660,7 @@ static json format_logit_bias(const std::vector<llama_logit_bias> & logit_bias)
} }
return data; return data;
} }
static std::string safe_json_to_str(json data) {
return data.dump(-1, ' ', false, json::error_handler_t::replace);
}