Merge pull request #1914 from janhq/chore/cherry-pick-amd-hw

chore: cherry pick AMD hardware API support

docs/docs/architecture/cortex-db.mdx

@@ -14,6 +14,13 @@ import TabItem from "@theme/TabItem";
 This document outlines the architecture of the database designed to store and manage various types of entities and their associated metadata.
 
 ## Table Structure
+### schema Table
+The `schema` table is designed to hold schema version for cortex database. Below is the structure of the table:
+
+| Column Name        | Data Type | Description                                             |
+|--------------------|-----------|---------------------------------------------------------|
+| schema_version     | INTEGER   | A unique schema version for database.                   |
+
 ### models Table
 The `models` table is designed to hold metadata about various AI models. Below is the structure of the table:
 
@@ -22,4 +29,23 @@ The `models` table is designed to hold metadata about various AI models. Below i
 | model_id           | TEXT      | A unique identifier for each model (Primary Key).      |
 | author_repo_id     | TEXT      | The identifier for the repository where the model is stored. |
 | branch_name        | TEXT      | The branch name in the repository that contains the model. |
-| path_to_model_yaml | TEXT      | The file path to the YAML configuration file for the model. |
+| path_to_model_yaml | TEXT      | The file path to the YAML configuration file for the model. |
+| model_alias        | TEXT      | The optional alias or friendly name for the model. |
+| model_format       | TEXT      | The format or type of the model (e.g., TensorFlow, PyTorch, GGUF, etc.). |
+| model_source       | TEXT      | The source or origin of the model (e.g., a URL or file path). |
+| status             | TEXT      | Current status of the model (e.g., "downloaded", "downloadable").. |
+| engine             | TEXT      | The name or identifier of the engine or framework used for running or deploying the model.. |
+| metadata           | TEXT      | Additional metadata or information about the model, such as a JSON string containing various attributes or properties. |
+
+### hardware Table
+The `hardware` table is designed to hold metadata about hardware information. Below is the structure of the table:
+
+| Column Name        | Data Type | Description                                             |
+|--------------------|-----------|---------------------------------------------------------|
+| uuid               | TEXT      | the primary key for the table, meaning that each row must have a unique value in this column.      |
+| type               | TEXT      | The type of hardware. |
+| hardware_id        | INTEGER   | An integer value representing the hardware ID. |
+| software_id        | INTEGER   | An integer value representing the software ID associated with the hardware. |
+| activated          | INTEGER   | A boolean value (0 or 1) indicating whether the hardware is activated or not. |
+| priority           | INTEGER   | An integer value representing the priority associated with the hardware. |
+

engine/.gitignore

@@ -32,6 +32,7 @@
 *.so
 *.so.*
 *.dylib
+!**/libvulkan.so
 
 # Executables
 *.exe

engine/CMakeLists.txt

@@ -68,6 +68,8 @@ endif()
 
 add_subdirectory(cli)
 
+
+
 find_package(jsoncpp CONFIG REQUIRED)
 find_package(Drogon CONFIG REQUIRED)
 find_package(yaml-cpp CONFIG REQUIRED)

engine/Makefile

@@ -73,13 +73,15 @@ ifeq ($(OS),Windows_NT)
 	@powershell -Command "mkdir -p cortex;"
 	@powershell -Command "cp build\cortex-server.exe .\cortex\$(DESTINATION_BINARY_SERVER_NAME).exe;"
 	@powershell -Command "cp build\cortex.exe .\cortex\$(DESTINATION_BINARY_NAME).exe;"
+	@powershell -Command "cp ..\engine\deps\windows\vulkan-1.dll .\cortex\;"
 	@powershell -Command "cp ..\.github\patches\windows\msvcp140.dll .\cortex\;"
 	@powershell -Command "cp ..\.github\patches\windows\vcruntime140_1.dll .\cortex\;"
 	@powershell -Command "cp ..\.github\patches\windows\vcruntime140.dll .\cortex\;"
 else ifeq ($(shell uname -s),Linux)
 	@mkdir -p cortex; \
 	cp build/cortex-server cortex/$(DESTINATION_BINARY_SERVER_NAME); \
-	cp build/cortex cortex/$(DESTINATION_BINARY_NAME);
+	cp build/cortex cortex/$(DESTINATION_BINARY_NAME); \
+	cp ../engine/deps/linux/libvulkan.so cortex/libvulkan.so;
 else
 	@mkdir -p cortex; \
 	cp build/cortex-server cortex/$(DESTINATION_BINARY_SERVER_NAME); \

engine/cli/CMakeLists.txt

