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

Don't double-apply CORS header in POST /control-vectors

Browse source
This commit is contained in:
trollkotze 2024-03-26 20:56:58 +01:00
parent 80508e1ef5
commit 2506fed8e8
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
examples/server/server.cpp
View file

@ -3202,8 +3202,6 @@ int main(int argc, char ** argv) {
}; };
const auto handle_set_control_vectors = [&ctx_server, &res_error, &handle_get_control_vectors](const httplib::Request & req, httplib::Response & res) { const auto handle_set_control_vectors = [&ctx_server, &res_error, &handle_get_control_vectors](const httplib::Request & req, httplib::Response & res) {
res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin"));
json data = json::parse(req.body); json data = json::parse(req.body);
std::vector<llama_control_vector_load_info> vec_params; std::vector<llama_control_vector_load_info> vec_params;
@ -3215,12 +3213,14 @@ int main(int argc, char ** argv) {
} }
} else { } else {
std::cerr << "No vectors passed\n"; std::cerr << "No vectors passed\n";
res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin"));
res_error(res, format_error_response("No vectors passed", ERROR_TYPE_SERVER)); res_error(res, format_error_response("No vectors passed", ERROR_TYPE_SERVER));
return; return;
} }
const auto cvec = llama_control_vector_load(vec_params); const auto cvec = llama_control_vector_load(vec_params);
if (cvec.n_embd == -1) { if (cvec.n_embd == -1) {
std::cerr << "Could not load control vector\n"; std::cerr << "Could not load control vector\n";
res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin"));
res_error(res, format_error_response("Could not load control vector", ERROR_TYPE_SERVER)); res_error(res, format_error_response("Could not load control vector", ERROR_TYPE_SERVER));
return; return;
} }
@ -3239,6 +3239,7 @@ int main(int argc, char ** argv) {
ctx_server.params.control_vector_layer_end); ctx_server.params.control_vector_layer_end);
if (err) { if (err) {
std::cerr << "Could not apply control vector\n"; std::cerr << "Could not apply control vector\n";
res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin"));
res_error(res, format_error_response("Could not apply control vector", ERROR_TYPE_SERVER)); res_error(res, format_error_response("Could not apply control vector", ERROR_TYPE_SERVER));
return; return;
} }