update

Author: namchuai

engine/cli/commands/engine_install_cmd.cc

@@ -123,6 +123,7 @@ bool EngineInstallCmd::Exec(const std::string& engine,
                 "v1",
                 "engines",
                 engine,
+                "install",
             },
     };
     Json::Value body;
@@ -164,6 +165,7 @@ bool EngineInstallCmd::Exec(const std::string& engine,
               "v1",
               "engines",
               engine,
+              "install",
           },
   };
 

engine/cli/commands/engine_uninstall_cmd.cc

@@ -17,9 +17,10 @@ void EngineUninstallCmd::Exec(const std::string& host, int port,
     }
   }
 
-  auto url = url_parser::Url{.protocol = "http",
-                             .host = host + ":" + std::to_string(port),
-                             .pathParams = {"v1", "engines", engine}};
+  auto url =
+      url_parser::Url{.protocol = "http",
+                      .host = host + ":" + std::to_string(port),
+                      .pathParams = {"v1", "engines", engine, "install"}};
 
   auto result = curl_utils::SimpleDeleteJson(url.ToFullPath());
   if (result.has_error()) {

engine/controllers/engines.cc

@@ -243,6 +243,16 @@ void Engines::SetDefaultEngineVariant(
     const HttpRequestPtr& req,
     std::function<void(const HttpResponsePtr&)>&& callback,
     const std::string& engine) {
+  auto json_obj = req->getJsonObject();
+  if (json_obj == nullptr) {
+    Json::Value res;
+    res["message"] = "Request body is required";
+    auto resp = cortex_utils::CreateCortexHttpJsonResponse(res);
+    resp->setStatusCode(k400BadRequest);
+    callback(resp);
+    return;
+  }
+
   auto variant = (*(req->getJsonObject())).get("variant", "").asString();
   if (variant.empty()) {
     Json::Value ret;

engine/controllers/engines.h

@@ -13,12 +13,14 @@ class Engines : public drogon::HttpController<Engines, false> {
   METHOD_LIST_BEGIN
 
   // install engine
-  METHOD_ADD(Engines::InstallEngine, "/{1}", Options, Post);
-  ADD_METHOD_TO(Engines::InstallEngine, "/v1/engines/{1}", Options, Post);
+  METHOD_ADD(Engines::InstallEngine, "/{1}/install", Options, Post);
+  ADD_METHOD_TO(Engines::InstallEngine, "/v1/engines/{1}/install", Options,
+                Post);
 
   // uninstall engine
-  METHOD_ADD(Engines::UninstallEngine, "/{1}", Options, Delete);
-  ADD_METHOD_TO(Engines::UninstallEngine, "/v1/engines/{1}", Options, Delete);
+  METHOD_ADD(Engines::UninstallEngine, "/{1}/install", Options, Delete);
+  ADD_METHOD_TO(Engines::UninstallEngine, "/v1/engines/{1}/install", Options,
+                Delete);
 
   // set default engine
   METHOD_ADD(Engines::SetDefaultEngineVariant, "/{1}/default", Options, Post);

engine/e2e-test/test_api_engine_install.py

@@ -18,17 +18,19 @@ def setup_and_teardown(self):
         stop_server()
 
     def test_engines_install_llamacpp_should_be_successful(self):
-        response = requests.post("http://localhost:3928/v1/engines/llama-cpp")
+        response = requests.post("http://localhost:3928/v1/engines/llama-cpp/install")
         assert response.status_code == 200
 
     def test_engines_install_llamacpp_specific_version_and_variant(self):
+        data = {"version": "v0.1.35-27.10.24", "variant": "linux-amd64-avx-cuda-11-7"}
         response = requests.post(
-            "http://localhost:3928/v1/engines/llama-cpp?version=v0.1.35-27.10.24&variant=linux-amd64-avx-cuda-11-7"
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
         )
         assert response.status_code == 200
 
     def test_engines_install_llamacpp_specific_version_and_null_variant(self):
+        data = {"version": "v0.1.35-27.10.24"}
         response = requests.post(
-            "http://localhost:3928/v1/engines/llama-cpp?version=v0.1.35-27.10.24"
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
         )
         assert response.status_code == 200

engine/e2e-test/test_api_engine_uninstall.py

@@ -1,6 +1,11 @@
 import pytest
 import requests
-from test_runner import start_server, stop_server
+from test_runner import (
+    run,
+    start_server,
+    stop_server,
+    wait_for_websocket_download_success_event,
+)
 
 
 class TestApiEngineUninstall:
@@ -18,47 +23,56 @@ def setup_and_teardown(self):
         stop_server()
 
     def test_engines_uninstall_llamacpp_should_be_successful(self):
-        # install first
-        requests.post("http://localhost:3928/v1/engines/llama-cpp")
-
-        response = requests.delete("http://localhost:3928/v1/engines/llama-cpp")
+        # install first, using cli for synchronously
+        run(
+            "Install Engine",
+            ["engines", "install", "llama-cpp"],
+            timeout=120,
+            capture=False,
+        )
+        response = requests.delete("http://localhost:3928/v1/engines/llama-cpp/install")
         assert response.status_code == 200
 
     def test_engines_uninstall_llamacpp_with_only_version_should_be_failed(self):
         # install first
-        install_response = requests.post(
-            "http://localhost:3928/v1/engines/llama-cpp?version=v0.1.35"
+        run(
+            "Install Engine",
+            ["engines", "install", "llama-cpp", "-v", "v0.1.35"],
+            timeout=None,
+            capture=False,
         )
-        assert install_response.status_code == 200
 
+        data = {"version": "v0.1.35"}
         response = requests.delete(
-            "http://localhost:3928/v1/engines/llama-cpp?version=v0.1.35"
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
         )
         assert response.status_code == 400
         assert response.json()["message"] == "No variant provided"
 
-    def test_engines_uninstall_llamacpp_with_variant_should_be_successful(self):
+    @pytest.mark.asyncio
+    async def test_engines_uninstall_llamacpp_with_variant_should_be_successful(self):
         # install first
+        data = {"variant": "mac-arm64"}
         install_response = requests.post(
-            "http://localhost:3928/v1/engines/llama-cpp?variant=mac-arm64"
+            "http://127.0.0.1:3928/v1/engines/llama-cpp/install", json=data
         )
+        await wait_for_websocket_download_success_event(timeout=120)
         assert install_response.status_code == 200
 
-        response = requests.delete(
-            "http://localhost:3928/v1/engines/llama-cpp?variant=mac-arm64"
-        )
+        response = requests.delete("http://127.0.0.1:3928/v1/engines/llama-cpp/install")
         assert response.status_code == 200
 
     def test_engines_uninstall_llamacpp_with_specific_variant_and_version_should_be_successful(
         self,
     ):
+        data = {"variant": "mac-arm64", "version": "v0.1.35"}
         # install first
         install_response = requests.post(
-            "http://localhost:3928/v1/engines/llama-cpp?variant=mac-arm64&version=v0.1.35"
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
         )
         assert install_response.status_code == 200
 
         response = requests.delete(
-            "http://localhost:3928/v1/engines/llama-cpp?variant=mac-arm64&version=v0.1.35"
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
         )
         assert response.status_code == 200

engine/e2e-test/test_cli_engine_uninstall.py

@@ -24,8 +24,8 @@ def setup_and_teardown(self):
 
     @pytest.mark.asyncio
     async def test_engines_uninstall_llamacpp_should_be_successfully(self):
-        requests.post("http://127.0.0.1:3928/v1/engines/llama-cpp")
-        await wait_for_websocket_download_success_event(timeout=None)
+        requests.post("http://127.0.0.1:3928/v1/engines/llama-cpp/install")
+        await wait_for_websocket_download_success_event(timeout=120)
         exit_code, output, error = run(
             "Uninstall engine", ["engines", "uninstall", "llama-cpp"]
         )