@@ -140,3 +140,9 @@ set_target_properties(${TARGET_NAME} PROPERTIES
                       RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}
                       RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
 )
+
+if(UNIX AND NOT APPLE)
+configure_file("${PROJECT_SOURCE_DIR}/../deps/linux/libvulkan.so" "${CMAKE_BINARY_DIR}/libvulkan.so" COPYONLY)
+elseif(MSVC)
+configure_file("${PROJECT_SOURCE_DIR}/../deps/windows/vulkan-1.dll" "${CMAKE_BINARY_DIR}/vulkan-1.dll" COPYONLY)
+endif()

engine/cli/commands/hardware_list_cmd.cc

@@ -41,8 +41,8 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
   if (!ho.has_value() || ho.value().show_cpu) {
     std::cout << "CPU Information:" << std::endl;
     Table table;
-    std::vector<std::string> column_headers{"#", "Arch", "Cores", "Model",
-                                            "Instructions"};
+    std::vector<std::string> column_headers{"#",     "Arch",  "Cores",
+                                            "Model", "Usage", "Instructions"};
 
     Row_t header{column_headers.begin(), column_headers.end()};
     table.add_row(header);
@@ -52,6 +52,7 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
     row.emplace_back(cpu.arch);
     row.emplace_back(std::to_string(cpu.cores));
     row.emplace_back(cpu.model);
+    row.emplace_back(std::to_string(cpu.usage));
     std::string insts;
     for (auto const& i : cpu.instructions) {
       insts += i + " ";
@@ -130,6 +131,7 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
           std::get<cortex::hw::NvidiaAddInfo>(gpu.add_info).compute_cap);
       row.emplace_back(gpu.is_activated ? "Yes" : "No");
       table.add_row({row.begin(), row.end()});
+      count++;
     }
 
     std::cout << table << std::endl;

engine/common/hardware_common.h

@@ -1,9 +1,9 @@
 #pragma once
+#include <assert.h>
 #include <json/json.h>
 #include <string>
 #include <variant>
 #include <vector>
-#include <assert.h>
 
 namespace cortex::hw {
 
@@ -26,6 +26,7 @@ struct CPU {
   int cores;
   std::string arch;
   std::string model;
+  float usage;
   std::vector<std::string> instructions;
 };
 
@@ -34,6 +35,7 @@ inline Json::Value ToJson(const CPU& cpu) {
   res["arch"] = cpu.arch;
   res["cores"] = cpu.cores;
   res["model"] = cpu.model;
+  res["usage"] = cpu.usage;
   Json::Value insts(Json::arrayValue);
   for (auto const& i : cpu.instructions) {
     insts.append(i);
@@ -47,11 +49,16 @@ inline CPU FromJson(const Json::Value& root) {
   int cores = root["cores"].asInt();
   std::string arch = root["arch"].asString();
   std::string model = root["model"].asString();
+  float usage = root["usage"].asFloat();
   std::vector<std::string> insts;
   for (auto const& i : root["instructions"]) {
     insts.emplace_back(i.asString());
   }
-  return {.cores = cores, .arch = arch, .model = model, .instructions = insts};
+  return {.cores = cores,
+          .arch = arch,
+          .model = model,
+          .usage = usage,
+          .instructions = insts};
 }
 }  // namespace cpu
 
@@ -64,6 +71,7 @@ struct AmdAddInfo {};
 using GPUAddInfo = std::variant<NvidiaAddInfo, AmdAddInfo>;
 struct GPU {
   std::string id;
+  uint32_t device_id;
   std::string name;
   std::string version;
   GPUAddInfo add_info;
@@ -77,7 +85,7 @@ inline Json::Value ToJson(const std::vector<GPU>& gpus) {
   Json::Value res(Json::arrayValue);
   for (size_t i = 0; i < gpus.size(); i++) {
     Json::Value gpu;
-    gpu["id"] = std::to_string(i);
+    gpu["id"] = gpus[i].id;
     gpu["name"] = gpus[i].name;
     gpu["version"] = gpus[i].version;
     Json::Value add_info;
@@ -142,7 +150,6 @@ inline OS FromJson(const Json::Value& root) {
 }
 }  // namespace os
 
-
 struct PowerInfo {
   std::string charging_status;
   int battery_life;
@@ -165,7 +172,6 @@ inline PowerInfo FromJson(const Json::Value& root) {
 }
 }  // namespace power
 
-
 namespace {
 int64_t ByteToMiB(int64_t b) {
   return b / 1024 / 1024;
@@ -214,4 +220,4 @@ inline StorageInfo FromJson(const Json::Value& root) {
           .available = root["available"].asInt64()};
 }
 }  // namespace storage
-}
+}  // namespace cortex::hw

engine/database/hardware.cc

@@ -98,4 +98,41 @@ cpp::result<bool, std::string> Hardware::DeleteHardwareEntry(
     return cpp::fail(e.what());
   }
 }
+
+bool Hardware::HasHardwareEntry(const std::string& id) {
+   try {
+    SQLite::Statement query(db_,
+                            "SELECT COUNT(*) FROM hardware WHERE uuid = ?");
+    query.bind(1, id);
+    if (query.executeStep()) {
+      return query.getColumn(0).getInt() > 0;
+    }
+    return false;
+  } catch (const std::exception& e) {
+    CTL_WRN(e.what());
+    return false;
+  }
+}
+
+cpp::result<bool, std::string> Hardware::UpdateHardwareEntry(const std::string& id,
+                                                     int hw_id,
+                                                     int sw_id) const {
+ try {
+    SQLite::Statement upd(
+        db_,
+        "UPDATE hardware "
+        "SET hardware_id = ?, software_id = ? "
+        "WHERE uuid = ?");
+    upd.bind(1, hw_id);
+    upd.bind(2, sw_id);
+    upd.bind(3, id);
+    if (upd.exec() == 1) {
+      CTL_INF("Updated: " << id << " " << hw_id << " " << sw_id);
+      return true;
+    }
+    return false;
+  } catch (const std::exception& e) {
+    return cpp::fail(e.what());
+  }
+                                                     }
 }  // namespace cortex::db

