Merge pull request #390 from janhq/389-feat-refactor-some-repetitions

refactor: remove the repetition
janhq · Jan 30, 2024 · d830ad3 · d830ad3
2 parents f33d6f4 + 055d003
commit d830ad3
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/controllers/llamaCPP.cc b/controllers/llamaCPP.cc
@@ -21,6 +21,20 @@ std::shared_ptr<inferenceState> create_inference_state(llamaCPP *instance) {
 
 // --------------------------------------------
 
+// Function to check if the model is loaded
+void check_model_loaded(llama_server_context &llama, const HttpRequestPtr &req,
+                      std::function<void(const HttpResponsePtr &)> &callback) {
+  if (!llama.model_loaded_external) {
+    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);
+    return;
+  }
+}
+
 Json::Value create_embedding_payload(const std::vector<float> &embedding,
                                      int prompt_tokens) {
   Json::Value dataItem;
@@ -136,15 +150,8 @@ void llamaCPP::chatCompletion(
     const HttpRequestPtr &req,
     std::function<void(const HttpResponsePtr &)> &&callback) {
 
-  if (!llama.model_loaded_external) {
-    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);
-    return;
-  }
+  // Check if model is loaded
+  check_model_loaded(llama, req, callback);
 
   const auto &jsonBody = req->getJsonObject();
   std::string formatted_output = pre_prompt;
@@ -402,15 +409,7 @@ void llamaCPP::chatCompletion(
 void llamaCPP::embedding(
     const HttpRequestPtr &req,
     std::function<void(const HttpResponsePtr &)> &&callback) {
-  if (!llama.model_loaded_external) {
-    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);
-    return;
-  }
+  check_model_loaded(llama, req, callback);
 
   const auto &jsonBody = req->getJsonObject();
 
@@ -623,4 +622,4 @@ void llamaCPP::stopBackgroundTask() {
       backgroundThread.join();
     }
   }
-}
+}