add -m flag

Author: namchuai

engine/cli/command_line_parser.cc

@@ -342,7 +342,7 @@ void CommandLineParser::SetupEngineCommands() {
   for (auto& engine : engine_service_.kSupportEngines) {
     std::string engine_name{engine};
     EngineInstall(install_cmd, engine_name, cml_data_.engine_version,
-                  cml_data_.engine_src, cml_data_.show_menu);
+                  cml_data_.engine_src);
   }
 
   auto uninstall_cmd =
@@ -465,8 +465,7 @@ void CommandLineParser::SetupSystemCommands() {
 
 void CommandLineParser::EngineInstall(CLI::App* parent,
                                       const std::string& engine_name,
-                                      std::string& version, std::string& src,
-                                      bool show_menu) {
+                                      std::string& version, std::string& src) {
   auto install_engine_cmd = parent->add_subcommand(engine_name, "");
   install_engine_cmd->usage("Usage:\n" + commands::GetCortexBinary() +
                             " engines install " + engine_name + " [options]");
@@ -478,16 +477,16 @@ void CommandLineParser::EngineInstall(CLI::App* parent,
   install_engine_cmd->add_option("-s, --source", src,
                                  "Install engine by local path");
 
-  install_engine_cmd->add_option("-m, --menu", show_menu,
-                                 "Display menu for engine variant selection");
+  install_engine_cmd->add_flag("-m, --menu", cml_data_.show_menu,
+                               "Display menu for engine variant selection");
 
-  install_engine_cmd->callback([this, engine_name, &version, &src, show_menu] {
+  install_engine_cmd->callback([this, engine_name, &version, &src] {
     if (std::exchange(executed_, true))
       return;
     try {
       commands::EngineInstallCmd(
           download_service_, cml_data_.config.apiServerHost,
-          std::stoi(cml_data_.config.apiServerPort), show_menu)
+          std::stoi(cml_data_.config.apiServerPort), cml_data_.show_menu)
           .Exec(engine_name, version, src);
     } catch (const std::exception& e) {
       CTL_ERR(e.what());

engine/cli/command_line_parser.h

@@ -23,7 +23,7 @@ class CommandLineParser {
   void SetupSystemCommands();
 
   void EngineInstall(CLI::App* parent, const std::string& engine_name,
-                     std::string& version, std::string& src, bool show_menu);
+                     std::string& version, std::string& src);
 
   void EngineUninstall(CLI::App* parent, const std::string& engine_name);
 

engine/cli/commands/engine_install_cmd.cc

@@ -37,7 +37,6 @@ bool EngineInstallCmd::Exec(const std::string& engine,
     auto dp_res = std::async(std::launch::deferred, [&dp, &engine] {
       return dp.Handle(DownloadType::Engine);
     });
-    CLI_LOG("Validating download items, please wait..")
 
     auto versions_url = url_parser::Url{
         .protocol = "http",

engine/cli/commands/engine_list_cmd.cc

@@ -57,6 +57,23 @@ bool EngineListCmd::Exec(const std::string& host, int port) {
     }
   }
 
+  // TODO: namh support onnx and tensorrt
+  auto default_engine_url = url_parser::Url{
+      .protocol = "http",
+      .host = host + ":" + std::to_string(port),
+      .pathParams = {"v1", "engines", kLlamaEngine, "default"},
+  };
+  auto selected_variant_result =
+      curl_utils::SimpleGetJson(default_engine_url.ToFullPath());
+
+  std::optional<std::pair<std::string, std::string>> variant_pair =
+      std::nullopt;
+  if (selected_variant_result.has_value()) {
+    variant_pair = std::make_pair<std::string, std::string>(
+        selected_variant_result.value()["variant"].asString(),
+        selected_variant_result.value()["version"].asString());
+  }
+
   std::vector<EngineVariantResponse> output;
   for (const auto& [key, value] : engine_map) {
     output.insert(output.end(), value.begin(), value.end());
@@ -65,6 +82,12 @@ bool EngineListCmd::Exec(const std::string& host, int port) {
   int count = 0;
   for (auto const& v : output) {
     count += 1;
+    if (variant_pair.has_value() && v.name == variant_pair->first &&
+        v.version == variant_pair->second) {
+      table.add_row(
+          {std::to_string(count), v.engine, v.version, v.name, "Default"});
+      continue;
+    }
     table.add_row(
         {std::to_string(count), v.engine, v.version, v.name, "Installed"});
   }