From 45fc4c91d852f8ba77b4712848055b516603bb45 Mon Sep 17 00:00:00 2001
From: Jicheng Lu <franklujc@gmail.com>
Date: Wed, 14 Feb 2024 19:13:35 -0600
Subject: [PATCH] add role in content log

---
 .../Loggers/Models/StreamingLogModel.cs                  | 2 ++
 .../BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs    | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Infrastructure/BotSharp.Abstraction/Loggers/Models/StreamingLogModel.cs b/src/Infrastructure/BotSharp.Abstraction/Loggers/Models/StreamingLogModel.cs
index 51941138..e0986272 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Loggers/Models/StreamingLogModel.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Loggers/Models/StreamingLogModel.cs
@@ -6,6 +6,8 @@ public class StreamingLogModel
     public string ConversationId { get; set; }
     [JsonPropertyName("name")]
     public string? Name { get; set; }
+    [JsonPropertyName("role")]
+    public string Role { get; set; }
 
     [JsonPropertyName("content")]
     public string Content { get; set; }
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
index 8b0aa2cd..c4e74ec4 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
@@ -37,7 +37,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook
     {
         var conversationId = _state.GetConversationId();
         var log = $"MessageId: {message.MessageId} ==>\r\n{message.Role}: {message.Content}";
-        await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, _user.UserName, log));
+        await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, _user.UserName, message.Role, log));
     }
 
     public async Task BeforeGenerating(Agent agent, List<RoleDialogModel> conversations)
@@ -64,21 +64,22 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook
         var conversationId = _state.GetConversationId();
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
 
-        await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, agent?.Name, tokenStats.Prompt));
+        await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, agent?.Name, message.Role, tokenStats.Prompt));
 
         var log = message.Role == AgentRole.Function ?
                 $"[{agent?.Name}]: {message.FunctionName}({message.FunctionArgs})" :
                 $"[{agent?.Name}]: {message.Content}";
         log += $"\r\n<== MessageId: {message.MessageId}";
-        await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, agent?.Name, log));
+        await _chatHub.Clients.User(_user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, agent?.Name, message.Role, log));
     }
 
-    private string BuildLog(string conversationId, string? name, string content)
+    private string BuildLog(string conversationId, string? name, string role, string content)
     {
         var log = new StreamingLogModel
         {
             ConversationId = conversationId,
             Name = name,
+            Role = role,
             Content = content,
             CreateTime = DateTime.UtcNow
         };