SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #866 from iceljc/master

Browse source 
revert
This commit is contained in:
iceljc 2025-02-03 18:03:17 -06:00 committed by GitHub
parent d95dc0511a 00fc065233
commit c951131cba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Infrastructure/BotSharp.Core/Routing/RoutingService.cs
View file

@ -37,6 +37,7 @@ public partial class RoutingService : IRoutingService
storage.Append(conv.ConversationId, message);
var dialogs = conv.GetDialogHistory();
Context.SetDialogs(dialogs);
handler.SetDialogs(dialogs);
var inst = new FunctionCallFromLlm

11
src/Plugins/BotSharp.Plugin.FileHandler/Functions/ReadImageFn.cs
View file

@ -31,8 +31,6 @@ public class ReadImageFn : IFunctionCallback
fromAgent = await agentService.LoadAgent(message.CurrentAgentId);
}
var wholeDialogs = routingCtx.GetDialogs();
var dialogs = AssembleFiles(conv.ConversationId, args?.ImageUrls, wholeDialogs);
var agent = new Agent
{
Id = BuiltInAgentId.UtilityAssistant,
@ -41,6 +39,13 @@ public class ReadImageFn : IFunctionCallback
TemplateDict = new Dictionary<string, object>()
};
var wholeDialogs = routingCtx.GetDialogs();
if (wholeDialogs.IsNullOrEmpty())
{
wholeDialogs = conv.GetDialogHistory();
}
var dialogs = AssembleFiles(conv.ConversationId, args?.ImageUrls, wholeDialogs);
var response = await GetChatCompletion(agent, dialogs);
message.Content = response;
return true;
@ -76,7 +81,7 @@ public class ReadImageFn : IFunctionCallback
if (!imageUrls.IsNullOrEmpty())
{
var lastDialog = dialogs.Last();
var lastDialog = dialogs.LastOrDefault(x => x.Role == AgentRole.User) ?? dialogs.Last();
var files = lastDialog.Files ?? [];
var addnFiles = imageUrls.Select(x => x?.Trim())
.Where(x => !string.IsNullOrWhiteSpace(x))