rename model

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs

@@ -15,7 +15,7 @@ public interface IConversationService
     Task<List<Conversation>> GetLastConversations();
     Task<bool> DeleteConversation(string id);
     Task<bool> TruncateConversation(string conversationId, string messageId);
-    Task<List<ConversationContentLogModel>> GetConversationContentLogs(string conversationId);
+    Task<List<ContentLogOutputModel>> GetConversationContentLogs(string conversationId);
     Task<List<ConversationStateLogModel>> GetConversationStateLogs(string conversationId);
 
     /// <summary>

src/Infrastructure/BotSharp.Abstraction/Loggers/Models/ContentLogInputModel.cs

@@ -0,0 +1,22 @@
+namespace BotSharp.Abstraction.Loggers.Models;
+
+public class ContentLogInputModel
+{
+    public string ConversationId { get; set; }
+    public string? Name { get; set; }
+    public string? AgentId { get; set; }
+    public string Log { get; set; }
+    public string Source { get; set; }
+    public RoleDialogModel Message { get; set; }
+
+    public ContentLogInputModel()
+    {
+
+    }
+
+    public ContentLogInputModel(string conversationId, RoleDialogModel message)
+    {
+        ConversationId = conversationId;
+        Message = message;
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Loggers/Models/ContentLogOutputModel.cs

@@ -1,6 +1,6 @@
 namespace BotSharp.Abstraction.Loggers.Models;
 
-public class ConversationContentLogModel
+public class ContentLogOutputModel
 {
     [JsonPropertyName("conversation_id")]
     public string ConversationId { get; set; }
@@ -11,6 +11,9 @@ public class ConversationContentLogModel
     [JsonPropertyName("name")]
     public string? Name { get; set; }
 
+    [JsonPropertyName("agent_id")]
+    public string? AgentId { get; set; }
+
     [JsonPropertyName("role")]
     public string Role { get; set; }
 

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -72,8 +72,8 @@ public interface IBotSharpRepository
     #endregion
 
     #region Conversation Content Log
-    void SaveConversationContentLog(ConversationContentLogModel log);
+    void SaveConversationContentLog(ContentLogOutputModel log);
-    List<ConversationContentLogModel> GetConversationContentLogs(string conversationId);
+    List<ContentLogOutputModel> GetConversationContentLogs(string conversationId);
     #endregion
 
     #region Conversation State Log

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.Log.cs

@@ -5,7 +5,7 @@ namespace BotSharp.Core.Conversations.Services;
 
 public partial class ConversationService
 {
-    public async Task<List<ConversationContentLogModel>> GetConversationContentLogs(string conversationId)
+    public async Task<List<ContentLogOutputModel>> GetConversationContentLogs(string conversationId)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
         var logs = db.GetConversationContentLogs(conversationId);

src/Infrastructure/BotSharp.Core/Repository/BotSharpDbContext.cs

@@ -257,12 +257,12 @@ public class BotSharpDbContext : Database, IBotSharpRepository
     #endregion
 
     #region Conversation Content Log
-    public void SaveConversationContentLog(ConversationContentLogModel log)
+    public void SaveConversationContentLog(ContentLogOutputModel log)
     {
         throw new NotImplementedException();
     }
 
-    public List<ConversationContentLogModel> GetConversationContentLogs(string conversationId)
+    public List<ContentLogOutputModel> GetConversationContentLogs(string conversationId)
     {
         throw new NotImplementedException();
     }

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs

@@ -409,7 +409,7 @@ namespace BotSharp.Core.Repository
                 foreach (var file in Directory.GetFiles(contentLogDir))
                 {
                     var text = File.ReadAllText(file);
-                    var log = JsonSerializer.Deserialize<ConversationContentLogModel>(text);
+                    var log = JsonSerializer.Deserialize<ContentLogOutputModel>(text);
                     if (log == null) continue;
 
                     if (log.CreateTime >= refTime)

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Log.cs

@@ -63,7 +63,7 @@ namespace BotSharp.Core.Repository
         #endregion
 
         #region Conversation Content Log
-        public void SaveConversationContentLog(ConversationContentLogModel log)
+        public void SaveConversationContentLog(ContentLogOutputModel log)
         {
             if (log == null) return;
 
@@ -88,9 +88,9 @@ namespace BotSharp.Core.Repository
             File.WriteAllText(file, JsonSerializer.Serialize(log, _options));
         }
 
-        public List<ConversationContentLogModel> GetConversationContentLogs(string conversationId)
+        public List<ContentLogOutputModel> GetConversationContentLogs(string conversationId)
         {
-            var logs = new List<ConversationContentLogModel>();
+            var logs = new List<ContentLogOutputModel>();
             if (string.IsNullOrEmpty(conversationId)) return logs;
 
             var convDir = FindConversationDirectory(conversationId);
@@ -102,7 +102,7 @@ namespace BotSharp.Core.Repository
             foreach (var file in Directory.GetFiles(logDir))
             {
                 var text = File.ReadAllText(file);
-                var log = JsonSerializer.Deserialize<ConversationContentLogModel>(text);
+                var log = JsonSerializer.Deserialize<ContentLogOutputModel>(text);
                 if (log == null) continue;
 
                 logs.Add(log);

src/Infrastructure/BotSharp.OpenAPI/Controllers/LoggerController.cs

@@ -37,7 +37,7 @@ public class LoggerController : ControllerBase
     }
 
     [HttpGet("/logger/conversation/{conversationId}/content-log")]
-    public async Task<List<ConversationContentLogModel>> GetConversationContentLogs([FromRoute] string conversationId)
+    public async Task<List<ContentLogOutputModel>> GetConversationContentLogs([FromRoute] string conversationId)
     {
         var conversationService = _services.GetRequiredService<IConversationService>();
         return await conversationService.GetConversationContentLogs(conversationId);

src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs

@@ -50,7 +50,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
         var conversationId = _state.GetConversationId();
         var log = $"{message.Content}";
 
-        var input = new ContentLogInput(conversationId, message)
+        var input = new ContentLogInputModel(conversationId, message)
         {
             Name = _user.UserName,
             Source = ContentLogSource.UserInput,
@@ -70,7 +70,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
         var agent = await _agentService.LoadAgent(message.CurrentAgentId);
         var log = $"{message.FunctionName}({message.FunctionArgs})\r\n    => {message.Content}";
 
-        var input = new ContentLogInput(conversationId, message)
+        var input = new ContentLogInputModel(conversationId, message)
         {
             Name = agent?.Name,
             AgentId = agent?.Id,
@@ -95,7 +95,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
 
         var log = tokenStats.Prompt;
 
-        var input = new ContentLogInput(conversationId, message)
+        var input = new ContentLogInputModel(conversationId, message)
         {
             Name = agent?.Name,
             AgentId = agent?.Id,
@@ -126,7 +126,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
                 log += $"\r\n{richContent}";
             }
 
-            var input = new ContentLogInput(conv.ConversationId, message)
+            var input = new ContentLogInputModel(conv.ConversationId, message)
             {
                 Name = agent?.Name,
                 AgentId = agent?.Id,
@@ -150,7 +150,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
             MessageId = _routingCtx.MessageId
         };
 
-        var input = new ContentLogInput(conversationId, message)
+        var input = new ContentLogInputModel(conversationId, message)
         {
             Name = "Router",
             Source = ContentLogSource.HardRule,
@@ -171,7 +171,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
             MessageId = _routingCtx.MessageId
         };
 
-        var input = new ContentLogInput(conversationId, message)
+        var input = new ContentLogInputModel(conversationId, message)
         {
             Name = "Router",
             Source = ContentLogSource.HardRule,
@@ -192,7 +192,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
             MessageId = _routingCtx.MessageId
         };
 
-        var input = new ContentLogInput(conversationId, message)
+        var input = new ContentLogInputModel(conversationId, message)
         {
             Name = "Router",
             Source = ContentLogSource.HardRule,
@@ -212,7 +212,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
             MessageId = _routingCtx.MessageId
         };
 
-        var input = new ContentLogInput(conversationId, message)
+        var input = new ContentLogInputModel(conversationId, message)
         {
             Name = "Router",
             Source = ContentLogSource.HardRule,
@@ -227,7 +227,7 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
         var agent = await _agentService.LoadAgent(message.CurrentAgentId);
         var log = JsonSerializer.Serialize(instruct, _serializerOptions);
 
-        var input = new ContentLogInput(conversationId, message)
+        var input = new ContentLogInputModel(conversationId, message)
         {
             Name = agent?.Name,
             AgentId = agent?.Id,
@@ -239,26 +239,27 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
     #endregion
 
 
-    private string BuildContentLog(ContentLogInput input)
+    private string BuildContentLog(ContentLogInputModel input)
     {
-        var log = new ConversationContentLogModel
+        var output = new ContentLogOutputModel
         {
             ConversationId = input.ConversationId,
             MessageId = input.Message.MessageId,
             Name = input.Name,
+            AgentId = input.AgentId,
             Role = input.Message.Role,
             Content = input.Log,
             Source = input.Source,
             CreateTime = DateTime.UtcNow
         };
 
-        var json = JsonSerializer.Serialize(log, _serializerOptions);
+        var json = JsonSerializer.Serialize(output, _serializerOptions);
 
         var convSettings = _services.GetRequiredService<ConversationSetting>();
         if (convSettings.EnableContentLog)
         {
             var db = _services.GetRequiredService<IBotSharpRepository>();
-            db.SaveConversationContentLog(log);
+            db.SaveConversationContentLog(output);
         }
 
         return json;
@@ -283,25 +284,4 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
 
         return JsonSerializer.Serialize(log, _serializerOptions);
     }
-}
-
-internal class ContentLogInput
-{
-    public string ConversationId { get; set; }
-    public string? Name { get; set; }
-    public string? AgentId { get; set; }
-    public string Log { get; set; }
-    public string Source { get; set; }
-    public RoleDialogModel Message { get; set; }
-
-    public ContentLogInput()
-    {
-        
-    }
-
-    public ContentLogInput(string conversationId, RoleDialogModel message)
-    {
-        ConversationId = conversationId;
-        Message = message;
-    }
 }

src/Plugins/BotSharp.Plugin.MongoStorage/Collections/ConversationContentLogDocument.cs

@@ -5,6 +5,7 @@ public class ConversationContentLogDocument : MongoBase
     public string ConversationId { get; set; }
     public string MessageId { get; set; }
     public string? Name { get; set; }
+    public string? AgentId { get; set; }
     public string Role { get; set; }
     public string Source { get; set; }
     public string Content { get; set; }

src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Log.cs

@@ -60,7 +60,7 @@ public partial class MongoRepository
     #endregion
 
     #region Conversation Content Log
-    public void SaveConversationContentLog(ConversationContentLogModel log)
+    public void SaveConversationContentLog(ContentLogOutputModel log)
     {
         if (log == null) return;
 
@@ -72,6 +72,7 @@ public partial class MongoRepository
             ConversationId = conversationId,
             MessageId = messageId,
             Name = log.Name,
+            AgentId = log.AgentId,
             Role = log.Role,
             Source = log.Source,
             Content = log.Content,
@@ -81,16 +82,17 @@ public partial class MongoRepository
         _dc.ContentLogs.InsertOne(logDoc);
     }
 
-    public List<ConversationContentLogModel> GetConversationContentLogs(string conversationId)
+    public List<ContentLogOutputModel> GetConversationContentLogs(string conversationId)
     {
         var logs = _dc.ContentLogs
                       .AsQueryable()
                       .Where(x => x.ConversationId == conversationId)
-                      .Select(x => new ConversationContentLogModel
+                      .Select(x => new ContentLogOutputModel
                       {
                           ConversationId = x.ConversationId,
                           MessageId = x.MessageId,
                           Name = x.Name,
+                          AgentId = x.AgentId,
                           Role = x.Role,
                           Source = x.Source,
                           Content = x.Content,