fix: add more parameters to config command

Author: sangjanai

engine/cli/command_line_parser.cc

@@ -437,7 +437,7 @@ void CommandLineParser::SetupConfigsCommands() {
 
     auto is_empty = true;
     for (const auto& [key, value] : config_update_opts_) {
-      if (!value.empty()) {
+      if (!value.empty() || CONFIGURATIONS.at(key).allow_empty) {
         is_empty = false;
         break;
       }
@@ -657,6 +657,7 @@ void CommandLineParser::SetupSystemCommands() {
   auto start_cmd = app_.add_subcommand("start", "Start the API server");
   start_cmd->group(kSystemGroup);
   cml_data_.port = std::stoi(cml_data_.config.apiServerPort);
+  start_cmd->add_option("--host", cml_data_.server_host, "Server host");
   start_cmd->add_option("-p, --port", cml_data_.port, "Server port to listen");
   start_cmd->add_option("--loglevel", cml_data_.log_level,
                         "Set up log level for server, accepted TRACE, DEBUG, "
@@ -671,10 +672,16 @@ void CommandLineParser::SetupSystemCommands() {
   start_cmd->callback([this] {
     if (std::exchange(executed_, true))
       return;
-    if (cml_data_.port != stoi(cml_data_.config.apiServerPort)) {
-      CTL_INF("apiServerPort changed from " << cml_data_.config.apiServerPort
-                                            << " to " << cml_data_.port);
+    if (cml_data_.port != stoi(cml_data_.config.apiServerPort) ||
+        (!cml_data_.server_host.empty() &&
+         cml_data_.server_host != cml_data_.config.apiServerHost)) {
+      CTL_INF("API server host:port changed from "
+              << cml_data_.config.apiServerHost << ":"
+              << cml_data_.config.apiServerPort << " to "
+              << cml_data_.server_host << ":" << cml_data_.port);
       auto config_path = file_manager_utils::GetConfigurationPath();
+      if (!cml_data_.server_host.empty())
+        cml_data_.config.apiServerHost = cml_data_.server_host;
       cml_data_.config.apiServerPort = std::to_string(cml_data_.port);
       auto result =
           config_yaml_utils::CortexConfigMgr::GetInstance().DumpYamlConfig(

engine/cli/command_line_parser.h

@@ -71,6 +71,7 @@ class CommandLineParser {
 
     bool show_menu = false;
 
+    std::string server_host;
     int port;
     config_yaml_utils::CortexConfig config;
     std::unordered_map<std::string, std::string> model_update_options;

engine/cli/commands/config_upd_cmd.cc

@@ -56,7 +56,7 @@ void commands::ConfigUpdCmd::Exec(
 
   auto non_null_opts = std::unordered_map<std::string, std::string>();
   for (const auto& [key, value] : options) {
-    if (value.empty()) {
+    if (value.empty() && !CONFIGURATIONS.at(key).allow_empty) {
       continue;
     }
     non_null_opts[key] = value;

engine/common/api_server_configuration.h

@@ -97,6 +97,12 @@ static const std::unordered_map<std::string, ApiConfigurationMetadata>
                                   .accept_value = "string",
                                   .default_value = "",
                                   .allow_empty = true}},
+        {"github_token", ApiConfigurationMetadata{.name = "github_token",
+                                                  .desc = "Github token",
+                                                  .group = "Token",
+                                                  .accept_value = "string",
+                                                  .default_value = "",
+                                                  .allow_empty = true}},
 };
 
 class ApiServerConfiguration {
@@ -107,7 +113,7 @@ class ApiServerConfiguration {
       const std::string& proxy_url = "", const std::string& proxy_username = "",
       const std::string& proxy_password = "", const std::string& no_proxy = "",
       bool verify_peer_ssl = true, bool verify_host_ssl = true,
-      const std::string& hf_token = "")
+      const std::string& hf_token = "", const std::string& gh_token = "")
       : cors{cors},
         allowed_origins{allowed_origins},
         verify_proxy_ssl{verify_proxy_ssl},
@@ -118,7 +124,8 @@ class ApiServerConfiguration {
         no_proxy{no_proxy},
         verify_peer_ssl{verify_peer_ssl},
         verify_host_ssl{verify_host_ssl},
-        hf_token{hf_token} {}
+        hf_token{hf_token},
+        gh_token{gh_token} {}
 
   // cors
   bool cors{true};
@@ -138,6 +145,7 @@ class ApiServerConfiguration {
 
   // token
   std::string hf_token{""};
+  std::string gh_token{""};
 
   Json::Value ToJson() const {
     Json::Value root;
@@ -155,6 +163,7 @@ class ApiServerConfiguration {
     root["verify_peer_ssl"] = verify_peer_ssl;
     root["verify_host_ssl"] = verify_host_ssl;
     root["huggingface_token"] = hf_token;
+    root["github_token"] = gh_token;
 
     return root;
   }
@@ -247,6 +256,15 @@ class ApiServerConfiguration {
                return true;
              }},
 
+            {"github_token",
+             [this](const Json::Value& value) -> bool {
+               if (!value.isString()) {
+                 return false;
+               }
+               gh_token = value.asString();
+               return true;
+             }},
+
             {"cors",
              [this](const Json::Value& value) -> bool {
                if (!value.isBool()) {

engine/services/config_service.cc

@@ -6,10 +6,10 @@ cpp::result<ApiServerConfiguration, std::string>
 ConfigService::UpdateApiServerConfiguration(const Json::Value& json) {
   auto config = file_manager_utils::GetCortexConfig();
   ApiServerConfiguration api_server_config{
-      config.enableCors,         config.allowedOrigins,  config.verifyProxySsl,
-      config.verifyProxyHostSsl, config.proxyUrl,        config.proxyUsername,
-      config.proxyPassword,      config.noProxy,         config.verifyPeerSsl,
-      config.verifyHostSsl,      config.huggingFaceToken};
+      config.enableCors,         config.allowedOrigins,   config.verifyProxySsl,
+      config.verifyProxyHostSsl, config.proxyUrl,         config.proxyUsername,
+      config.proxyPassword,      config.noProxy,          config.verifyPeerSsl,
+      config.verifyHostSsl,      config.huggingFaceToken, config.gitHubToken};
 
   std::vector<std::string> updated_fields;
   std::vector<std::string> invalid_fields;
@@ -36,6 +36,7 @@ ConfigService::UpdateApiServerConfiguration(const Json::Value& json) {
   config.verifyHostSsl = api_server_config.verify_host_ssl;
 
   config.huggingFaceToken = api_server_config.hf_token;
+  config.gitHubToken = api_server_config.gh_token;
 
   auto result = file_manager_utils::UpdateCortexConfig(config);
   return api_server_config;
@@ -45,8 +46,8 @@ cpp::result<ApiServerConfiguration, std::string>
 ConfigService::GetApiServerConfiguration() {
   auto config = file_manager_utils::GetCortexConfig();
   return ApiServerConfiguration{
-      config.enableCors,         config.allowedOrigins,  config.verifyProxySsl,
-      config.verifyProxyHostSsl, config.proxyUrl,        config.proxyUsername,
-      config.proxyPassword,      config.noProxy,         config.verifyPeerSsl,
-      config.verifyHostSsl,      config.huggingFaceToken};
+      config.enableCors,         config.allowedOrigins,   config.verifyProxySsl,
+      config.verifyProxyHostSsl, config.proxyUrl,         config.proxyUsername,
+      config.proxyPassword,      config.noProxy,          config.verifyPeerSsl,
+      config.verifyHostSsl,      config.huggingFaceToken, config.gitHubToken};
 }