refine content log input

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/ConversationContentLogModel.cs → 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);
-    List<ConversationContentLogModel> GetConversationContentLogs(string conversationId);
+    void SaveConversationContentLog(ContentLogOutputModel log);
+    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 void SaveLlmCompletionLog(LlmCompletionLog log)
     #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 @@ private bool HandleTruncatedLogs(string convDir, DateTime refTime)
                 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 @@ public void SaveLlmCompletionLog(LlmCompletionLog log)
         #endregion
 
         #region Conversation Content Log
-        public void SaveConversationContentLog(ConversationContentLogModel log)
+        public void SaveConversationContentLog(ContentLogOutputModel log)
         {
             if (log == null) return;
 
@@ -88,9 +88,9 @@ public void SaveConversationContentLog(ConversationContentLogModel log)
             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 @@ public List<ConversationContentLogModel> GetConversationContentLogs(string conve
             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 async Task<IActionResult> GetFullLog()
     }
 
     [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);