Merge pull request #1191 from yileicn/master

instruct log optimize

src/Infrastructure/BotSharp.Abstraction/Instructs/Models/InstructResponseModel.cs

@@ -9,4 +9,5 @@ public class InstructResponseModel
     public string UserMessage { get; set; } = default!;
     public string? SystemInstruction { get; set; }
     public string CompletionText { get; set; } = default!;
+    public string LogId { get; set; } = default!;
 }

src/Infrastructure/BotSharp.Abstraction/Instructs/Models/InstructResult.cs

@@ -10,4 +10,7 @@ public class InstructResult : ITrackableMessage
     [JsonPropertyName("template")]
     public string? Template { get; set; }
     public Dictionary<string, string>? States { get; set; } = new();
+
+    [JsonPropertyName("log_id")]
+    public string LogId { get; set; } = default!;
 }

src/Infrastructure/BotSharp.Abstraction/Loggers/Services/ILoggerService.cs

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Loggers.Models;
 using BotSharp.Abstraction.Repositories.Filters;
+using BotSharp.Abstraction.Repositories.Models;
 
 namespace BotSharp.Abstraction.Loggers.Services;
 
@@ -13,5 +14,6 @@ public interface ILoggerService
     #region Instruction
     Task<PagedItems<InstructionLogModel>> GetInstructionLogs(InstructLogFilter filter);
     Task<List<string>> GetInstructionLogSearchKeys(InstructLogKeysFilter filter);
+    Task<bool> UpdateInstructionLogStates(UpdateInstructionLogStatesModel request);
     #endregion
 }

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

@@ -197,6 +197,9 @@ public interface IBotSharpRepository : IHaveServiceProvider
 
     List<string> GetInstructionLogSearchKeys(InstructLogKeysFilter filter)
          => throw new NotImplementedException();
+
+    Task<bool> UpdateInstructionLogStates(UpdateInstructionLogStatesModel updateInstructionStates)
+        => throw new NotImplementedException();
     #endregion
 
     #region Statistics

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

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

src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs

@@ -133,12 +133,14 @@ public partial class InstructService
             response.Text = result;
         }
 
+        response.LogId = Guid.NewGuid().ToString();
         // After completion hooks
         foreach (var hook in hooks)
         {
             await hook.AfterCompletion(agent, response);
             await hook.OnResponseGenerated(new InstructResponseModel
             {
+                LogId = response.LogId,
                 AgentId = agentId,
                 Provider = provider,
                 Model = model,

src/Infrastructure/BotSharp.Core/Loggers/Services/LoggerService.Instruction.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Loggers.Models;
+using BotSharp.Abstraction.Repositories.Models;
 using BotSharp.Abstraction.Users.Models;
 
 namespace BotSharp.Core.Loggers.Services;
@@ -77,4 +78,13 @@ public partial class LoggerService
         keys = filter.PreLoad ? keys : keys.Where(x => x.Contains(filter.Query ?? string.Empty, StringComparison.OrdinalIgnoreCase)).ToList();
         return keys.OrderBy(x => x).Take(filter.KeyLimit).ToList();
     }
+
+    public async Task<bool> UpdateInstructionLogStates(UpdateInstructionLogStatesModel request)
+    {
+        if(request == null) return false;
+        if (string.IsNullOrEmpty(request.LogId) || request.States.IsNullOrEmpty()) return false;
+        
+        var db = _services.GetRequiredService<IBotSharpRepository>();
+        return await db.UpdateInstructionLogStates(request);
+    }
 }

src/Infrastructure/BotSharp.Logger/Hooks/InstructionLogHook.cs

@@ -48,6 +48,7 @@ public class InstructionLogHook : InstructHookBase
         {
             new InstructionLogModel
             {
+                Id = response.LogId,
                 AgentId = response.AgentId,
                 Provider = response.Provider,
                 Model = response.Model,

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

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Loggers.Models;
 using BotSharp.Abstraction.Loggers.Services;
+using BotSharp.Abstraction.Repositories.Models;
 using BotSharp.OpenAPI.ViewModels.Instructs;
 using Microsoft.AspNetCore.Hosting;
 
@@ -76,5 +77,13 @@ public class LoggerController : ControllerBase
         var keys = await logging.GetInstructionLogSearchKeys(request);
         return keys;
     }
+
+    [HttpPost("/logger/instruction/log/{logId}/states")]
+    public async Task<bool> UpdateInstructionLogStates([FromRoute] string logId, UpdateInstructionLogStatesModel request)
+    {
+        request.LogId = logId;
+        var logging = _services.GetRequiredService<ILoggerService>();
+        return await logging.UpdateInstructionLogStates(request);
+    }
     #endregion
 }

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

@@ -19,6 +19,7 @@ public class InstructionLogDocument : MongoBase
     {
         return new InstructionLogDocument
         {
+            Id = log.Id,
             AgentId = log.AgentId,
             Provider = log.Provider,
             Model = log.Model,

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

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Loggers.Models;
 using BotSharp.Abstraction.Repositories.Filters;
+using BotSharp.Abstraction.Repositories.Models;
 using MongoDB.Driver;
 using System.Text.Json;
 
@@ -169,6 +170,33 @@ public partial class MongoRepository
         return true;
     }
 
+    public async Task<bool> UpdateInstructionLogStates(UpdateInstructionLogStatesModel updateInstructionStates)
+    {
+        var id = updateInstructionStates.LogId;
+
+        var logDoc = await _dc.InstructionLogs.Find(p => p.Id == id).FirstOrDefaultAsync();
+        if (logDoc == null) return false;
+
+        foreach (var pair in updateInstructionStates.States)
+        {
+            var key = updateInstructionStates.StateKeyPrefix + pair.Key;
+            try
+            {
+                var jsonStr = JsonSerializer.Serialize(new { Data = JsonDocument.Parse(pair.Value) }, _botSharpOptions.JsonSerializerOptions);
+                var json = BsonDocument.Parse(jsonStr);
+                logDoc.States[key] = json;
+            }
+            catch
+            {
+                var jsonStr = JsonSerializer.Serialize(new { Data = pair.Value }, _botSharpOptions.JsonSerializerOptions);
+                var json = BsonDocument.Parse(jsonStr);
+                logDoc.States[key] = json;
+            }
+        }
+        await _dc.InstructionLogs.ReplaceOneAsync(p => p.Id == id, logDoc);
+        return true;
+    }
+
     public async ValueTask<PagedItems<InstructionLogModel>> GetInstructionLogs(InstructLogFilter filter)
     {
         if (filter == null)