store default engine to cortex.rc

Author: namchuai

engine/cli/command_line_parser.cc

@@ -393,7 +393,11 @@ void CommandLineParser::SetupSystemCommands() {
                                             << " to " << cml_data_.port);
       auto config_path = file_manager_utils::GetConfigurationPath();
       cml_data_.config.apiServerPort = std::to_string(cml_data_.port);
-      config_yaml_utils::DumpYamlConfig(cml_data_.config, config_path.string());
+      auto result = config_yaml_utils::DumpYamlConfig(cml_data_.config,
+                                                      config_path.string());
+      if (result.has_error()) {
+        CLI_LOG("Error update " << config_path.string() << result.error());
+      }
     }
     commands::ServerStartCmd ssc;
     ssc.Exec(cml_data_.config.apiServerHost,

engine/main.cc

@@ -47,7 +47,11 @@ void RunServer(std::optional<int> port) {
   if (port.has_value() && *port != std::stoi(config.apiServerPort)) {
     auto config_path = file_manager_utils::GetConfigurationPath();
     config.apiServerPort = std::to_string(*port);
-    config_yaml_utils::DumpYamlConfig(config, config_path.string());
+    auto result =
+        config_yaml_utils::DumpYamlConfig(config, config_path.string());
+    if (result.has_error()) {
+      CTL_ERR("Error update " << config_path.string() << result.error());
+    }
   }
   std::cout << "Host: " << config.apiServerHost
             << " Port: " << config.apiServerPort << "\n";
@@ -147,7 +151,12 @@ int main(int argc, char* argv[]) {
     }
   }
 
-  { file_manager_utils::CreateConfigFileIfNotExist(); }
+  {
+    auto result = file_manager_utils::CreateConfigFileIfNotExist();
+    if (result.has_error()) {
+      LOG_ERROR << "Error creating config file: " << result.error();
+    }
+  }
 
   // Delete temporary file if it exists
   auto temp =

engine/services/engine_service.cc

@@ -527,12 +527,19 @@ EngineService::SetDefaultEngineVariant(const std::string& engine,
                      " is not installed yet!");
   }
 
