clean up

Author: namchuai

engine/common/download_event.h

@@ -1,15 +1,15 @@
 #pragma once
 
+#include <nlohmann/json.hpp>
 #include "common/download_task.h"
 #include "common/event.h"
 
 namespace cortex::event {
+using namespace nlohmann;
 
 enum class DownloadEventType {
-  DownloadValidateStarted,
-  DownloadValidateFailed,
   DownloadStarted,
-  DownloadPaused,
+  DownloadStopped,
   DownloadUpdated,
   DownloadSuccess,
   DownloadError,
@@ -18,13 +18,9 @@ enum class DownloadEventType {
 namespace {
 std::string DownloadEventTypeToString(DownloadEventType type) {
   switch (type) {
-    case DownloadEventType::DownloadValidateStarted:
-      return "DownloadValidateStarted";
-    case DownloadEventType::DownloadValidateFailed:
-      return "DownloadValidateFailed";
     case DownloadEventType::DownloadStarted:
       return "DownloadStarted";
-    case DownloadEventType::DownloadPaused:
+    case DownloadEventType::DownloadStopped:
       return "DownloadPaused";
     case DownloadEventType::DownloadUpdated:
       return "DownloadUpdated";
@@ -39,7 +35,11 @@ std::string DownloadEventTypeToString(DownloadEventType type) {
 }  // namespace
 
 struct DownloadEvent : public cortex::event::Event {
-  std::string ToString() const { return download_task_.ToString(); }
+  std::string ToJsonString() const {
+    json json{{"type", DownloadEventTypeToString(type_)},
+              {"task", download_task_.ToJson()}};
+    return json.dump();
+  }
 
   DownloadEventType type_;
   DownloadTask download_task_;

engine/common/download_task.h

@@ -1,10 +1,12 @@
 #pragma once
 
 #include <filesystem>
+#include <nlohmann/json.hpp>
 #include <sstream>
 #include <string>
 
 enum class DownloadType { Model, Engine, Miscellaneous, CudaToolkit, Cortex };
+using namespace nlohmann;
 
 struct DownloadItem {
   std::string id;
@@ -33,6 +35,23 @@ struct DownloadItem {
   }
 };
 
+inline std::string DownloadTypeToString(DownloadType type) {
+  switch (type) {
+    case DownloadType::Model:
+      return "Model";
+    case DownloadType::Engine:
+      return "Engine";
+    case DownloadType::Miscellaneous:
+      return "Miscellaneous";
+    case DownloadType::CudaToolkit:
+      return "CudaToolkit";
+    case DownloadType::Cortex:
+      return "Cortex";
+    default:
+      return "Unknown";
+  }
+}
+
 struct DownloadTask {
   std::string id;
 
@@ -50,21 +69,21 @@ struct DownloadTask {
     output << "]}";
     return output.str();
   }
-};
 
-inline std::string DownloadTypeToString(DownloadType type) {
-  switch (type) {
-    case DownloadType::Model:
-      return "Model";
-    case DownloadType::Engine:
-      return "Engine";
-    case DownloadType::Miscellaneous:
-      return "Miscellaneous";
-    case DownloadType::CudaToolkit:
-      return "CudaToolkit";
-    case DownloadType::Cortex:
-      return "Cortex";
-    default:
-      return "Unknown";
+  json ToJson() const {
+    json dl_items = json::array();
+
+    for (const auto& item : items) {
+      json dl_item{{"id", item.id},
+                   {"downloadUrl", item.downloadUrl},
+                   {"localPath", item.localPath},
+                   {"checksum", item.checksum.value_or("N/A")},
+                   {"bytes", item.bytes.value_or(0)},
+                   {"downloadedBytes", item.downloadedBytes.value_or(0)}};
+      dl_items.push_back(dl_item);
+    }
+
+    return json{
+        {"id", id}, {"type", DownloadTypeToString(type)}, {"items", dl_items}};
   }
-}
+};

engine/controllers/events.h

@@ -23,7 +23,7 @@ class Events : public drogon::WebSocketController<Events, false> {
       : event_queue_{event_queue} {
     // TODO: namh make a list of event
     event_queue_->appendListener("download-update", [this](DownloadEvent e) {
-      this->broadcast(e.ToString());
+      this->broadcast(e.ToJsonString());
     });
   };
 

engine/controllers/models.cc

@@ -137,8 +137,8 @@ void Models::GetModel(const HttpRequestPtr& req,
     resp->setStatusCode(k200OK);
     callback(resp);
   } catch (const std::exception& e) {
-    std::string message = "Fail to get model information with ID '" +
-                          model_id + "': " + e.what();
+    std::string message =
+        "Fail to get model information with ID '" + model_id + "': " + e.what();
     LOG_ERROR << message;
     ret["data"] = data;
     ret["result"] = "Fail to get model information";

engine/controllers/server.h

@@ -1,4 +1,6 @@
+#include <nlohmann/json.hpp>
 #include <string>
+
 #if defined(_WIN32)
 #define NOMINMAX
 #endif
@@ -20,7 +22,6 @@
 #include "cortex-common/EngineI.h"
 #include "cortex-common/cortexpythoni.h"
 #include "utils/dylib.h"
-#include "utils/json.hpp"
 
 #ifndef SERVER_VERBOSE
 #define SERVER_VERBOSE 1

engine/services/engine_service.cc

@@ -5,7 +5,6 @@
 #include "utils/archive_utils.h"
 #include "utils/engine_matcher_utils.h"
 #include "utils/file_manager_utils.h"
-#include "utils/json.hpp"
 #include "utils/result.hpp"
 #include "utils/semantic_version_utils.h"
 #include "utils/system_info_utils.h"

engine/utils/huggingface_utils.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <httplib.h>
+#include <nlohmann/json.hpp>
 #include <optional>
 #include <string>
 #include <vector>
-#include "utils/json.hpp"
 #include "utils/result.hpp"
 #include "utils/url_parser.h"