update

namchuai · namchuai · commit 110b4e2b3a25 · 2024-12-04T17:12:09.000+07:00
diff --git a/engine/common/message.h b/engine/common/message.h
@@ -17,8 +17,7 @@
 #include "utils/logging_utils.h"
 #include "utils/result.hpp"
 
-// TODO: change name to OpenAi
-namespace ThreadMessage {
+namespace OpenAi {
 
 // Represents a message within a thread.
 struct Message : JsonSerializable {
@@ -201,4 +200,4 @@ struct Message : JsonSerializable {
     }
   }
 };
-};  // namespace ThreadMessage
+};  // namespace OpenAi
diff --git a/engine/common/message_attachment.h b/engine/common/message_attachment.h
@@ -3,7 +3,7 @@
 #include <json/reader.h>
 #include "common/json_serializable.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 
 // The tools to add this file to.
 struct Tool {
@@ -47,4 +47,4 @@ struct Attachment : JsonSerializable {
     }
   }
 };
-};  // namespace ThreadMessage
+};  // namespace OpenAi
diff --git a/engine/common/message_attachment_factory.h b/engine/common/message_attachment_factory.h
@@ -4,7 +4,7 @@
 #include "common/message_attachment.h"
 #include "utils/result.hpp"
 
-namespace ThreadMessage {
+namespace OpenAi {
 inline cpp::result<Attachment, std::string> ParseAttachment(
     Json::Value&& json) {
   if (json.empty()) {
@@ -47,4 +47,4 @@ ParseAttachments(Json::Value&& json) {
 
   return attachments;
 }
-};  // namespace ThreadMessage
+};  // namespace OpenAi
diff --git a/engine/common/message_content.h b/engine/common/message_content.h
@@ -3,7 +3,7 @@
 #include <string>
 #include "common/json_serializable.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 
 struct Content : JsonSerializable {
   std::string type;
@@ -20,4 +20,4 @@ struct Content : JsonSerializable {
 
   virtual ~Content() = default;
 };
-};  // namespace ThreadMessage
+};  // namespace OpenAi
diff --git a/engine/common/message_content_factory.h b/engine/common/message_content_factory.h
@@ -8,7 +8,7 @@
 #include "utils/logging_utils.h"
 #include "utils/result.hpp"
 
-namespace ThreadMessage {
+namespace OpenAi {
 inline cpp::result<std::unique_ptr<Content>, std::string> ParseContent(
     Json::Value&& json) {
   if (json.empty()) {
@@ -74,4 +74,4 @@ ParseContents(Json::Value&& json) {
   }
   return contents;
 }
-}  // namespace ThreadMessage
+}  // namespace OpenAi
diff --git a/engine/common/message_content_image_file.h b/engine/common/message_content_image_file.h
@@ -2,7 +2,7 @@
 
 #include "common/message_content.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 struct ImageFile {
   // The File ID of the image in the message content. Set purpose="vision" when uploading the File if you need to later display the file content.
   std::string file_id;
@@ -66,4 +66,4 @@ struct ImageFileContent : Content {
     }
   }
 };
-}  // namespace ThreadMessage
+}  // namespace OpenAi
diff --git a/engine/common/message_content_image_url.h b/engine/common/message_content_image_url.h
@@ -2,7 +2,7 @@
 
 #include "common/message_content.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 
 struct ImageUrl {
   // The external URL of the image, must be a supported image types: jpeg, jpg, png, gif, webp.
@@ -68,4 +68,4 @@ struct ImageUrlContent : Content {
     }
   }
 };
-}  // namespace ThreadMessage
+}  // namespace OpenAi
diff --git a/engine/common/message_content_refusal.h b/engine/common/message_content_refusal.h
@@ -2,7 +2,7 @@
 
 #include "common/message_content.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 // The refusal content generated by the assistant.
 struct Refusal : Content {
 
@@ -43,4 +43,4 @@ struct Refusal : Content {
     }
   }
 };
-}  // namespace ThreadMessage
+}  // namespace OpenAi
diff --git a/engine/common/message_content_text.h b/engine/common/message_content_text.h
@@ -3,7 +3,7 @@
 #include "common/message_content.h"
 #include "utils/logging_utils.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 
 struct Annotation : JsonSerializable {
   std::string type;
@@ -239,4 +239,4 @@ struct TextContent : Content {
     }
   }
 };
