From f5c0ac0b697ab310728a7e54e34b5dbb79c54616 Mon Sep 17 00:00:00 2001 From: vansangpfiev Date: Wed, 30 Oct 2024 11:10:33 +0700 Subject: [PATCH 1/4] fix: engines install pre-release --- engine/cli/commands/engine_install_cmd.cc | 1 + engine/controllers/engines.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/cli/commands/engine_install_cmd.cc b/engine/cli/commands/engine_install_cmd.cc index 4cb9c0277..42fd78ae0 100644 --- a/engine/cli/commands/engine_install_cmd.cc +++ b/engine/cli/commands/engine_install_cmd.cc @@ -33,6 +33,7 @@ bool EngineInstallCmd::Exec(const std::string& engine, httplib::Client cli(host_ + ":" + std::to_string(port_)); Json::Value json_data; + json_data["version"] = version.empty() ? "latest" : version; auto data_str = json_data.toStyledString(); cli.set_read_timeout(std::chrono::seconds(60)); auto res = cli.Post("/v1/engines/install/" + engine, httplib::Headers(), diff --git a/engine/controllers/engines.cc b/engine/controllers/engines.cc index 431c9ffdc..556376f43 100644 --- a/engine/controllers/engines.cc +++ b/engine/controllers/engines.cc @@ -20,7 +20,7 @@ void Engines::InstallEngine( return; } - auto version{"latest"}; + auto version = (*(req->getJsonObject())).get("version", "latest").asString(); auto result = engine_service_->InstallEngineAsync(engine, version); if (result.has_error()) { Json::Value res; From e86c20c447d0f993f3aeac6b074b8e7f68f431f6 Mon Sep 17 00:00:00 2001 From: vansangpfiev Date: Wed, 30 Oct 2024 11:16:55 +0700 Subject: [PATCH 2/4] fix: add log for debugging --- engine/cli/commands/model_pull_cmd.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engine/cli/commands/model_pull_cmd.cc b/engine/cli/commands/model_pull_cmd.cc index 3a8f202d3..566d1e755 100644 --- a/engine/cli/commands/model_pull_cmd.cc +++ b/engine/cli/commands/model_pull_cmd.cc @@ -100,6 +100,8 @@ std::optional ModelPullCmd::Exec(const std::string& host, int port, return std::nullopt; } + CTL_INF("model: " << model << ", model_id: " << model_id); + // Send request download model to server Json::Value json_data; json_data["model"] = model; From 11aa621b57568754f282fbc92531f669113d7b06 Mon Sep 17 00:00:00 2001 From: vansangpfiev Date: Wed, 30 Oct 2024 11:29:13 +0700 Subject: [PATCH 3/4] fix: handle empty body for engines install --- engine/controllers/engines.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/controllers/engines.cc b/engine/controllers/engines.cc index 556376f43..c90363bc9 100644 --- a/engine/controllers/engines.cc +++ b/engine/controllers/engines.cc @@ -20,7 +20,11 @@ void Engines::InstallEngine( return; } - auto version = (*(req->getJsonObject())).get("version", "latest").asString(); + std::string version = "latest"; + if (auto o = req->getJsonObject(); !o) { + version = (*o).get("version", "latest").asString(); + } + auto result = engine_service_->InstallEngineAsync(engine, version); if (result.has_error()) { Json::Value res; From 9a90df9d5fefbc4d07be1fa4d180e144d8da3863 Mon Sep 17 00:00:00 2001 From: vansangpfiev Date: Wed, 30 Oct 2024 11:46:07 +0700 Subject: [PATCH 4/4] fix: check not null --- engine/controllers/engines.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/controllers/engines.cc b/engine/controllers/engines.cc index c90363bc9..065ad4565 100644 --- a/engine/controllers/engines.cc +++ b/engine/controllers/engines.cc @@ -21,7 +21,7 @@ void Engines::InstallEngine( } std::string version = "latest"; - if (auto o = req->getJsonObject(); !o) { + if (auto o = req->getJsonObject(); o) { version = (*o).get("version", "latest").asString(); }