Merge pull request #1234 from iceljc/master

add stringfy data

Author: iceljc

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

@@ -2,7 +2,56 @@
 
 namespace BotSharp.Abstraction.Loggers.Models;
 
-public class InstructionLogModel
+public class InstructionLogModel : InstructionLogBaseModel
+{
+    public Dictionary<string, string> States { get; set; } = [];
+
+    public static InstructionLogModel From(InstructionFileLogModel log)
+    {
+        return new InstructionLogModel
+        {
+            Id = log.Id,
+            AgentId = log.AgentId,
+            AgentName = log.AgentName,
+            Provider = log.Provider,
+            Model = log.Model,
+            TemplateName = log.TemplateName,
+            UserMessage = log.UserMessage,
+            SystemInstruction = log.SystemInstruction,
+            CompletionText = log.CompletionText,
+            UserId = log.UserId,
+            UserName = log.UserName,
+            CreatedTime = log.CreatedTime
+        };
+    }
+}
+
+public class InstructionFileLogModel : InstructionLogBaseModel
+{
+    [JsonPropertyName("states")]
+    public Dictionary<string, JsonDocument> States { get; set; } = [];
+
+    public static InstructionFileLogModel From(InstructionLogModel log)
+    {
+        return new InstructionFileLogModel
+        {
+            Id = log.Id,
+            AgentId = log.AgentId,
+            AgentName = log.AgentName,
+            Provider = log.Provider,
+            Model = log.Model,
+            TemplateName = log.TemplateName,
+            UserMessage = log.UserMessage,
+            SystemInstruction = log.SystemInstruction,
+            CompletionText = log.CompletionText,
+            UserId = log.UserId,
+            UserName = log.UserName,
+            CreatedTime = log.CreatedTime
+        }; 
+    }
+}
+
+public class InstructionLogBaseModel
 {
     [JsonPropertyName("id")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -43,12 +92,6 @@ public class InstructionLogModel
     [JsonIgnore]
     public string? UserName { get; set; }
 
-    [JsonIgnore]
-    public Dictionary<string, string> States { get; set; } = [];
-
-    [JsonPropertyName("states")]
-    public Dictionary<string, JsonDocument> InnerStates { get; set; } = [];
-
     [JsonPropertyName("created_time")]
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
 }

src/Infrastructure/BotSharp.Abstraction/Repositories/Models/UpdateInstructionLogStatesModel.cs

@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace BotSharp.Abstraction.Repositories.Models;
 
-namespace BotSharp.Abstraction.Repositories.Models
+public class UpdateInstructionLogStatesModel
 {
-    public class UpdateInstructionLogStatesModel
-    {
-        public string LogId { get; set; }
-        public string StateKeyPrefix { get; set; } = "new_";
-        public Dictionary<string, string> States { get; set; }
-    }
+    public string LogId { get; set; } = default!;
+    public string StateKeyPrefix { get; set; } = "new_";
+    public Dictionary<string, string> States { get; set; } = [];
 }