-}  // namespace ThreadMessage
+}  // namespace OpenAi
diff --git a/engine/common/message_incomplete_detail.h b/engine/common/message_incomplete_detail.h
@@ -2,7 +2,7 @@
 
 #include "common/json_serializable.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 
 // On an incomplete message, details about why the message is incomplete.
 struct IncompleteDetail : JsonSerializable {
@@ -29,4 +29,4 @@ struct IncompleteDetail : JsonSerializable {
     }
   }
 };
-}  // namespace ThreadMessage
+}  // namespace OpenAi
diff --git a/engine/common/message_role.h b/engine/common/message_role.h
@@ -3,7 +3,7 @@
 #include <string>
 #include "utils/string_utils.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 // The entity that produced the message. One of user or assistant.
 enum class Role { USER, ASSISTANT };
 
@@ -27,4 +27,4 @@ inline Role RoleFromString(const std::string& input) {
     return Role::ASSISTANT;
   }
 }
-};  // namespace ThreadMessage
+};  // namespace OpenAi
diff --git a/engine/common/message_status.h b/engine/common/message_status.h
@@ -3,7 +3,7 @@
 #include <string>
 #include "utils/string_utils.h"
 
-namespace ThreadMessage {
+namespace OpenAi {
 // The status of the message, which can be either in_progress, incomplete, or completed.
 enum class Status { IN_PROGRESS, INCOMPLETE, COMPLETED };
 
@@ -31,4 +31,4 @@ inline Status StatusFromString(const std::string& input) {
     return Status::COMPLETED;
   }
 }
-};  // namespace ThreadMessage
+};  // namespace OpenAi
diff --git a/engine/common/repository/message_repository.h b/engine/common/repository/message_repository.h
@@ -6,22 +6,25 @@
 class MessageRepository {
  public:
   virtual cpp::result<void, std::string> CreateMessage(
-      ThreadMessage::Message& message) = 0;
+      OpenAi::Message& message) = 0;
 
-  virtual cpp::result<std::vector<ThreadMessage::Message>, std::string>
-  ListMessages(const std::string& thread_id, uint8_t limit = 20,
-               const std::string& order = "desc", const std::string& after = "",
-               const std::string& before = "",
-               const std::string& run_id = "") const = 0;
+  virtual cpp::result<std::vector<OpenAi::Message>, std::string> ListMessages(
+      const std::string& thread_id, uint8_t limit, const std::string& order,
+      const std::string& after, const std::string& before,
+      const std::string& run_id) const = 0;
 
-  virtual cpp::result<ThreadMessage::Message, std::string> RetrieveMessage(
+  virtual cpp::result<OpenAi::Message, std::string> RetrieveMessage(
       const std::string& thread_id, const std::string& message_id) const = 0;
 
   virtual cpp::result<void, std::string> ModifyMessage(
-      ThreadMessage::Message& message) = 0;
+      OpenAi::Message& message) = 0;
 
   virtual cpp::result<void, std::string> DeleteMessage(
       const std::string& thread_id, const std::string& message_id) = 0;
 
+  virtual cpp::result<void, std::string> InitializeMessages(
+      const std::string& thread_id,
+      std::optional<std::vector<OpenAi::Message>> messages);
+
   virtual ~MessageRepository() = default;
 };
