From e43b3e6fa1b91ab468a06e18a68e1979c342a109 Mon Sep 17 00:00:00 2001 From: Yanan Wang <103942@smsassist.com> Date: Fri, 27 Oct 2023 17:16:53 -0500 Subject: [PATCH] Add RichContent field and PostBackUrl for QuickReplies --- .../Messaging/Models/RichContent/QuickReplyElement.cs | 1 + .../BotSharp.OpenAPI/Controllers/ConversationController.cs | 7 ++++--- .../ViewModels/Conversations/MessageResponseModel.cs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyElement.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyElement.cs index 15a07d23..cea110f1 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyElement.cs +++ b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyElement.cs @@ -9,5 +9,6 @@ namespace BotSharp.Abstraction.Messaging.Models.RichContent public string? Payload { get; set; } [JsonPropertyName("image_url")] public string? ImageUrl { get; set; } + public string? PostBackUrl { get; set; } } } diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs index 5fb5cd7c..80692bc9 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs @@ -12,7 +12,7 @@ public class ConversationController : ControllerBase, IApiAdapter private readonly IServiceProvider _services; private readonly IUserIdentity _user; - public ConversationController(IServiceProvider services, + public ConversationController(IServiceProvider services, IUserIdentity user) { _services = services; @@ -40,8 +40,8 @@ public class ConversationController : ControllerBase, IApiAdapter } [HttpPost("/conversation/{agentId}/{conversationId}")] - public async Task SendMessage([FromRoute] string agentId, - [FromRoute] string conversationId, + public async Task SendMessage([FromRoute] string agentId, + [FromRoute] string conversationId, [FromBody] NewMessageModel input) { var conv = _services.GetRequiredService(); @@ -73,6 +73,7 @@ public class ConversationController : ControllerBase, IApiAdapter response.Data = inputMsg.Data; response.Function = inputMsg.FunctionName; response.Instruction = inputMsg.Instruction; + response.RichContent = inputMsg.RichContent; return response; } diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/MessageResponseModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/MessageResponseModel.cs index 4dcf0c58..4fe7781c 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/MessageResponseModel.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/MessageResponseModel.cs @@ -1,6 +1,5 @@ using BotSharp.Abstraction.Functions.Models; using BotSharp.Abstraction.Models; -using BotSharp.Abstraction.Routing.Models; namespace BotSharp.OpenAPI.ViewModels.Conversations; @@ -11,4 +10,5 @@ public class MessageResponseModel : ITrackableMessage public string Function { get; set; } public object Data { get; set; } public FunctionCallFromLlm Instruction { get; set; } + public object? RichContent { get; set; } }