Merge branch 'master' into v0.18-llm-planning

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/BotSharp.Abstraction.csproj

@@ -31,8 +31,4 @@
     <PackageReference Include="System.Text.Json" Version="7.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Messaging\Models\" />
-  </ItemGroup>
-
 </Project>

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStateService.cs

@@ -5,6 +5,7 @@ namespace BotSharp.Abstraction.Conversations;
 /// </summary>
 public interface IConversationStateService
 {
+    string GetConversationId();
     ConversationState Load(string conversationId);
     string GetState(string name, string defaultValue = "");
     bool ContainsState(string name);

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs

@@ -32,6 +32,8 @@ public class RoleDialogModel : ITrackableMessage
     /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public object Data { get; set; }
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public object? RichContent { get; set; }
 
     /// <summary>
     /// Stop conversation completion

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyElement.cs

@@ -0,0 +1,15 @@
+
+namespace BotSharp.Abstraction.Messaging.Models.RichContent
+{
+    public class QuickReplyElement
+    {
+        [JsonPropertyName("content_type")]
+        public string ContentType { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
+        public string? Payload { get; set; }
+        [JsonPropertyName("image_url")]
+        public string? ImageUrl { get; set; }
+        [JsonPropertyName("postback_url")]
+        public string? PostBackUrl { get; set; }
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyMessage.cs

@@ -0,0 +1,9 @@
+
+namespace BotSharp.Abstraction.Messaging.Models.RichContent
+{
+    public class QuickReplyMessage : TextMessage
+    {
+        [JsonPropertyName("quick_replies")]
+        public List<QuickReplyElement> QuickReplies { get; set; } = new List<QuickReplyElement>();
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Recipient.cs

@@ -0,0 +1,8 @@
+
+namespace BotSharp.Abstraction.Messaging.Models.RichContent
+{
+    public class Recipient
+    {
+        public string Id { get; set; } = string.Empty;
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/RichContent.cs

@@ -0,0 +1,13 @@
+namespace BotSharp.Abstraction.Messaging.Models.RichContent
+{
+    public class RichContent<T>
+    {
+        public Recipient Recipient { get; set; } = new Recipient();
+        /// <summary>
+        /// RESPONSE
+        /// </summary>
+        [JsonPropertyName("messaging_type")]
+        public string MessagingType => "RESPONSE";
+        public T Message { get; set; }
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/SenderActionMessage.cs

@@ -0,0 +1,15 @@
+
+namespace BotSharp.Abstraction.Messaging.Models.RichContent
+{
+    public class SenderActionMessage
+    {
+        /* 
+         * Requests to display sender action should only include the sender_action parameter and the recipient object.
+         * All other Send API properties, such as text and templates, should be sent in a separate request.
+        */
+        public Recipient Recipient { get; set; } = new Recipient();
+
+        [JsonPropertyName("sender_action")]
+        public string SenderAction { get; set; } = string.Empty;
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/AttachmentTemplate.cs

@@ -0,0 +1,9 @@
+
+namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
+{
+    public class AttachmentTemplate<T>
+    {
+        public string Type => "template";
+        public T Payload { get; set; }
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplate.cs

@@ -0,0 +1,17 @@
+
+namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
+{
+    public class ButtonTemplate : TextMessage
+    {
+        [JsonPropertyName("template_type")]
+        public string TemplateType => "button"; 
+        public List<ButtonElement> Buttons { get; set; } = new List<ButtonElement>();
+    }
+
+    public class ButtonElement
+    {
+        public string Type { get; set; } = string.Empty;
+        public string? Url { get; set; }
+        public string Title { get; set; } = string.Empty;
+    }
+}