Merge branch 'dev' of https://github.com/menloresearch/cortex.cpp into s/chore/rm-vcpkg

Author: sangjanai

engine/CMakeLists.txt

@@ -5,11 +5,8 @@ project(cortex-server C CXX)
 include(CheckIncludeFileCXX)
 
 set(CMAKE_CXX_STANDARD 17)
-MESSAGE("CMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD})
-
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-# set(OPENSSL_USE_STATIC_LIBS TRUE)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Add CORTEX_CQA option

engine/cli/CMakeLists.txt

@@ -2,22 +2,9 @@ project(cortex C CXX)
 
 include(CheckIncludeFileCXX)
 
-check_include_file_cxx(any HAS_ANY)
-check_include_file_cxx(string_view HAS_STRING_VIEW)
-check_include_file_cxx(coroutine HAS_COROUTINE)
-if(HAS_ANY
-   AND HAS_STRING_VIEW
-   AND HAS_COROUTINE)
-  set(CMAKE_CXX_STANDARD 20)
-elseif(HAS_ANY AND HAS_STRING_VIEW)
-  set(CMAKE_CXX_STANDARD 17)
-else()
-  set(CMAKE_CXX_STANDARD 14)
-endif()
-
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(OPENSSL_USE_STATIC_LIBS TRUE)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if(MSVC)

engine/cli/command_line_parser.cc

@@ -86,7 +86,7 @@ bool CommandLineParser::SetupCommand(int argc, char** argv) {
 #else
     CLI_LOG("default");
 #endif
-(void) c;
+    (void)c;
   };
   app_.add_flag_function("-v,--version", cb, "Get Cortex version");
 
@@ -436,7 +436,7 @@ void CommandLineParser::SetupConfigsCommands() {
 
     auto is_empty = true;
     for (const auto& [key, value] : config_update_opts_) {
-      if (!value.empty() || CONFIGURATIONS.at(key).allow_empty) {
+      if (!value.empty() || key == "api_keys") {
         is_empty = false;
         break;
       }

engine/cli/commands/config_upd_cmd.cc

@@ -2,6 +2,7 @@
 #include "commands/server_start_cmd.h"
 #include "common/api_server_configuration.h"
 #include "utils/curl_utils.h"
+#include "utils/file_manager_utils.h"
 #include "utils/logging_utils.h"
 #include "utils/string_utils.h"
 #include "utils/url_parser.h"
@@ -46,22 +47,40 @@ inline Json::Value NormalizeJson(
 void commands::ConfigUpdCmd::Exec(
     const std::string& host, int port,
     const std::unordered_map<std::string, std::string>& options) {
-  if (!commands::IsServerAlive(host, port)) {
-    CLI_LOG("Starting server ...");
-    commands::ServerStartCmd ssc;
-    if (!ssc.Exec(host, port)) {
-      return;
-    }
-  }
 
   auto non_null_opts = std::unordered_map<std::string, std::string>();
   for (const auto& [key, value] : options) {
-    if (value.empty() && !CONFIGURATIONS.at(key).allow_empty) {
+    // In case of api_keys, we allow empty value
+    if (value.empty() && key != "api_keys") {
       continue;
     }
     non_null_opts[key] = value;
   }
 
+  if (non_null_opts.size() == 1) {
+    for (const auto& [key, value] : non_null_opts) {
+      if (key == "api_keys") {
+        auto config = file_manager_utils::GetCortexConfig();
+        config.apiKeys = string_utils::SplitBy(value, ",");
+        auto result = file_manager_utils::UpdateCortexConfig(config);
+        if (result.has_error()) {
+          CLI_LOG_ERROR(result.error());
+        } else {
+          CLI_LOG("Configuration updated successfully!");
+        }
+        return;
+      }
+    }
+  }
+
+  if (!commands::IsServerAlive(host, port)) {
+    CLI_LOG("Starting server ...");
+    commands::ServerStartCmd ssc;
+    if (!ssc.Exec(host, port)) {
+      return;
+    }
+  }
+
   auto url = url_parser::Url{
       /* .protocol = */ "http",
       /* .host = */ host + ":" + std::to_string(port),

engine/cli/commands/engine_update_cmd.cc

@@ -45,7 +45,7 @@ bool EngineUpdateCmd::Exec(const std::string& host, int port,
     try {
       Json::Value json = json_helper::ParseJsonString(update_result.error());
       std::cout << json["message"].asString() << std::endl;
-    } catch (const std::exception& e) {
+    } catch (const std::exception&) {
       CTL_ERR(update_result.error());
     }
 

engine/common/api_server_configuration.h

@@ -80,6 +80,15 @@ static const std::unordered_map<std::string, ApiConfigurationMetadata>
                                   /* .accept_value = */ "string",
                                   /* .default_value = */ "",
                                   /* .allow_empty = */ true}},
+        {"api_keys",
+         ApiConfigurationMetadata{
+             /* .name = */ "api_keys",
+             /* .desc = */ "API header key to get access to server APIs",
+             /* .group = */ "Token",
+             /* .accept_value = */ " comma separated",
+             /* .default_value = */ "",
+             /* .allow_empty = */ true}},
+
 };
 
 class ApiServerConfiguration {
@@ -316,4 +325,4 @@ class ApiServerConfiguration {
       }
     }
   };
-};
+};

engine/config/gguf_parser.cc

@@ -86,7 +86,7 @@ void GGUFHandler::OpenFile(const std::string& file_path) {
 #endif
 }
 
-void GGUFHandler::CheckOffset(int offset) const {
+void GGUFHandler::CheckOffset(size_t offset) const {
   if (offset > file_size_)
     throw std::runtime_error("Unexpected EOF");
 }

engine/config/gguf_parser.h

@@ -47,7 +47,7 @@ class GGUFHandler {
   size_t ReadArray(std::size_t offset, const std::string& key);
   void ModelConfigFromMetadata();
   void OpenFile(const std::string& file_path);
-  void CheckOffset(int offset) const;
+  void CheckOffset(size_t offset) const;
 
   uint8_t* data_;
   size_t file_size_;

engine/config/yaml_config.cc

@@ -55,7 +55,7 @@ void YamlHandler::ReadYamlFile(const std::string& file_path) {
       }
     }
 
-  } catch (const YAML::BadFile& e) {
+  } catch (const YAML::BadFile&) {
     throw;
   }
 }

engine/database/engines.cc

@@ -60,7 +60,7 @@ std::optional<EngineEntry> Engines::UpsertEngine(
     } else {
       return std::nullopt;
     }
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return std::nullopt;
   }
 }
@@ -87,7 +87,7 @@ std::optional<std::vector<EngineEntry>> Engines::GetEngines() const {
     }
 
     return engines;
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return std::nullopt;
   }
 }
@@ -115,7 +115,7 @@ std::optional<EngineEntry> Engines::GetEngineById(int id) const {
     } else {
       return std::nullopt;
     }
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return std::nullopt;
   }
 }
@@ -155,7 +155,7 @@ std::optional<EngineEntry> Engines::GetEngineByNameAndVariant(
     } else {
       return std::nullopt;
     }
-  } catch (const std::exception& e) {
+  } catch (const std::exception&) {
     return std::nullopt;
   }
 }