diff --git a/engine/common/repository/thread_repository.h b/engine/common/repository/thread_repository.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include "common/message.h"
 #include "common/thread.h"
 #include "utils/result.hpp"
 
 class ThreadRepository {
  public:
   virtual cpp::result<void, std::string> CreateThread(
-      OpenAi::Thread& thread,
-      std::optional<std::vector<ThreadMessage::Message>> messages) = 0;
+      OpenAi::Thread& thread) = 0;
 
   virtual cpp::result<std::vector<OpenAi::Thread>, std::string> ListThreads(
       uint8_t limit, const std::string& order, const std::string&,
diff --git a/engine/controllers/messages.cc b/engine/controllers/messages.cc
@@ -75,16 +75,13 @@ void Messages::CreateMessage(
     return;
   }
 
-  ThreadMessage::Role role = role_str == "user"
-                                 ? ThreadMessage::Role::USER
-                                 : ThreadMessage::Role::ASSISTANT;
+  auto role = role_str == "user" ? OpenAi::Role::USER : OpenAi::Role::ASSISTANT;
 
-  std::variant<std::string,
-               std::vector<std::unique_ptr<ThreadMessage::Content>>>
+  std::variant<std::string, std::vector<std::unique_ptr<OpenAi::Content>>>
       content;
 
   if (json_body->get("content", "").isArray()) {
-    auto result = ThreadMessage::ParseContents(json_body->get("content", ""));
+    auto result = OpenAi::ParseContents(json_body->get("content", ""));
     if (result.has_error()) {
       Json::Value ret;
       ret["message"] = "Failed to parse content array: " + result.error();
@@ -128,12 +125,11 @@ void Messages::CreateMessage(
   }
 
   // attachments
-  std::optional<std::vector<ThreadMessage::Attachment>> attachments =
-      std::nullopt;
+  std::optional<std::vector<OpenAi::Attachment>> attachments = std::nullopt;
   if (json_body->get("attachments", "").isArray()) {
-    attachments = ThreadMessage::ParseAttachments(
-                      std::move(json_body->get("attachments", "")))
-                      .value();
+    attachments =
+        OpenAi::ParseAttachments(std::move(json_body->get("attachments", "")))
+            .value();
   }
 
   std::optional<Cortex::VariantMap> metadata = std::nullopt;
diff --git a/engine/controllers/threads.cc b/engine/controllers/threads.cc
@@ -65,21 +65,22 @@ void Threads::CreateThread(
     }
   }
 
-  // TODO: namh, thread service should not create messages.jsonl. Move it to message_srv
-  auto res =
-      thread_service_->CreateThread(std::nullopt, std::nullopt, std::nullopt);
+  auto res = thread_service_->CreateThread(std::nullopt, metadata);
+
   if (res.has_error()) {
     Json::Value ret;
     ret["message"] = res.error();
     auto resp = cortex_utils::CreateCortexHttpJsonResponse(ret);
     resp->setStatusCode(k400BadRequest);
     callback(resp);
   } else {
-    auto message_to_json = res->ToJson();
-    if (message_to_json.has_error()) {
-      CTL_ERR("Failed to convert message to json: " + message_to_json.error());
+    auto init_msg_res =
+        message_service_->InitializeMessages(res->id, std::nullopt);
+
+    if (res.has_error()) {
+      CTL_ERR("Failed to convert message to json: " + res.error());
       Json::Value ret;
-      ret["message"] = message_to_json.error();
+      ret["message"] = res.error();
       auto resp = cortex_utils::CreateCortexHttpJsonResponse(ret);
       resp->setStatusCode(k400BadRequest);
       callback(resp);
diff --git a/engine/controllers/threads.h b/engine/controllers/threads.h
@@ -2,6 +2,7 @@
 
 #include <drogon/HttpController.h>
 #include <trantor/utils/Logger.h>
+#include "services/message_service.h"
 #include "services/thread_service.h"
 
 using namespace drogon;
@@ -24,8 +25,9 @@ class Threads : public drogon::HttpController<Threads, false> {
                 Delete);
   METHOD_LIST_END
 
-  explicit Threads(std::shared_ptr<ThreadService> thread_srv)
-      : thread_service_{thread_srv} {}
+  explicit Threads(std::shared_ptr<ThreadService> thread_srv,
+                   std::shared_ptr<MessageService> msg_srv)
+      : thread_service_{thread_srv}, message_service_{msg_srv} {}
 
   void CreateThread(const HttpRequestPtr& req,
                     std::function<void(const HttpResponsePtr&)>&& callback);
@@ -51,4 +53,5 @@ class Threads : public drogon::HttpController<Threads, false> {
 
  private:
   std::shared_ptr<ThreadService> thread_service_;
+  std::shared_ptr<MessageService> message_service_;
 };
diff --git a/engine/main.cc b/engine/main.cc
@@ -119,7 +119,8 @@ void RunServer(std::optional<int> port, bool ignore_cout) {
   auto event_queue_ptr = std::make_shared<EventQueue>();
   cortex::event::EventProcessor event_processor(event_queue_ptr);
 
-  auto msg_repo = std::make_shared<MessageFsRepository>();
+  auto msg_repo = std::make_shared<MessageFsRepository>(
+      file_manager_utils::GetCortexDataPath());
   auto thread_repo = std::make_shared<ThreadFsRepository>(
       file_manager_utils::GetCortexDataPath());
 
@@ -141,7 +142,7 @@ void RunServer(std::optional<int> port, bool ignore_cout) {
   file_watcher_srv->start();
 
   // initialize custom controllers
-  auto thread_ctl = std::make_shared<Threads>(thread_srv);
+  auto thread_ctl = std::make_shared<Threads>(thread_srv, message_srv);
   auto message_ctl = std::make_shared<Messages>(message_srv);
   auto engine_ctl = std::make_shared<Engines>(engine_service);
   auto model_ctl = std::make_shared<Models>(model_service, engine_service);
diff --git a/engine/repositories/message_fs_repository.cc b/engine/repositories/message_fs_repository.cc
diff --git a/engine/repositories/message_fs_repository.h b/engine/repositories/message_fs_repository.h
diff --git a/engine/repositories/thread_fs_repository.cc b/engine/repositories/thread_fs_repository.cc
diff --git a/engine/repositories/thread_fs_repository.h b/engine/repositories/thread_fs_repository.h
diff --git a/engine/services/message_service.cc b/engine/services/message_service.cc
diff --git a/engine/services/message_service.h b/engine/services/message_service.h
diff --git a/engine/services/thread_service.cc b/engine/services/thread_service.cc
diff --git a/engine/services/thread_service.h b/engine/services/thread_service.h

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@`
`17`	`17`	`#include "utils/logging_utils.h"`
`18`	`18`	`#include "utils/result.hpp"`
`19`	`19`
`20`		`-// TODO: change name to OpenAi`
`21`		`-namespace ThreadMessage {`
	`20`	`+namespace OpenAi {`
`22`	`21`
`23`	`22`	`// Represents a message within a thread.`
`24`	`23`	`struct Message : JsonSerializable {`
`@@ -201,4 +200,4 @@ struct Message : JsonSerializable {`
`201`	`200`	`}`
`202`	`201`	`}`
`203`	`202`	`};`
`204`		`-}; // namespace ThreadMessage`
	`203`	`+}; // namespace OpenAi`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include <json/reader.h>`
`4`	`4`	`#include "common/json_serializable.h"`
`5`	`5`
`6`		`-namespace ThreadMessage {`
	`6`	`+namespace OpenAi {`
`7`	`7`
`8`	`8`	`// The tools to add this file to.`
`9`	`9`	`struct Tool {`
`@@ -47,4 +47,4 @@ struct Attachment : JsonSerializable {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`};`
`50`		`-}; // namespace ThreadMessage`
	`50`	`+}; // namespace OpenAi`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include "utils/logging_utils.h"`
`9`	`9`	`#include "utils/result.hpp"`
`10`	`10`
`11`		`-namespace ThreadMessage {`
	`11`	`+namespace OpenAi {`
`12`	`12`	`inline cpp::result<std::unique_ptr<Content>, std::string> ParseContent(`
`13`	`13`	`Json::Value&& json) {`
`14`	`14`	`if (json.empty()) {`
`@@ -74,4 +74,4 @@ ParseContents(Json::Value&& json) {`
`74`	`74`	`}`
`75`	`75`	`return contents;`
`76`	`76`	`}`
`77`		`-} // namespace ThreadMessage`
	`77`	`+} // namespace OpenAi`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include "common/message_content.h"`
`4`	`4`
`5`		`-namespace ThreadMessage {`
	`5`	`+namespace OpenAi {`
`6`	`6`	`struct ImageFile {`
`7`	`7`	`// The File ID of the image in the message content. Set purpose="vision" when uploading the File if you need to later display the file content.`
`8`	`8`	`std::string file_id;`
`@@ -66,4 +66,4 @@ struct ImageFileContent : Content {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`};`
`69`		`-} // namespace ThreadMessage`
	`69`	`+} // namespace OpenAi`