Skip to content

revert #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 4, 2025
Merged

revert #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Infrastructure/BotSharp.Core/Routing/RoutingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public async Task<RoleDialogModel> InstructDirect(Agent agent, RoleDialogModel m
storage.Append(conv.ConversationId, message);

var dialogs = conv.GetDialogHistory();
Context.SetDialogs(dialogs);
handler.SetDialogs(dialogs);

var inst = new FunctionCallFromLlm
Expand Down
11 changes: 8 additions & 3 deletions src/Plugins/BotSharp.Plugin.FileHandler/Functions/ReadImageFn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ public async Task<bool> Execute(RoleDialogModel message)
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,
Expand All @@ -41,6 +39,13 @@ public async Task<bool> Execute(RoleDialogModel message)
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;
Expand Down Expand Up @@ -76,7 +81,7 @@ private List<RoleDialogModel> AssembleFiles(string conversationId, IEnumerable<s

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))
Expand Down