update

Author: namchuai

engine/commands/engine_init_cmd.cc

@@ -29,7 +29,7 @@ bool EngineInitCmd::Exec() const {
   if (system_info.arch == system_info_utils::kUnsupported ||
       system_info.os == system_info_utils::kUnsupported) {
     CTL_ERR("Unsupported OS or architecture: " << system_info.os << ", "
-              << system_info.arch);
+                                               << system_info.arch);
     return false;
   }
   CTL_INF("OS: " << system_info.os << ", Arch: " << system_info.arch);
@@ -192,9 +192,10 @@ bool EngineInitCmd::Exec() const {
             // cuda driver version should be greater than toolkit version to ensure compatibility
             if (semantic_version_utils::CompareSemanticVersion(
                     cuda_driver_version, suitable_toolkit_version) < 0) {
-              CTL_ERR("Your Cuda driver version " << cuda_driver_version
-                        << " is not compatible with cuda toolkit version "
-                        << suitable_toolkit_version);
+              CTL_ERR("Your Cuda driver version "
+                      << cuda_driver_version
+                      << " is not compatible with cuda toolkit version "
+                      << suitable_toolkit_version);
               return false;
             }
 

engine/commands/engine_uninstall_cmd.cc

@@ -1,6 +1,5 @@
 #include "engine_uninstall_cmd.h"
-#include <filesystem>
-#include "utils/file_manager_utils.h"
+#include "services/engine_service.h"
 #include "utils/logging_utils.h"
 
 namespace commands {
@@ -10,24 +9,13 @@ EngineUninstallCmd::EngineUninstallCmd(std::string engine)
 
 void EngineUninstallCmd::Exec() const {
   CTL_INF("Uninstall engine " + engine_);
+  auto engine_service = EngineService();
 
-  // TODO: Unload the model which is currently running on engine_
-
-  // TODO: Unload engine if is loaded
-
-  auto ecp = file_manager_utils::GetEnginesContainerPath();
-  auto engine_path = ecp / engine_;
-  if (!std::filesystem::exists(engine_path)) {
-    CLI_LOG("Engine " << engine_ << " is not installed!");
-    return;
-  }
-
-  // remove
   try {
-    std::filesystem::remove_all(engine_path);
-    CTL_INF("Engine " << engine_ << " uninstalled successfully!");
+    engine_service.UninstallEngine(engine_);
+    CLI_LOG("Engine " << engine_ << " uninstalled successfully!")
   } catch (const std::exception& e) {
-    CTL_ERR("Failed to uninstall engine " << engine_ + ": " << e.what());
+    CLI_LOG("Failed to uninstall engine " << engine_ << ": " << e.what());
   }
 }
 };  // namespace commands

engine/controllers/engines.cc

@@ -180,24 +180,28 @@ void Engines::UninstallEngine(
     std::function<void(const HttpResponsePtr&)>&& callback,
     const std::string& engine) const {
   LOG_INFO << "[Http] Uninstall engine " << engine;
-  // TODO: think of a way to prevent code duplication. This should be shared with cmd as well
-
-  // TODO: Unload the model which is currently running on engine_
-
-  // TODO: Unload engine if is loaded
-
-  // auto ecp = file_manager_utils::GetEnginesContainerPath();
-  // auto engine_path = ecp / engine;
-  // if (!std::filesystem::exists(engine_path)) {
-  //   ("Engine " << engine_ << " is not installed!");
-  //   return;
-  // }
-  //
-  // // remove
-  // try {
-  //   std::filesystem::remove_all(engine_path);
-  //   CTL_INF("Engine " << engine_ << " uninstalled successfully!");
-  // } catch (const std::exception& e) {
-  //   CTL_ERR("Failed to uninstall engine " << engine_ + ": " << e.what());
-  // }
+  auto engine_service = EngineService();
+
+  Json::Value ret;
+  try {
+    // TODO: Unload the model which is currently running on engine_
+    // TODO: Unload engine if is loaded
+    engine_service.UninstallEngine(engine);
+
+    ret["message"] = "Engine " + engine + " uninstalled successfully!";
+    auto resp = cortex_utils::CreateCortexHttpJsonResponse(ret);
+    resp->setStatusCode(k200OK);
+    callback(resp);
+  } catch (const std::runtime_error& e) {
+    CLI_LOG("Runtime exception");
+    ret["message"] = "Engine " + engine + " is not installed!";
+    auto resp = cortex_utils::CreateCortexHttpJsonResponse(ret);
+    resp->setStatusCode(k400BadRequest);
+    callback(resp);
+  } catch (const std::exception& e) {
+    ret["message"] = "Engine " + engine + " failed to uninstall: " + e.what();
+    auto resp = cortex_utils::CreateCortexHttpJsonResponse(ret);
+    resp->setStatusCode(k400BadRequest);
+    callback(resp);
+  }
 }

engine/services/engine_service.cc

@@ -1,4 +1,5 @@
 #include "engine_service.h"
+#include <stdexcept>
 #include "algorithm"
 #include "utils/file_manager_utils.h"
 
@@ -61,3 +62,26 @@ std::vector<EngineInfo> EngineService::GetEngineInfoList() const {
 
   return engines;
 }
+
+void EngineService::UninstallEngine(const std::string& engine) {
+  CTL_INF("Uninstall engine " + engine);
+
+  // TODO: Unload the model which is currently running on engine_
+
+  // TODO: Unload engine if is loaded
+
+  auto ecp = file_manager_utils::GetEnginesContainerPath();
+  auto engine_path = ecp / engine;
+
+  if (!std::filesystem::exists(engine_path)) {
+    throw std::runtime_error("Engine " + engine + " is not installed!");
+  }
+
+  try {
+    std::filesystem::remove_all(engine_path);
+    CTL_INF("Engine " << engine << " uninstalled successfully!");
+  } catch (const std::exception& e) {
+    CTL_ERR("Failed to uninstall engine " << engine << ": " << e.what());
+    throw;
+  }
+}