Merge branch 'dev' of github.com:janhq/cortex.cpp into dev

Author: nguyenhoangthuan99

engine/commands/model_pull_cmd.cc

@@ -6,8 +6,6 @@ void ModelPullCmd::Exec(const std::string& input) {
   auto result = model_service_.DownloadModel(input);
   if (result.has_error()) {
     CLI_LOG(result.error());
-  } else {
-    CLI_LOG("Model downloaded successfully!");
-  }
+  } 
 }
 };  // namespace commands

engine/commands/model_stop_cmd.cc

@@ -1,31 +1,48 @@
 #include "model_stop_cmd.h"
+#include "config/yaml_config.h"
+#include "database/models.h"
 #include "httplib.h"
 #include "nlohmann/json.hpp"
+#include "utils/file_manager_utils.h"
 #include "utils/logging_utils.h"
 
 namespace commands {
-ModelStopCmd::ModelStopCmd(std::string host, int port,
-                           const config::ModelConfig& mc)
-    : host_(std::move(host)), port_(port), mc_(mc) {}
 
-void ModelStopCmd::Exec() {
-  httplib::Client cli(host_ + ":" + std::to_string(port_));
-  nlohmann::json json_data;
-  json_data["model"] = mc_.name;
-  json_data["engine"] = mc_.engine;
+void ModelStopCmd::Exec(const std::string& host, int port,
+                        const std::string& model_handle) {
+  cortex::db::Models modellist_handler;
+  config::YamlHandler yaml_handler;
+  try {
+    auto model_entry = modellist_handler.GetModelInfo(model_handle);
+    if (model_entry.has_error()) {
+      CLI_LOG("Error: " + model_entry.error());
+      return;
+    }
+    yaml_handler.ModelConfigFromFile(model_entry.value().path_to_model_yaml);
+    auto mc = yaml_handler.GetModelConfig();
+    httplib::Client cli(host + ":" + std::to_string(port));
+    nlohmann::json json_data;
+    json_data["model"] = mc.name;
+    json_data["engine"] = mc.engine;
 
-  auto data_str = json_data.dump();
+    auto data_str = json_data.dump();
 
-  auto res = cli.Post("/inferences/server/unloadmodel", httplib::Headers(),
-                      data_str.data(), data_str.size(), "application/json");
-  if (res) {
-    if (res->status == httplib::StatusCode::OK_200) {
-      // LOG_INFO << res->body;
-      CLI_LOG("Model unloaded!");
+    auto res = cli.Post("/inferences/server/unloadmodel", httplib::Headers(),
+                        data_str.data(), data_str.size(), "application/json");
+    if (res) {
+      if (res->status == httplib::StatusCode::OK_200) {
+        // LOG_INFO << res->body;
+        CLI_LOG("Model unloaded!");
+      } else {
+        CLI_LOG("Error: could not unload model - " << res->status);
+      }
+    } else {
+      auto err = res.error();
+      CTL_ERR("HTTP error: " << httplib::to_string(err));
     }
-  } else {
-    auto err = res.error();
-    CTL_ERR("HTTP error: " << httplib::to_string(err));
+  } catch (const std::exception& e) {
+    CLI_LOG("Fail to stop model information with ID '" + model_handle +
+            "': " + e.what());
   }
 }
 

engine/commands/model_stop_cmd.h

@@ -7,12 +7,6 @@ namespace commands {
 
 class ModelStopCmd {
  public:
-  ModelStopCmd(std::string host, int port, const config::ModelConfig& mc);
-  void Exec();
-
- private:
-  std::string host_;
-  int port_;
-  const config::ModelConfig& mc_;
+  void Exec(const std::string& host, int port, const std::string& model_handle);
 };
 }  // namespace commands

engine/controllers/command_line_parser.cc

@@ -220,17 +220,9 @@ void CommandLineParser::SetupModelCommands() {
       CLI_LOG(stop_model_cmd->help());
       return;
     };
-    commands::CmdInfo ci(cml_data_.model_id);
-    std::string model_file =
-        ci.branch == "main" ? ci.model_name : ci.model_name + "-" + ci.branch;
-    config::YamlHandler yaml_handler;
-    yaml_handler.ModelConfigFromFile(
-        file_manager_utils::GetModelsContainerPath().string() + "/" +
-        model_file + ".yaml");
-    commands::ModelStopCmd smc(cml_data_.config.apiServerHost,
-                               std::stoi(cml_data_.config.apiServerPort),
-                               yaml_handler.GetModelConfig());
-    smc.Exec();
+    commands::ModelStopCmd().Exec(cml_data_.config.apiServerHost,
+                                  std::stoi(cml_data_.config.apiServerPort),
+                                  cml_data_.model_id);
   });
 
   auto list_models_cmd =

engine/services/download_service.cc

@@ -183,6 +183,7 @@ cpp::result<void, std::string> DownloadService::Download(
           CLI_LOG("Resuming download..");
         } else {
           CLI_LOG("Start over..");
+          return {};
         }
       } else {
         CLI_LOG(download_item.localPath.filename().string()
@@ -231,6 +232,7 @@ cpp::result<void, std::string> DownloadService::Download(
 
   fclose(file);
   curl_easy_cleanup(curl);
+  CLI_LOG("Model " << download_id << " downloaded successfully!")
   return {};
 }
 

engine/services/model_service.cc

@@ -223,7 +223,6 @@ cpp::result<std::string, std::string> ModelService::HandleUrl(
                                  }}}};
 
   auto on_finished = [&](const DownloadTask& finishedTask) {
-    CLI_LOG("Model " << finishedTask.id << " downloaded successfully!")
     auto gguf_download_item = finishedTask.items[0];
     ParseGguf(gguf_download_item, author);
   };
@@ -295,7 +294,6 @@ cpp::result<std::string, std::string> ModelService::DownloadModelFromCortexso(
     return cpp::fail(result.error());
   }
 
-  CLI_LOG("Model " << model_id << " downloaded successfully!")
   return model_id;
 }