Merge pull request #1326 from iceljc/features/integrate-response-api

Features/integrate response api

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Conversations/Dtos/ChatResponseDto.cs

@@ -46,6 +46,10 @@ public class ChatResponseDto : InstructResult
     [JsonPropertyName("is_streaming")]
     public bool IsStreaming { get; set; }
 
+    [JsonPropertyName("thought")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public Dictionary<string, string?>? Thought { get; set; }
+
     [JsonPropertyName("meta_data")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public Dictionary<string, string?>? MetaData { get; set; }

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs

@@ -114,6 +114,10 @@ public class DialogMetaData
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? ToolCallId { get; set; }
 
+    [JsonPropertyName("thought")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public Dictionary<string, string?>? Thought { get; set; }
+
     [JsonPropertyName("meta_data")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public Dictionary<string, string?>? MetaData { get; set; }

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs

@@ -76,6 +76,9 @@ public class RoleDialogModel : ITrackableMessage
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? ToolCallId { get; set; }
 
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public Dictionary<string, string?>? Thought { get; set; }
+
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public Dictionary<string, string?>? MetaData { get; set; }
 
@@ -141,7 +144,6 @@ public class RoleDialogModel : ITrackableMessage
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public bool IsStreaming { get; set; }
 
-
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public bool IsFromUser => Role == AgentRole.User;
 
@@ -210,6 +212,7 @@ public static RoleDialogModel From(RoleDialogModel source,
             Data = source.Data,
             IsStreaming = source.IsStreaming,
             Annotations = source.Annotations,
+            Thought = source.Thought != null ? new(source.Thought) : null,
             MetaData = source.MetaData != null ? new(source.MetaData) : null
         };
     }

src/Infrastructure/BotSharp.Abstraction/MLTasks/Settings/LlmModelSetting.cs

@@ -99,7 +99,10 @@ public class ReasoningSetting
 public class WebSearchSetting
 {
     public bool IsDefault { get; set; }
+
+    [Obsolete("Set SearchContextSize in Parameters")]
     public string? SearchContextSize { get; set; }
+    public Dictionary<string, ModelParamSetting>? Parameters { get; set; }
 }
 #endregion
 

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs

@@ -82,6 +82,7 @@ public async Task<List<RoleDialogModel>> GetDialogs(string conversationId, Conve
                 ToolCallId = meta?.ToolCallId,
                 FunctionName = meta?.FunctionName,
                 FunctionArgs = meta?.FunctionArgs,
+                Thought = meta?.Thought,
                 MetaData = meta?.MetaData,
                 RichContent = richContent,
                 SecondaryContent = secondaryContent,
@@ -121,6 +122,7 @@ public async Task<List<RoleDialogModel>> GetDialogs(string conversationId, Conve
                 ToolCallId = dialog.ToolCallId,
                 FunctionName = dialog.FunctionName,
                 FunctionArgs = dialog.FunctionArgs,
+                Thought = dialog.Thought,
                 MetaData = dialog.MetaData,
                 CreatedTime = dialog.CreatedAt
             };
@@ -149,6 +151,7 @@ public async Task<List<RoleDialogModel>> GetDialogs(string conversationId, Conve
                 MessageLabel = dialog.MessageLabel,
                 SenderId = dialog.SenderId,
                 FunctionName = dialog.FunctionName,
+                Thought = dialog.Thought,
                 MetaData = dialog.MetaData,
                 CreatedTime = dialog.CreatedAt
             };

src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeAgent.cs

@@ -55,6 +55,7 @@ public async Task<bool> InvokeAgent(
             message.ToolCallId = response.ToolCallId;
             message.FunctionName = response.FunctionName;
             message.FunctionArgs = response.FunctionArgs;
+            message.Thought = response.Thought != null ? new(response.Thought) : null;
             message.MetaData = response.MetaData != null ? new(response.MetaData) : null;
             message.Indication = response.Indication;
             message.CurrentAgentId = agent.Id;
@@ -74,6 +75,7 @@ public async Task<bool> InvokeAgent(
 
             message = RoleDialogModel.From(message, role: AgentRole.Assistant, content: response.Content);
             message.CurrentAgentId = agent.Id;
+            message.Thought = response.Thought != null ? new(response.Thought) : null;
             message.MetaData = response.MetaData != null ? new(response.MetaData) : null;
             message.IsStreaming = response.IsStreaming;
             message.MessageLabel = response.MessageLabel;

src/Infrastructure/BotSharp.OpenAPI/Controllers/Conversation/ConversationController.cs

@@ -131,6 +131,7 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs(
                     Data = message.Data,
                     Sender = UserDto.FromUser(user),
                     Payload = message.Payload,
+                    Thought = message.Thought,
                     MetaData = message.MetaData,
                     HasMessageFiles = files.Any(x => x.MessageId.IsEqualTo(message.MessageId) && x.FileSource == FileSource.User)
                 });
@@ -147,6 +148,7 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs(
                     Text = !string.IsNullOrEmpty(message.SecondaryContent) ? message.SecondaryContent : message.Content,
                     Function = message.FunctionName,
                     Data = message.Data,
+                    Thought = message.Thought,
                     MetaData = message.MetaData,
                     Sender = new()
                     {
@@ -419,6 +421,8 @@ await conv.SendMessage(agentId, inputMsg,
                     response.RichContent = msg.SecondaryRichContent ?? msg.RichContent;
                     response.Instruction = msg.Instruction;
                     response.Data = msg.Data;
+                    response.Thought = msg.Thought;
+                    response.MetaData = msg.MetaData;
                 });
         }
         catch (OperationCanceledException) when (input.IsStreamingMessage)
@@ -485,6 +489,8 @@ await conv.SendMessage(agentId, inputMsg,
                     response.RichContent = msg.SecondaryRichContent ?? msg.RichContent;
                     response.Instruction = msg.Instruction;
                     response.Data = msg.Data;
+                    response.Thought = msg.Thought;
+                    response.MetaData = msg.MetaData;
                     response.States = state.GetStates();
 
                     await OnChunkReceived(Response, response);

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

@@ -112,6 +112,7 @@ public override async Task OnResponseGenerated(RoleDialogModel message)
             Function = message.FunctionName,
             RichContent = message.SecondaryRichContent ?? message.RichContent,
             Data = message.Data,
+            Thought = message.Thought,
             MetaData = message.MetaData,
             States = state.GetStates(),
             IsStreaming = message.IsStreaming,

src/Plugins/BotSharp.Plugin.ChatHub/Observers/ChatHubObserver.cs

@@ -80,6 +80,7 @@ public override void OnNext(HubObserveData<RoleDialogModel> value)
                     Function = message.FunctionName,
                     RichContent = message.SecondaryRichContent ?? message.RichContent,
                     Data = message.Data,
+                    Thought = message.Thought,
                     MetaData = message.MetaData,
                     Sender = new()
                     {

src/Plugins/BotSharp.Plugin.FileHandler/Functions/ReadPdfFn.cs

@@ -108,7 +108,9 @@ private async Task<List<RoleDialogModel>> AssembleFiles(string conversationId, L
             {
                 ContentType = x.ContentType,
                 FileUrl = x.FileUrl,
-                FileStorageUrl = x.FileStorageUrl
+                FileStorageUrl = x.FileStorageUrl,
+                FileName = x.FileName,
+                FileExtension = x.FileExtension
             }).ToList();
         }