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

fix unwanted recursive call

Browse source
This commit is contained in:
Xuan Son Nguyen 2024-12-05 23:43:48 +01:00
parent db66153d92
commit dfa59b908f
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
examples/server/server.cpp
View file

@ -307,10 +307,10 @@ struct server_task_result_cmpl_final : server_task_result {
} }
virtual json to_json() override { virtual json to_json() override {
if (oaicompat) { return oaicompat ? to_json_oaicompat_chat() : to_json_non_oaicompat();
return to_json_oaicompat();
} }
// otherwise, non-OAI-compat JSON
json to_json_non_oaicompat() {
json res = json { json res = json {
{"index", index}, {"index", index},
{"content", content}, {"content", content},
@ -334,7 +334,7 @@ struct server_task_result_cmpl_final : server_task_result {
return res; return res;
} }
json to_json_oaicompat() { json to_json_oaicompat_chat() {
std::string finish_reason = "length"; std::string finish_reason = "length";
if (stop == STOP_TYPE_WORD || stop == STOP_TYPE_EOS) { if (stop == STOP_TYPE_WORD || stop == STOP_TYPE_EOS) {
finish_reason = "stop"; finish_reason = "stop";
@ -366,7 +366,7 @@ struct server_task_result_cmpl_final : server_task_result {
// extra fields for debugging purposes // extra fields for debugging purposes
if (verbose) { if (verbose) {
res["__verbose"] = to_json(); res["__verbose"] = to_json_non_oaicompat();
} }
if (timings.prompt_n >= 0) { if (timings.prompt_n >= 0) {
res.push_back({"timings", timings.to_json()}); res.push_back({"timings", timings.to_json()});
@ -3594,12 +3594,12 @@ int main(int argc, char ** argv) {
const auto handle_embeddings = [&ctx_server, &res_error, &res_ok](const httplib::Request & req, httplib::Response & res) { const auto handle_embeddings = [&ctx_server, &res_error, &res_ok](const httplib::Request & req, httplib::Response & res) {
const json body = json::parse(req.body); const json body = json::parse(req.body);
bool is_openai = false; bool oaicompat = false;
// an input prompt can be a string or a list of tokens (integer) // an input prompt can be a string or a list of tokens (integer)
json prompt; json prompt;
if (body.count("input") != 0) { if (body.count("input") != 0) {
is_openai = true; oaicompat = true;
prompt = body.at("input"); prompt = body.at("input");
} else if (body.count("content") != 0) { } else if (body.count("content") != 0) {
// with "content", we only support single prompt // with "content", we only support single prompt
@ -3638,7 +3638,7 @@ int main(int argc, char ** argv) {
} }
// write JSON response // write JSON response
json root = is_openai json root = oaicompat
? format_embeddings_response_oaicompat(body, responses) ? format_embeddings_response_oaicompat(body, responses)
: responses[0]; : responses[0];
res_ok(res, root); res_ok(res, root);