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

Fix rich content bug.

Browse source
This commit is contained in:
Haiping Chen 2023-11-26 11:53:44 -06:00
parent 80e157ae06
commit 2dc6376a89
6 changed files with 72 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -29,6 +29,7 @@ It's written in C# running on .Net Core that is full cross-platform framework, t
* Build, test, evaluate and audit your LLM agent in one place.
* Support different open source UI [Chatbot UI](src/Plugins/BotSharp.Plugin.ChatbotUI/Chatbot-UI.md), [HuggingChat UI](src/Plugins/BotSharp.Plugin.HuggingFace/HuggingChat-UI.md).
* Abstract standard Rich Content data structure. Integrate with popular message channels like Facebook Messenger, Slack and Telegram.
* Provide RESTful Open API and WebSocket real-time communication.
### Quick Started
1. Run backend service
@ -61,7 +62,7 @@ The core module is mainly composed of abstraction and framework function impleme
BotSharp uses component design, the kernel is kept to a minimum, and business functions are implemented by external components. The modular design also allows contributors to better participate. Below are the bulit-in plugins:
#### Data Storages
- BotSharp.Plugin.FileRepository
- BotSharp.Core.Repository
- BotSharp.Plugin.MongoStorage
#### LLMs

14
src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplateMessage.cs
View file

@ -1,5 +1,8 @@
namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
{
/// <summary>
/// https://developers.facebook.com/docs/messenger-platform/send-messages/buttons
/// </summary>
public class ButtonTemplateMessage : IRichMessage
{
public string Text { get; set; } = string.Empty;
@ -11,8 +14,17 @@ namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
public class ButtonElement
{
public string Type { get; set; } = string.Empty;
/// <summary>
/// web_url, postback, phone_number
/// </summary>
public string Type { get; set; } = "web_url";
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? Url { get; set; }
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? Payload { get; set; }
public string Title { get; set; } = string.Empty;
}
}

10
src/Plugins/BotSharp.Plugin.MetaMessenger/Controllers/WebhookController.cs
View file

@ -57,7 +57,15 @@ public class WebhookController : ControllerBase
if (req.Entry[0].Messaging[0].Message != null)
{
senderId = req.Entry[0].Messaging[0].Sender.Id;
message = req.Entry[0].Messaging[0].Message.Text;
if (req.Entry[0].Messaging[0].Message.QuickReply != null)
{
message = req.Entry[0].Messaging[0].Message.QuickReply.Payload;
}
else
{
message = req.Entry[0].Messaging[0].Message.Text;
}
}
else if (req.Entry[0].Messaging[0].Postback != null)
{

75
src/Plugins/BotSharp.Plugin.MetaMessenger/Services/MessageHandleService.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Messaging.Models.RichContent;
using BotSharp.Abstraction.Utilities;
namespace BotSharp.Plugin.MetaMessenger.Services;
@ -53,35 +54,49 @@ public class MessageHandleService
var replies = new List<IRichMessage>();
var result = await conv.SendMessage(agentId, new RoleDialogModel("user", message), async msg =>
{
if (!string.IsNullOrEmpty(msg.Content))
if (msg.RichContent != null)
{
// Official API doesn't support to show extra content above the products
if (!string.IsNullOrEmpty(msg.RichContent.Message.Text) &&
// avoid duplicated text
msg.RichContent.Message is not QuickReplyMessage)
{
replies.Add(new TextMessage(msg.RichContent.Message.Text));
}
if (msg.RichContent.Message is GenericTemplateMessage genericTemplate)
{
replies.Add(new AttachmentMessage
{
Attachment = new AttachmentBody
{
Payload = genericTemplate
}
});
}
else if (msg.RichContent.Message is CouponTemplateMessage couponTemplate)
{
replies.Add(new AttachmentMessage
{
Attachment = new AttachmentBody
{
Payload = couponTemplate
}
});
}
else if (msg.RichContent.Message is QuickReplyMessage quickReplyMessage)
{
replies.Add(quickReplyMessage);
}
else
{
replies.Add(msg.RichContent.Message);
}
}
else
{
replies.Add(new TextMessage(msg.Content));
}
if (msg.RichContent.Message is GenericTemplateMessage genericTemplate)
{
replies.Add(new AttachmentMessage
{
Attachment = new AttachmentBody
{
Payload = genericTemplate
}
});
}
else if (msg.RichContent.Message is CouponTemplateMessage couponTemplate)
{
replies.Add(new AttachmentMessage
{
Attachment = new AttachmentBody
{
Payload = couponTemplate
}
});
}
else if (msg.RichContent.Message is not TextMessage)
{
replies.Add(msg.RichContent.Message);
}
},
_ => Task.CompletedTask,
_ => Task.CompletedTask);
@ -90,10 +105,10 @@ public class MessageHandleService
foreach(var reply in replies)
{
await messenger.SendMessage(setting.ApiVersion, setting.PageId,
new SendingMessageRequest(setting.PageAccessToken, recipient)
{
Message = JsonSerializer.Serialize(reply, _serializerOptions)
});
new SendingMessageRequest(setting.PageAccessToken, recipient)
{
Message = JsonSerializer.Serialize(reply, _serializerOptions)
});
Thread.Sleep(500);
}

2
src/Plugins/BotSharp.Plugin.MetaMessenger/WebhookModels/WebhookMessageBody.cs
View file

@ -12,5 +12,5 @@ public class WebhookMessageBody
[JsonPropertyName("quick_reply")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public QuickReplyMessage QuickReply { get;set; }
public WebhookMessagePostback QuickReply { get;set; }
}

2
src/Plugins/BotSharp.Plugin.MetaMessenger/WebhookModels/WebhookMessagePostback.cs
View file

@ -2,7 +2,9 @@ namespace BotSharp.Plugin.MetaMessenger.WebhookModels;
public class WebhookMessagePostback
{
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string Title { get; set; }
public string Payload { get; set; }
[JsonPropertyName("mid")]