Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

bug: fix the model loaded result in error #197

Merged
merged 2 commits into from
Nov 27, 2023
Merged

bug: fix the model loaded result in error #197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dafa80a
bug: fix the model loaded result in error
tikikun Nov 27, 2023
2835f90
remove redundant include
tikikun Nov 27, 2023
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
19 changes: 19 additions & 0 deletions controllers/llamaCPP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,15 @@ void llamaCPP::chatCompletion(
const HttpRequestPtr &req,
std::function<void(const HttpResponsePtr &)> &&callback) {

if (!model_loaded) {
Json::Value jsonResp;
jsonResp["message"] =
"Model has not been loaded, please load model into nitro";
auto resp = nitro_utils::nitroHttpJsonResponse(jsonResp);
resp->setStatusCode(drogon::k409Conflict);
callback(resp);
}

const auto &jsonBody = req->getJsonObject();
std::string formatted_output = pre_prompt;

Expand Down Expand Up @@ -338,6 +347,16 @@ void llamaCPP::loadModel(
const HttpRequestPtr &req,
std::function<void(const HttpResponsePtr &)> &&callback) {

if (model_loaded) {
LOG_INFO << "model loaded";
Json::Value jsonResp;
jsonResp["message"] = "Model already loaded";
auto resp = nitro_utils::nitroHttpJsonResponse(jsonResp);
resp->setStatusCode(drogon::k409Conflict);
callback(resp);
return;
}

const auto &jsonBody = req->getJsonObject();

gpt_params params;
Expand Down