engine/database/hardware.h

@@ -43,5 +43,9 @@ class Hardware {
   cpp::result<bool, std::string> UpdateHardwareEntry(
       const std::string& id, const HardwareEntry& updated_entry);
   cpp::result<bool, std::string> DeleteHardwareEntry(const std::string& id);
+  bool HasHardwareEntry(const std::string& id);
+  cpp::result<bool, std::string> UpdateHardwareEntry(const std::string& id,
+                                                     int hw_id,
+                                                     int sw_id) const;
 };
 }  // namespace cortex::db

engine/services/download_service.cc

@@ -102,13 +102,13 @@ void SetUpProxy(CURL* handle, std::shared_ptr<ConfigService> config_service) {
 }  // namespace
 
 cpp::result<bool, std::string> DownloadService::AddDownloadTask(
-    DownloadTask& task,
-    std::optional<OnDownloadTaskSuccessfully> callback) noexcept {
+    DownloadTask& task, std::optional<OnDownloadTaskSuccessfully> callback,
+    bool show_progress) noexcept {
   std::optional<std::string> dl_err_msg = std::nullopt;
   bool has_task_done = false;
   for (const auto& item : task.items) {
     CLI_LOG("Start downloading: " + item.localPath.filename().string());
-    auto result = Download(task.id, item);
+    auto result = Download(task.id, item, show_progress);
     if (result.has_error()) {
       dl_err_msg = result.error();
       break;
@@ -164,8 +164,8 @@ cpp::result<uint64_t, std::string> DownloadService::GetFileSize(
 }
 
 cpp::result<bool, std::string> DownloadService::Download(
-    const std::string& download_id,
-    const DownloadItem& download_item) noexcept {
+    const std::string& download_id, const DownloadItem& download_item,
+    bool show_progress) noexcept {
   CTL_INF("Absolute file output: " << download_item.localPath.string());
 
   auto curl = curl_easy_init();
@@ -241,7 +241,9 @@ cpp::result<bool, std::string> DownloadService::Download(
   SetUpProxy(curl, config_service_);
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &WriteCallback);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, file);
-  curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
+  if (show_progress) {
+    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
+  }
   curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
 
   if (mode == "ab") {

engine/services/download_service.h

@@ -108,8 +108,9 @@ class DownloadService {
    * Start download task synchronously.
    */
   cpp::result<bool, std::string> AddDownloadTask(
-      DownloadTask& task, std::optional<OnDownloadTaskSuccessfully> callback =
-                              std::nullopt) noexcept;
+      DownloadTask& task,
+      std::optional<OnDownloadTaskSuccessfully> callback = std::nullopt,
+      bool show_progress = true) noexcept;
 
   /**
    * Getting file size for a provided url. Can be used to validating the download url.
@@ -128,7 +129,8 @@ class DownloadService {
 
   cpp::result<bool, std::string> Download(
       const std::string& download_id,
-      const DownloadItem& download_item) noexcept;
+      const DownloadItem& download_item,
+      bool show_progress = true) noexcept;
 
   std::shared_ptr<EventQueue> event_queue_;