Skip to content

server : use httplib status codes #11624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

server : use httplib status codes #11624

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
802c945
server : use httplib status codes
danbev Feb 3, 2025
5e602e9
squash! server : use httplib status codes
danbev Feb 3, 2025
9779626
squash! server : use httplib status codes [no ci]
danbev Feb 4, 2025
bbf98f1
squash! server : use httplib status codes
danbev Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ struct server_task_result_rerank : server_task_result {
// this function maybe used outside of server_task_result_error
static json format_error_response(const std::string & message, const enum error_type type) {
std::string type_str;
int code = 500;
int code = httplib::StatusCode::InternalServerError_500;
switch (type) {
case ERROR_TYPE_INVALID_REQUEST:
type_str = "invalid_request_error";
Expand Down Expand Up @@ -3421,12 +3421,12 @@ int main(int argc, char ** argv) {
auto res_error = [](httplib::Response & res, const json & error_data) {
json final_response {{"error", error_data}};
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", httplib::InternalServerError_500);
};

auto res_ok = [](httplib::Response & res, const json & data) {
res.set_content(safe_json_to_str(data), MIMETYPE_JSON);
res.status = 200;
res.status = httplib::StatusCode::OK_200;
};

svr->set_exception_handler([&res_error](const httplib::Request &, httplib::Response & res, const std::exception_ptr & ep) {
Expand All @@ -3445,7 +3445,7 @@ int main(int argc, char ** argv) {
});

svr->set_error_handler([&res_error](const httplib::Request &, httplib::Response & res) {
if (res.status == 404) {
if (res.status == httplib::StatusCode::NotFound_404) {
res_error(res, format_error_response("File Not Found", ERROR_TYPE_NOT_FOUND));
}
// for other error codes, we skip processing here because it's already done by res_error()
Expand Down Expand Up @@ -3516,7 +3516,7 @@ int main(int argc, char ** argv) {
auto tmp = string_split<std::string>(req.path, '.');
if (req.path == "/" || tmp.back() == "html") {
res.set_content(reinterpret_cast<const char*>(loading_html), loading_html_len, "text/html; charset=utf-8");
res.status = 503;
res.status = res.status == httplib::StatusCode::ServiceUnavailable_503;
} else {
res_error(res, format_error_response("Loading model", ERROR_TYPE_UNAVAILABLE));
}
Expand Down Expand Up @@ -3692,7 +3692,7 @@ int main(int argc, char ** argv) {
res.set_header("Process-Start-Time-Unix", std::to_string(res_metrics->t_start));

res.set_content(prometheus.str(), "text/plain; version=0.0.4");
res.status = 200; // HTTP OK
res.status = httplib::StatusCode::OK_200; // HTTP OK
};

const auto handle_slots_save = [&ctx_server, &res_error, &res_ok, &params](const httplib::Request & req, httplib::Response & res, int id_slot) {
Expand Down Expand Up @@ -4321,7 +4321,7 @@ int main(int argc, char ** argv) {
});
}
res_ok(res, result);
res.status = 200; // HTTP OK
res.status = httplib::StatusCode::OK_200; // HTTP OK
};

const auto handle_lora_adapters_apply = [&](const httplib::Request & req, httplib::Response & res) {
Expand Down
Loading