update

Author: namchuai

engine/controllers/engines.cc

@@ -80,11 +80,13 @@ void Engines::ListEngine(
 void Engines::UninstallEngine(
     const HttpRequestPtr& req,
     std::function<void(const HttpResponsePtr&)>&& callback,
-    const std::string& engine) {
+    const std::string& engine, const std::string& version,
+    const std::string& variant) {
 
-  auto result = engine_service_->UninstallEngine(engine);
-  Json::Value ret;
+  auto result =
+      engine_service_->UninstallEngineVariant(engine, variant, version);
 
+  Json::Value ret;
   if (result.has_error()) {
     CTL_INF(result.error());
     ret["message"] = result.error();

engine/controllers/engines.h

@@ -14,7 +14,7 @@ class Engines : public drogon::HttpController<Engines, false> {
 
   // TODO: update this API
   METHOD_ADD(Engines::InstallEngine, "/install/{1}", Post);
-  METHOD_ADD(Engines::UninstallEngine, "/{1}", Delete);
+  METHOD_ADD(Engines::UninstallEngine, "/{1}/{2}/{3}", Delete);
   METHOD_ADD(Engines::ListEngine, "", Get);
 
   METHOD_ADD(Engines::GetEngineVersions, "/{1}/versions", Get);
@@ -31,7 +31,7 @@ class Engines : public drogon::HttpController<Engines, false> {
   METHOD_ADD(Engines::UnloadEngine, "/{1}/load", Delete);
 
   ADD_METHOD_TO(Engines::InstallEngine, "/v1/engines/install/{1}", Post);
-  ADD_METHOD_TO(Engines::UninstallEngine, "/v1/engines/{1}", Delete);
+  ADD_METHOD_TO(Engines::UninstallEngine, "/v1/engines/{1}/{2}/{3}", Delete);
 
   METHOD_LIST_END
 
@@ -47,7 +47,8 @@ class Engines : public drogon::HttpController<Engines, false> {
 
   void UninstallEngine(const HttpRequestPtr& req,
                        std::function<void(const HttpResponsePtr&)>&& callback,
-                       const std::string& engine);
+                       const std::string& engine, const std::string& version,
+                       const std::string& variant);
 
   void GetEngineVersions(const HttpRequestPtr& req,
                          std::function<void(const HttpResponsePtr&)>&& callback,

engine/services/engine_service.cc

@@ -59,81 +59,6 @@ std::string GetEnginePath(std::string_view e) {
 };
 }  // namespace
 
-// cpp::result<EngineInfo, std::string> EngineService::GetEngineInfo(
-//     const std::string& engine) const {
-//
-//   if (std::find(kSupportEngines.begin(), kSupportEngines.end(), engine) ==
-//       kSupportEngines.end()) {
-//     return cpp::fail("Engine " + engine + " is not supported!");
-//   }
-//
-//   auto engine_status_list = GetEngineInfoList();
-//
-//   return *std::find_if(
-//       engine_status_list.begin(), engine_status_list.end(),
-//       [&engine](const EngineInfo& e) { return e.name == engine; });
-// }
-
-// std::vector<EngineInfo> EngineService::GetEngineInfoList() const {
-//   auto ecp = file_manager_utils::GetEnginesContainerPath();
-//
-//   std::string onnx_status{kIncompatible};
-//   std::string llamacpp_status =
-//       std::filesystem::exists(ecp / kLlamaRepo) ? kReady : kNotInstalled;
-//   std::string tensorrt_status{kIncompatible};
-//
-// #ifdef _WIN32
-//   onnx_status =
-//       std::filesystem::exists(ecp / kOnnxRepo) ? kReady : kNotInstalled;
-//   tensorrt_status =
-//       std::filesystem::exists(ecp / kTrtLlmRepo) ? kReady : kNotInstalled;
-// #elif defined(__linux__)
-//   tensorrt_status =
-//       std::filesystem::exists(ecp / kTrtLlmRepo) ? kReady : kNotInstalled;
-// #endif
-//   std::vector<EngineInfo> engines = {
-//       {.name = kOnnxEngine,
-//        .description = "This extension enables chat completion API calls using "
-//                       "the Onnx engine",
-//        .format = "ONNX",
-//        .product_name = kOnnxEngine,
-//        .status = onnx_status},
-//       {.name = kLlamaEngine,
-//        .description = "This extension enables chat completion API calls using "
-//                       "the LlamaCPP engine",
-//        .format = "GGUF",
-//        .product_name = kLlamaEngine,
-//        .status = llamacpp_status},
-//       {.name = kTrtLlmEngine,
-//        .description = "This extension enables chat completion API calls using "
-//                       "the TensorrtLLM engine",
-//        .format = "TensorRT Engines",
-//        .product_name = kTrtLlmEngine,
-//        .status = tensorrt_status},
-//   };
-//
-//   for (auto& engine : engines) {
-//     if (engine.status == kReady) {
-//       // try to read the version.txt
-//       auto engine_info_path = file_manager_utils::GetEnginesContainerPath() /
-//                               NormalizeEngine(engine.name) / "version.txt";
-//       if (!std::filesystem::exists(engine_info_path)) {
-//         continue;
-//       }
-//       try {
-//         auto node = YAML::LoadFile(engine_info_path.string());
-//         engine.version = node["version"].as<std::string>();
-//         engine.variant = node["name"].as<std::string>();
-//       } catch (const YAML::Exception& e) {
-//         CTL_ERR("Error reading version.txt: " << e.what());
-//         continue;
-//       }
-//     }
-//   }
-//
-//   return engines;
-// }
-
 cpp::result<bool, std::string> EngineService::InstallEngine(
     const std::string& engine, const std::string& version,
     const std::string& src) {
@@ -246,12 +171,13 @@ cpp::result<bool, std::string> EngineService::UnzipEngine(
   return true;
 }
 
-cpp::result<bool, std::string> EngineService::UninstallEngine(
-    const std::string& engine) {
+cpp::result<bool, std::string> EngineService::UninstallEngineVariant(
+    const std::string& engine, const std::string& variant,
+    const std::string& version) {
   auto ne = NormalizeEngine(engine);
-  auto ecp = file_manager_utils::GetEnginesContainerPath();
-  auto engine_path = ecp / ne;
-
+  auto engine_path =
+      file_manager_utils::GetEnginesContainerPath() / ne / variant / version;
+  std::cout << "engine_path: " << engine_path.string() << std::endl;
   if (!std::filesystem::exists(engine_path)) {
     return cpp::fail("Engine " + ne + " is not installed!");
   }
@@ -374,7 +300,6 @@ cpp::result<bool, std::string> EngineService::DownloadEngine(
   //   CTL_INF("No GitHub token found. Sending request without authentication.");
   // }
 
-  // TODO: namh add back the github_token
   auto res = GetEngineVariants(engine, version);
   if (res.has_error()) {
     return cpp::fail("Failed to fetch engine releases: " + res.error());

engine/services/engine_service.h

@@ -92,7 +92,9 @@ class EngineService {
       const std::string& engine, const std::string& version,
       const std::string& variant_name);
 
-  cpp::result<bool, std::string> UninstallEngine(const std::string& engine);
+  cpp::result<bool, std::string> UninstallEngineVariant(
+      const std::string& engine, const std::string& variant,
+      const std::string& version);
 
   cpp::result<std::vector<EngineRelease>, std::string> GetEngineReleases(
       const std::string& engine) const;