Merge branch 'dev' into chore/lint-api-reference

Author: gabrielle-ong

docker/entrypoint.sh

@@ -7,10 +7,10 @@ echo "enableCors: true" >> /root/.cortexrc
 
 # Install the engine
 cortex engines install llama-cpp -s /opt/cortex.llamacpp
-cortex engines list
 
 # Start the cortex server
 cortex start
+cortex engines list
 
 # Keep the container running by tailing the log files
 tail -f /root/cortexcpp/logs/cortex.log &

engine/CMakeLists.txt

@@ -169,17 +169,19 @@ else()
 endif()
 
 aux_source_directory(controllers CTL_SRC)
+aux_source_directory(repositories REPO_SRC)
 aux_source_directory(services SERVICES_SRC)
 aux_source_directory(common COMMON_SRC)
 aux_source_directory(models MODEL_SRC)
 aux_source_directory(cortex-common CORTEX_COMMON)
 aux_source_directory(config CONFIG_SRC)
 aux_source_directory(database DB_SRC)
 aux_source_directory(migrations MIGR_SRC)
+aux_source_directory(utils UTILS_SRC)
 
 target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )
 
-target_sources(${TARGET_NAME} PRIVATE ${CONFIG_SRC} ${CTL_SRC} ${COMMON_SRC} ${SERVICES_SRC} ${DB_SRC} ${MIGR_SRC})
+target_sources(${TARGET_NAME} PRIVATE ${UTILS_SRC} ${CONFIG_SRC} ${CTL_SRC} ${COMMON_SRC} ${SERVICES_SRC} ${DB_SRC} ${MIGR_SRC} ${REPO_SRC})
 
 set_target_properties(${TARGET_NAME} PROPERTIES
                       RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}

engine/cli/CMakeLists.txt

@@ -84,6 +84,10 @@ add_executable(${TARGET_NAME} main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../services/hardware_service.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/utils/easywsclient.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/utils/download_progress.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../utils/config_yaml_utils.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../utils/file_manager_utils.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../utils/curl_utils.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../utils/system_info_utils.cc
   )
 
 target_link_libraries(${TARGET_NAME} PRIVATE CLI11::CLI11)

engine/cli/commands/engine_install_cmd.cc

@@ -179,7 +179,6 @@ bool EngineInstallCmd::Exec(const std::string& engine,
   auto response = curl_utils::SimplePostJson(install_url.ToFullPath(),
                                              body.toStyledString());
   if (response.has_error()) {
-    // TODO: namh refactor later
     Json::Value root;
     Json::Reader reader;
     if (!reader.parse(response.error(), root)) {

engine/cli/commands/engine_list_cmd.cc

@@ -4,6 +4,7 @@
 #include "common/engine_servicei.h"
 #include "server_start_cmd.h"
 #include "utils/curl_utils.h"
+#include "utils/engine_constants.h"
 #include "utils/logging_utils.h"
 #include "utils/url_parser.h"
 // clang-format off

engine/cli/commands/ps_cmd.cc

@@ -2,6 +2,7 @@
 #include <string>
 #include <tabulate/table.hpp>
 #include "utils/curl_utils.h"
+#include "utils/engine_constants.h"
 #include "utils/format_utils.h"
 #include "utils/logging_utils.h"
 #include "utils/string_utils.h"

engine/cli/commands/server_start_cmd.cc

@@ -1,6 +1,7 @@
 #include "server_start_cmd.h"
 #include "commands/cortex_upd_cmd.h"
 #include "utils/cortex_utils.h"
+#include "utils/engine_constants.h"
 #include "utils/file_manager_utils.h"
 #include "utils/widechar_conv.h"
 
@@ -27,6 +28,10 @@ bool TryConnectToServer(const std::string& host, int port) {
 
 bool ServerStartCmd::Exec(const std::string& host, int port,
                           const std::optional<std::string>& log_level) {
+  if (IsServerAlive(host, port)) {
+    CLI_LOG("The server has already started");
+    return true;
+  }
   std::string log_level_;
   if (!log_level.has_value()) {
     log_level_ = "INFO";

engine/cli/main.cc

@@ -148,7 +148,6 @@ int main(int argc, char* argv[]) {
 
   if (should_check_for_latest_llamacpp_version) {
     std::thread t1([]() {
-      auto config = file_manager_utils::GetCortexConfig();
       // TODO: namh current we only check for llamacpp. Need to add support for other engine
       auto get_latest_version = []() -> cpp::result<std::string, std::string> {
         try {
@@ -176,6 +175,7 @@ int main(int argc, char* argv[]) {
 
       auto now = std::chrono::system_clock::now();
       CTL_DBG("latest llama.cpp version: " << res.value());
+      auto config = file_manager_utils::GetCortexConfig();
       config.checkedForLlamacppUpdateAt =
           std::chrono::duration_cast<std::chrono::milliseconds>(
               now.time_since_epoch())

engine/common/api-dto/messages/delete_message_response.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "common/json_serializable.h"
+
+namespace api_response {
+struct DeleteMessageResponse : JsonSerializable {
+  std::string id;
+  std::string object;
+  bool deleted;
+
+  cpp::result<Json::Value, std::string> ToJson() override {
+    Json::Value json;
+    json["id"] = id;
+    json["object"] = object;
+    json["deleted"] = deleted;
+    return json;
+  }
+};
+}  // namespace api_response

engine/common/json_serializable.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <json/value.h>
+#include "utils/result.hpp"
+
+struct JsonSerializable {
+
+  virtual cpp::result<Json::Value, std::string> ToJson() = 0;
+
+  virtual ~JsonSerializable() = default;
+};