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

Merge pull request #202 from hchen2020/master

Browse source 
Fix rich content text in InstructExecutor.
This commit is contained in:
Haiping 2023-11-08 16:50:53 -06:00 committed by GitHub
parent c20cdd13e5 5add9eefb7
commit cbd76c4e8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 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

@ -101,6 +101,14 @@ public partial class ConversationService
_logger.LogInformation(text); _logger.LogInformation(text);
#endif #endif
// Process rich content
if (response.RichContent != null &&
response.RichContent is RichContent<IMessageTemplate> template &&
string.IsNullOrEmpty(template.Message.Text))
{
template.Message.Text = response.Content;
}
// Only read content from RichContent for UI rendering. When richContent is null, create a basic text message for richContent. // Only read content from RichContent for UI rendering. When richContent is null, create a basic text message for richContent.
var state = _services.GetRequiredService<IConversationStateService>(); var state = _services.GetRequiredService<IConversationStateService>();
response.RichContent = response.RichContent ?? new RichContent<IMessageTemplate> response.RichContent = response.RichContent ?? new RichContent<IMessageTemplate>

10
src/Infrastructure/BotSharp.Core/Planning/InstructExecutor.cs
View file

@ -1,6 +1,4 @@
using BotSharp.Abstraction.Functions.Models; using BotSharp.Abstraction.Functions.Models;
using BotSharp.Abstraction.Messaging.Models;
using BotSharp.Abstraction.Messaging.Models.RichContent;
using BotSharp.Abstraction.Planning; using BotSharp.Abstraction.Planning;
using BotSharp.Abstraction.Routing; using BotSharp.Abstraction.Routing;
@ -35,14 +33,6 @@ public class InstructExecutor : IExecutor
response.MessageId = message.MessageId; response.MessageId = message.MessageId;
response.Instruction = inst; response.Instruction = inst;
// Process rich content
if (response.RichContent != null &&
response.RichContent is RichContent<IMessageTemplate> template &&
string.IsNullOrEmpty(template.Message.Text))
{
template.Message.Text = response.Content;
}
return response; return response;
} }
} }