-  default_variants_[ne] = DefaultEngineVariant{
+  auto config = file_manager_utils::GetCortexConfig();
+  config.llamacppVersion = version;
+  config.llamacppVariant = variant;
+  auto result = file_manager_utils::UpdateCortexConfig(config);
+  if (result.has_error()) {
+    return cpp::fail(result.error());
+  }
+
+  return DefaultEngineVariant{
       .engine = engine,
       .version = version,
       .variant = variant,
   };
-  return default_variants_[ne];
 }
 
 cpp::result<bool, std::string> EngineService::IsEngineVariantReady(
@@ -554,11 +561,25 @@ cpp::result<bool, std::string> EngineService::IsEngineVariantReady(
 cpp::result<DefaultEngineVariant, std::string>
 EngineService::GetDefaultEngineVariant(const std::string& engine) {
   auto ne = NormalizeEngine(engine);
-  if (default_variants_.find(ne) == default_variants_.end()) {
-    return cpp::fail("Engine variant for " + engine + " is not set yet!");
+  // current we don't support other engine
+  if (ne != kLlamaRepo) {
+    return cpp::fail("Engine " + engine + " is not supported yet!");
+  }
+
+  auto config = file_manager_utils::GetCortexConfig();
+  auto variant = config.llamacppVariant;
+  auto version = config.llamacppVersion;
+
+  if (variant.empty() || version.empty()) {
+    return cpp::fail("Default engine variant for " + engine +
+                     " is not set yet!");
   }
 
-  return default_variants_[ne];
+  return DefaultEngineVariant{
+      .engine = engine,
+      .version = version,
+      .variant = variant,
+  };
 }
 
 std::vector<EngineVariantResponse> EngineService::GetInstalledEngineVariants(

engine/services/engine_service.h

@@ -183,6 +183,4 @@ class EngineService {
     std::string cuda_driver_version;
   };
   HardwareInfo hw_inf_;
-
-  std::unordered_map<std::string, DefaultEngineVariant> default_variants_;
 };

engine/utils/config_yaml_utils.h

@@ -4,6 +4,7 @@
 #include <iostream>
 #include <string>
 #include "utils/logging_utils.h"
+#include "utils/result.hpp"
 #include "yaml-cpp/yaml.h"
 
 namespace config_yaml_utils {
@@ -21,11 +22,12 @@ struct CortexConfig {
   std::string latestRelease;
 
   std::string huggingFaceToken;
-
   /**
    * Github's API requires a user-agent string.
    */
   std::string gitHubUserAgent;
+  std::string llamacppVariant;
+  std::string llamacppVersion;
 };
 
 const std::string kDefaultHost{"127.0.0.1"};
@@ -34,8 +36,8 @@ const int kDefaultMaxLines{100000};
 constexpr const uint64_t kDefaultCheckedForUpdateAt = 0u;
 constexpr const auto kDefaultLatestRelease = "default_version";
 
-inline void DumpYamlConfig(const CortexConfig& config,
-                           const std::string& path) {
+inline cpp::result<void, std::string> DumpYamlConfig(const CortexConfig& config,
+                                                     const std::string& path) {
   std::filesystem::path config_file_path{path};
 
   try {
@@ -56,12 +58,15 @@ inline void DumpYamlConfig(const CortexConfig& config,
     node["latestRelease"] = config.latestRelease;
     node["huggingFaceToken"] = config.huggingFaceToken;
     node["gitHubUserAgent"] = config.gitHubUserAgent;
+    node["llamacppVariant"] = config.llamacppVariant;
+    node["llamacppVersion"] = config.llamacppVersion;
 
     out_file << node;
     out_file.close();
+    return {};
   } catch (const std::exception& e) {
     CTL_ERR("Error writing to file: " << e.what());
-    throw;
+    return cpp::fail("Error writing to file: " + std::string(e.what()));
   }
 }
 
@@ -80,7 +85,8 @@ inline CortexConfig FromYaml(const std::string& path,
          !node["apiServerPort"] || !node["checkedForUpdateAt"] ||
          !node["latestRelease"] || !node["logLlamaCppPath"] ||
          !node["logOnnxPath"] || !node["logTensorrtLLMPath"] ||
-         !node["huggingFaceToken"] || !node["gitHubUserAgent"]);
+         !node["huggingFaceToken"] || !node["gitHubUserAgent"] ||
+         !node["llamacppVariant"] || !node["llamacppVersion"]);
 
     CortexConfig config = {
         .logFolderPath = node["logFolderPath"]
@@ -118,9 +124,18 @@ inline CortexConfig FromYaml(const std::string& path,
         .gitHubUserAgent = node["gitHubUserAgent"]
                                ? node["gitHubUserAgent"].as<std::string>()
                                : "",
+        .llamacppVariant = node["llamacppVariant"]
+                               ? node["llamacppVariant"].as<std::string>()
+                               : "",
+        .llamacppVersion = node["llamacppVersion"]
+                               ? node["llamacppVersion"].as<std::string>()
+                               : "",
     };
     if (should_update_config) {
-      DumpYamlConfig(config, path);
+      auto result = DumpYamlConfig(config, path);
+      if (result.has_error()) {
+        CTL_ERR("Failed to update config file: " << result.error());
+      }
     }
     return config;
   } catch (const YAML::BadFile& e) {

engine/utils/file_manager_utils.h

@@ -6,6 +6,7 @@
 #include "logging_utils.h"
 #include "utils/config_yaml_utils.h"
 #include "utils/engine_constants.h"
+#include "utils/result.hpp"
 
 #if defined(__APPLE__) && defined(__MACH__)
 #include <mach-o/dyld.h>
@@ -138,11 +139,22 @@ inline std::string GetDefaultDataFolderName() {
   return default_data_folder_name;
 }
 
-inline void CreateConfigFileIfNotExist() {
+inline cpp::result<void, std::string> UpdateCortexConfig(
+    const config_yaml_utils::CortexConfig& config) {
+  auto config_path = GetConfigurationPath();
+  if (!std::filesystem::exists(config_path)) {
+    CTL_ERR("Config file not found: " << config_path.string());
+    return cpp::fail("Config file not found: " + config_path.string());
+  }
+
+  return DumpYamlConfig(config, config_path.string());
+}
+
+inline cpp::result<void, std::string> CreateConfigFileIfNotExist() {
   auto config_path = GetConfigurationPath();
   if (std::filesystem::exists(config_path)) {
-    // already exists
-    return;
+    // already exists, no need to create
+    return {};
   }
 
   auto default_data_folder_name = GetDefaultDataFolderName();
@@ -165,7 +177,7 @@ inline void CreateConfigFileIfNotExist() {
       .apiServerHost = config_yaml_utils::kDefaultHost,
       .apiServerPort = config_yaml_utils::kDefaultPort,
   };
-  DumpYamlConfig(config, config_path.string());
+  return DumpYamlConfig(config, config_path.string());
 }
 
 inline config_yaml_utils::CortexConfig GetCortexConfig() {
@@ -190,7 +202,12 @@ inline config_yaml_utils::CortexConfig GetCortexConfig() {
 }
 
 inline std::filesystem::path GetCortexDataPath() {
-  CreateConfigFileIfNotExist();
+  auto result = CreateConfigFileIfNotExist();
+  if (result.has_error()) {
+    CTL_ERR("Error creating config file: " << result.error());
+    return std::filesystem::path{};
+  }
+
   auto config = GetCortexConfig();
   std::filesystem::path data_folder_path;
   if (!config.dataFolderPath.empty()) {
@@ -239,7 +256,10 @@ inline void CreateDirectoryRecursively(const std::string& path) {
 }
 
 inline std::filesystem::path GetModelsContainerPath() {
-  CreateConfigFileIfNotExist();
+  auto result = CreateConfigFileIfNotExist();
+  if (result.has_error()) {
+    CTL_ERR("Error creating config file: " << result.error());
+  }
   auto cortex_path = GetCortexDataPath();
   auto models_container_path = cortex_path / "models";