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

Merge branch 'master' into lida_Dev

Browse source
This commit is contained in:
AnonymousDotNet 2024-10-23 16:14:45 +08:00
parent 33945d41ee 644429940b
commit 054d64a48f
5 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
View file

@ -40,10 +40,10 @@ public partial class ConversationService
routing.Context.Push(agent.Id, reason: "request started");
// Save payload in order to assign the payload before hook is invoked
// if (replyMessage != null && !string.IsNullOrEmpty(replyMessage.Payload))
// {
// message.Payload = replyMessage.Payload;
// }
if (replyMessage != null && !string.IsNullOrEmpty(replyMessage.Payload))
{
message.Payload = replyMessage.Payload;
}
// Before chat completion hook
hooks = ReOrderConversationHooks(hooks);

10
src/Infrastructure/BotSharp.Core/Routing/RoutingService.GetConversationContent.cs
View file

@ -16,7 +16,15 @@ public partial class RoutingService
role = agent.Name;
}
conversation += $"{role}: {dialog.Payload ?? dialog.Content}\r\n";
if (role == AgentRole.User)
{
conversation += $"{role}: {dialog.Payload ?? dialog.Content}\r\n";
}
else
{
// Assistant reply doesn't need help with payload
conversation += $"{role}: {dialog.Content}\r\n";
}
}
return conversation;

3
src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeFunction.cs
View file

@ -53,7 +53,8 @@ public partial class RoutingService
message.PostbackFunctionName = clonedMessage.PostbackFunctionName;
message.CurrentAgentId = clonedMessage.CurrentAgentId;
message.Content = clonedMessage.Content;
message.Payload = clonedMessage.Payload;
// Don't copy payload
// message.Payload = clonedMessage.Payload;
message.StopCompletion = clonedMessage.StopCompletion;
message.RichContent = clonedMessage.RichContent;
message.Data = clonedMessage.Data;

2
src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
View file

@ -312,7 +312,7 @@ public class ChatCompletionProvider : IChatCompletion
}
else if (message.Role == AgentRole.Assistant)
{
messages.Add(new AssistantChatMessage(message.Payload ?? message.Content));
messages.Add(new AssistantChatMessage(message.Content));
}
}

2
src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
View file

@ -290,7 +290,7 @@ public class ChatCompletionProvider : IChatCompletion
}
else if (message.Role == AgentRole.Assistant)
{
messages.Add(new AssistantChatMessage(message.Payload ?? message.Content));
messages.Add(new AssistantChatMessage(message.Content));
}
}