Merge pull request #259 from iceljc/features/structure-content-log

structure content log
SciSharp · Jan 19, 2024 · 844ed86 · 844ed86
2 parents 6e8afba + b6049fd
commit 844ed86
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/src/Infrastructure/BotSharp.Abstraction/Loggers/Models/StreamingLogModel.cs b/src/Infrastructure/BotSharp.Abstraction/Loggers/Models/StreamingLogModel.cs
@@ -0,0 +1,13 @@
+namespace BotSharp.Abstraction.Loggers.Models;
+
+public class StreamingLogModel
+{
+    [JsonPropertyName("conversation_id")]
+    public string ConversationId { get; set; }
+
+    [JsonPropertyName("content")]
+    public string Content { get; set; }
+
+    [JsonPropertyName("created_at")]
+    public DateTime CreateTime { get; set; }
+}
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
@@ -1,6 +1,6 @@
 using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Loggers;
-using BotSharp.Abstraction.Users.Models;
+using BotSharp.Abstraction.Loggers.Models;
 using Microsoft.AspNetCore.SignalR;
 
 namespace BotSharp.Plugin.ChatHub.Hooks;
@@ -10,6 +10,7 @@ public class StreamingLogHook : IContentGeneratingHook
     private readonly ConversationSetting _convSettings;
     private readonly IServiceProvider _services;
     private readonly IHubContext<SignalRHub> _chatHub;
+    private readonly JsonSerializerOptions _serializerOptions;
 
     public StreamingLogHook(
         ConversationSetting convSettings,
@@ -19,31 +20,52 @@ public class StreamingLogHook : IContentGeneratingHook
         _convSettings = convSettings;
         _services = serivces;
         _chatHub = chatHub;
+        _serializerOptions = new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            AllowTrailingCommas = true
+        };
     }
 
     public async Task BeforeGenerating(Agent agent, List<RoleDialogModel> conversations)
     {
         if (!_convSettings.ShowVerboseLog) return;
 
         var user = _services.GetRequiredService<IUserIdentity>();
+        var states = _services.GetRequiredService<IConversationStateService>();
+        var conversationId = states.GetConversationId();
         var dialog = conversations.Last();
         var log = $"{dialog.Role}: {dialog.Content} [msg_id: {dialog.MessageId}] ==>";
-        await _chatHub.Clients.User(user.Id).SendAsync("OnContentLogGenerated", log);
+        await _chatHub.Clients.User(user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, log));
     }
 
     public async Task AfterGenerated(RoleDialogModel message, TokenStatsModel tokenStats)
     {
         if (!_convSettings.ShowVerboseLog) return;
 
         var agentService = _services.GetRequiredService<IAgentService>();
+        var states = _services.GetRequiredService<IConversationStateService>();
+        var conversationId = states.GetConversationId();
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
 
         var log = message.Role == AgentRole.Function ?
                 $"[{agent?.Name}]: {message.FunctionName}({message.FunctionArgs})" :
                 $"[{agent?.Name}]: {message.Content}" + $" <== [msg_id: {message.MessageId}]";
 
         var user = _services.GetRequiredService<IUserIdentity>();
-        await _chatHub.Clients.User(user.Id).SendAsync("OnContentLogGenerated", tokenStats.Prompt);
-        await _chatHub.Clients.User(user.Id).SendAsync("OnContentLogGenerated", log);
+        await _chatHub.Clients.User(user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, tokenStats.Prompt));
+        await _chatHub.Clients.User(user.Id).SendAsync("OnContentLogGenerated", BuildLog(conversationId, log));
+    }
+
+    private string BuildLog(string conversationId, string content)
+    {
+        var log = new StreamingLogModel
+        {
+            ConversationId = conversationId,
+            Content = content,
+            CreateTime = DateTime.UtcNow
+        };
+        return JsonSerializer.Serialize(log, _serializerOptions);
     }
 }