happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

server: fixing naming conflict res_error in server-models.cpp (#17679)

This commit is contained in:
senhtry 2025-12-02 18:18:39 +08:00 committed by GitHub
parent 682e6658bb
commit fd3abe849e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/server/server-models.cpp
View File

@ -642,26 +642,26 @@ static void res_ok(std::unique_ptr<server_http_res> & res, const json & response
res->data = safe_json_to_str(response_data); res->data = safe_json_to_str(response_data);
} }
static void res_error(std::unique_ptr<server_http_res> & res, const json & error_data) { static void res_err(std::unique_ptr<server_http_res> & res, const json & error_data) {
res->status = json_value(error_data, "code", 500); res->status = json_value(error_data, "code", 500);
res->data = safe_json_to_str({{ "error", error_data }}); res->data = safe_json_to_str({{ "error", error_data }});
} }
static bool router_validate_model(const std::string & name, server_models & models, bool models_autoload, std::unique_ptr<server_http_res> & res) { static bool router_validate_model(const std::string & name, server_models & models, bool models_autoload, std::unique_ptr<server_http_res> & res) {
if (name.empty()) { if (name.empty()) {
res_error(res, format_error_response("model name is missing from the request", ERROR_TYPE_INVALID_REQUEST)); res_err(res, format_error_response("model name is missing from the request", ERROR_TYPE_INVALID_REQUEST));
return false; return false;
} }
auto meta = models.get_meta(name); auto meta = models.get_meta(name);
if (!meta.has_value()) { if (!meta.has_value()) {
res_error(res, format_error_response("model not found", ERROR_TYPE_INVALID_REQUEST)); res_err(res, format_error_response("model not found", ERROR_TYPE_INVALID_REQUEST));
return false; return false;
} }
if (models_autoload) { if (models_autoload) {
models.ensure_model_loaded(name); models.ensure_model_loaded(name);
} else { } else {
if (meta->status != SERVER_MODEL_STATUS_LOADED) { if (meta->status != SERVER_MODEL_STATUS_LOADED) {
res_error(res, format_error_response("model is not loaded", ERROR_TYPE_INVALID_REQUEST)); res_err(res, format_error_response("model is not loaded", ERROR_TYPE_INVALID_REQUEST));
return false; return false;
} }
} }
@ -761,11 +761,11 @@ void server_models_routes::init_routes() {
std::string name = json_value(body, "model", std::string()); std::string name = json_value(body, "model", std::string());
auto model = models.get_meta(name); auto model = models.get_meta(name);
if (!model.has_value()) { if (!model.has_value()) {
res_error(res, format_error_response("model is not found", ERROR_TYPE_NOT_FOUND)); res_err(res, format_error_response("model is not found", ERROR_TYPE_NOT_FOUND));
return res; return res;
} }
if (model->status == SERVER_MODEL_STATUS_LOADED) { if (model->status == SERVER_MODEL_STATUS_LOADED) {
res_error(res, format_error_response("model is already loaded", ERROR_TYPE_INVALID_REQUEST)); res_err(res, format_error_response("model is already loaded", ERROR_TYPE_INVALID_REQUEST));
return res; return res;
} }
models.load(name, false); models.load(name, false);
@ -823,11 +823,11 @@ void server_models_routes::init_routes() {
std::string name = json_value(body, "model", std::string()); std::string name = json_value(body, "model", std::string());
auto model = models.get_meta(name); auto model = models.get_meta(name);
if (!model.has_value()) { if (!model.has_value()) {
res_error(res, format_error_response("model is not found", ERROR_TYPE_INVALID_REQUEST)); res_err(res, format_error_response("model is not found", ERROR_TYPE_INVALID_REQUEST));
return res; return res;
} }
if (model->status != SERVER_MODEL_STATUS_LOADED) { if (model->status != SERVER_MODEL_STATUS_LOADED) {
res_error(res, format_error_response("model is not loaded", ERROR_TYPE_INVALID_REQUEST)); res_err(res, format_error_response("model is not loaded", ERROR_TYPE_INVALID_REQUEST));
return res; return res;
} }
models.unload(name); models.unload(name);