Merge pull request #415 from iceljc/features/add-secondary-language

Oceania2018 · web-flow · commit a1adcdd9e8f1 · 2024-04-18T18:25:11.000-05:00
Features/add secondary language
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs
@@ -34,23 +34,28 @@ public class DialogElement
 {
     public DialogMetaData MetaData { get; set; }
     public string Content { get; set; }
+    public string? SecondaryContent { get; set; }
     public string? RichContent { get; set; }
+    public string? SecondaryRichContent { get; set; }
 
     public DialogElement()
     {
 
     }
 
-    public DialogElement(DialogMetaData meta, string content, string? richContent = null)
+    public DialogElement(DialogMetaData meta, string content, string? richContent = null,
+        string? secondaryContent = null, string? secondaryRichContent = null)
     {
         MetaData = meta;
         Content = content;
         RichContent = richContent;
+        SecondaryContent = secondaryContent;
+        SecondaryRichContent = secondaryRichContent;
     }
 
     public override string ToString()
     {
-        return $"{MetaData.Role}: {Content} [{MetaData.CreateTime}]";
+        return $"{MetaData.Role}: {Content} [{MetaData?.CreateTime}]";
     }
 }
 
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs
@@ -26,6 +26,8 @@ public class RoleDialogModel : ITrackableMessage
 
     public string Content { get; set; }
 
+    public string? SecondaryContent { get; set; }
+
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string CurrentAgentId { get; set; }
 
@@ -57,6 +59,9 @@ public class RoleDialogModel : ITrackableMessage
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public RichContent<IRichMessage>? RichContent { get; set; }
 
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public RichContent<IRichMessage>? SecondaryRichContent { get; set; }
+
     /// <summary>
     /// Stop conversation completion
     /// </summary>
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/IRichMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/IRichMessage.cs
@@ -1,12 +1,15 @@
 using BotSharp.Abstraction.Messaging.Enums;
+using Newtonsoft.Json;
 
 namespace BotSharp.Abstraction.Messaging;
 
 public interface IRichMessage
 {
     [JsonPropertyName("text")]
+    [JsonProperty("text")]
     string Text { get; set; }
 
     [JsonPropertyName("rich_type")]
+    [JsonProperty("rich_type")]
     string RichType => RichTypeEnum.Text;
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/ITemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/ITemplateMessage.cs
@@ -1,7 +1,10 @@
+using Newtonsoft.Json;
+
 namespace BotSharp.Abstraction.Messaging;
 
 public interface ITemplateMessage
 {
     [JsonPropertyName("template_type")]
+    [JsonProperty("template_type")]
     string TemplateType => string.Empty;
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/ElementAction.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/ElementAction.cs
@@ -1,3 +1,6 @@
+using Newtonsoft.Json;
+using JsonIgnoreAttribute = System.Text.Json.Serialization.JsonIgnoreAttribute;
+
 namespace BotSharp.Abstraction.Messaging.Models.RichContent;
 
 public class ElementAction
@@ -8,6 +11,7 @@ public class ElementAction
     public string Url { get; set; }
 
     [JsonPropertyName("webview_height_ratio")]
+    [JsonProperty("webview_height_ratio")]
     public string WebViewHeightRatio { get; set; }
 
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/ElementButton.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/ElementButton.cs
@@ -1,3 +1,6 @@
+using Newtonsoft.Json;
+using JsonIgnoreAttribute = System.Text.Json.Serialization.JsonIgnoreAttribute;
+
 namespace BotSharp.Abstraction.Messaging.Models.RichContent;
 
 /// <summary>
@@ -16,11 +19,14 @@ public class ElementButton
     public string Payload { get; set; }
 
     [JsonPropertyName("is_primary")]
+    [JsonProperty("is_primary")]
     public bool IsPrimary { get; set; }
 
     [JsonPropertyName("is_secondary")]
+    [JsonProperty("is_secondary")]
     public bool IsSecondary { get; set; }
 
     [JsonPropertyName("post_action_disclaimer")]
+    [JsonProperty("post_action_disclaimer")]
     public string? PostActionDisclaimer { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyElement.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyElement.cs
@@ -1,3 +1,6 @@
+using Newtonsoft.Json;
+using JsonIgnoreAttribute = System.Text.Json.Serialization.JsonIgnoreAttribute;
+
 namespace BotSharp.Abstraction.Messaging.Models.RichContent;
 
 public class QuickReplyElement
@@ -9,6 +12,7 @@ public class QuickReplyElement
     public string? Payload { get; set; }
 
     [JsonPropertyName("image_url")]
+    [JsonProperty("image_url")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? ImageUrl { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/QuickReplyMessage.cs
@@ -1,13 +1,16 @@
 using BotSharp.Abstraction.Messaging.Enums;
+using Newtonsoft.Json;
 
 namespace BotSharp.Abstraction.Messaging.Models.RichContent;
 
 public class QuickReplyMessage : IRichMessage
 {
     [JsonPropertyName("rich_type")]
+    [JsonProperty("rich_type")]
     public string RichType => RichTypeEnum.QuickReply;
     public string Text { get; set; } = string.Empty;
 
     [JsonPropertyName("quick_replies")]
+    [JsonProperty("quick_replies")]
     public List<QuickReplyElement> QuickReplies { get; set; } = new List<QuickReplyElement>();
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplateMessage.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Messaging.Enums;
+using Newtonsoft.Json;
 
 namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 
@@ -8,17 +9,22 @@ namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 public class ButtonTemplateMessage : IRichMessage, ITemplateMessage
 {
     [JsonPropertyName("rich_type")]
+    [JsonProperty("rich_type")]
     public string RichType => RichTypeEnum.ButtonTemplate;
 
     [JsonPropertyName("text")]
+    [JsonProperty("text")]
     public string Text { get; set; } = string.Empty;
 
     [JsonPropertyName("template_type")]
+    [JsonProperty("template_type")]
     public string TemplateType => TemplateTypeEnum.Button;
 
     [JsonPropertyName("buttons")]
+    [JsonProperty("buttons")]
     public ElementButton[] Buttons { get; set; } = new ElementButton[0];
 
     [JsonPropertyName("is_horizontal")]
+    [JsonProperty("is_horizontal")]
     public bool IsHorizontal { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/CouponTemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/CouponTemplateMessage.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Messaging.Enums;
+using Newtonsoft.Json;
 
 namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 
@@ -9,30 +10,40 @@ namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 public class CouponTemplateMessage : IRichMessage, ITemplateMessage
 {
     [JsonPropertyName("rich_type")]
+    [JsonProperty("rich_type")]
     public string RichType => RichTypeEnum.CouponTemplate;
+
     [JsonPropertyName("text")]
+    [JsonProperty("text")]
     public string Text { get; set; }
     public string Title { get; set; }
     public string Subtitle { get; set; }
 
     [JsonPropertyName("template_type")]
+    [JsonProperty("template_type")]
     public string TemplateType => TemplateTypeEnum.Coupon;
 
     [JsonPropertyName("coupon_code")]
+    [JsonProperty("coupon_code")]
     public string CouponCode { get; set; }
 
     [JsonPropertyName("coupon_url")]
+    [JsonProperty("coupon_url")]
     public string CouponUrl { get; set; }
 
     [JsonPropertyName("coupon_url_button_title")]
+    [JsonProperty("coupon_url_button_title")]
     public string CouponUrlButtonTitle { get; set; } = "Shop now";
 
     [JsonPropertyName("coupon_pre_message")]
+    [JsonProperty("coupon_pre_message")]
     public string CouponPreMessage { get; set; } = "Here's a deal just for you!";
 
     [JsonPropertyName("image_url")]
+    [JsonProperty("image_url")]
     public string ImageUrl { get; set; }
 
     [JsonPropertyName("payload")]
+    [JsonProperty("payload")]
     public string Payload { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/GenericTemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/GenericTemplateMessage.cs
@@ -1,38 +1,50 @@
 using BotSharp.Abstraction.Messaging.Enums;
+using Newtonsoft.Json;
 
 namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 
 public class GenericTemplateMessage<T> : IRichMessage, ITemplateMessage
 {
     [JsonPropertyName("rich_type")]
+    [JsonProperty("rich_type")]
     public string RichType => RichTypeEnum.GenericTemplate;
 
     [JsonPropertyName("text")]
+    [JsonProperty("text")]
     public string Text { get; set; } = string.Empty;
 
     [JsonPropertyName("template_type")]
+    [JsonProperty("template_type")]
     public virtual string TemplateType { get; set; } = TemplateTypeEnum.Generic;
 
     [JsonPropertyName("elements")]
+    [JsonProperty("elements")]
     public List<T> Elements { get; set; } = new List<T>();
 
     [JsonPropertyName("is_horizontal")]
+    [JsonProperty("is_horizontal")]
     public bool IsHorizontal { get; set; }
 
     [JsonPropertyName("is_popup")]
+    [JsonProperty("is_popup")]
     public bool IsPopup { get; set; }
 
     [JsonPropertyName("element_type")]
+    [JsonProperty("element_type")]
     public string ElementType => typeof(T).Name;
 }
 
 public class GenericElement
 {
     public string Title { get; set; }
     public string Subtitle { get; set; }
+
     [JsonPropertyName("image_url")]
+    [JsonProperty("image_url")]
     public string ImageUrl { get; set; }
+
     [JsonPropertyName("default_action")]
+    [JsonProperty("default_action")]
     public ElementAction DefaultAction { get; set; }
     public ElementButton[] Buttons { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/MultiSelectTemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/MultiSelectTemplateMessage.cs
@@ -1,21 +1,28 @@
 using BotSharp.Abstraction.Messaging.Enums;
+using Newtonsoft.Json;
 
 namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 
 public class MultiSelectTemplateMessage : IRichMessage, ITemplateMessage
 {
     [JsonPropertyName("rich_type")]
+    [JsonProperty("rich_type")]
     public string RichType => RichTypeEnum.MultiSelectTemplate;
+
     [JsonPropertyName("text")]
+    [JsonProperty("text")]
     public string Text { get; set; } = string.Empty;
 
     [JsonPropertyName("template_type")]
+    [JsonProperty("template_type")]
     public string TemplateType => TemplateTypeEnum.MultiSelect;
 
     [JsonPropertyName("options")]
+    [JsonProperty("options")]
     public List<OptionElement> Options { get; set; } = new List<OptionElement>();
 
     [JsonPropertyName("is_horizontal")]
+    [JsonProperty("is_horizontal")]
     public bool IsHorizontal { get; set; }
 }
 
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ProductTemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ProductTemplateMessage.cs
@@ -1,16 +1,20 @@
 using BotSharp.Abstraction.Messaging.Enums;
+using Newtonsoft.Json;
 
 namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 
 public class ProductTemplateMessage : IRichMessage, ITemplateMessage
 {
     [JsonPropertyName("rich_type")]
+    [JsonProperty("rich_type")]
     public string RichType => RichTypeEnum.GenericTemplate;
 
     [JsonPropertyName("text")]
+    [JsonProperty("text")]
     public string Text { get; set; } = string.Empty;
 
     [JsonPropertyName("template_type")]
+    [JsonProperty("template_type")]
     public string TemplateType => TemplateTypeEnum.Product;
 }
 
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/TextMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/TextMessage.cs
@@ -1,10 +1,12 @@
 using BotSharp.Abstraction.Messaging.Enums;
+using Newtonsoft.Json;
 
 namespace BotSharp.Abstraction.Messaging.Models.RichContent;
 
 public class TextMessage : IRichMessage
 {
     [JsonPropertyName("rich_type")]
+    [JsonProperty("rich_type")]
     public string RichType => RichTypeEnum.Text;
 
     public string Text { get; set; } = string.Empty;
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
@@ -50,7 +50,7 @@ public void Append(string conversationId, RoleDialogModel dialog)
             {
                 return;
             }
-            dialogElements.Add(new DialogElement(meta, content));
+            dialogElements.Add(new DialogElement(meta, content, dialog.SecondaryContent));
         }
         else
         {
@@ -71,7 +71,8 @@ public void Append(string conversationId, RoleDialogModel dialog)
             }
 
             var richContent = dialog.RichContent != null ? JsonSerializer.Serialize(dialog.RichContent, _options.JsonSerializerOptions) : null;
-            dialogElements.Add(new DialogElement(meta, content, richContent));
+            var secondaryRichContent = dialog.SecondaryRichContent != null ? JsonSerializer.Serialize(dialog.SecondaryRichContent, _options.JsonSerializerOptions) : null;
+            dialogElements.Add(new DialogElement(meta, content, richContent, dialog.SecondaryContent, secondaryRichContent));
         }
 
         db.AppendConversationDialogs(conversationId, dialogElements);
@@ -88,6 +89,7 @@ public List<RoleDialogModel> GetDialogs(string conversationId)
         {
             var meta = dialog.MetaData;
             var content = dialog.Content;
+            var secondaryContent = dialog.SecondaryContent;
             var role = meta.Role;
             var currentAgentId = meta.AgentId;
             var messageId = meta.MessageId;
@@ -96,6 +98,8 @@ public List<RoleDialogModel> GetDialogs(string conversationId)
             var createdAt = meta.CreateTime;
             var richContent = !string.IsNullOrEmpty(dialog.RichContent) ? 
                                 JsonSerializer.Deserialize<RichContent<IRichMessage>>(dialog.RichContent, _options.JsonSerializerOptions) : null;
+            var secondaryRichContent = !string.IsNullOrEmpty(dialog.SecondaryRichContent) ?
+                                JsonSerializer.Deserialize<RichContent<IRichMessage>>(dialog.SecondaryRichContent, _options.JsonSerializerOptions) : null;
 
             var record = new RoleDialogModel(role, content)
             {
@@ -104,7 +108,9 @@ public List<RoleDialogModel> GetDialogs(string conversationId)
                 CreatedAt = createdAt,
                 SenderId = senderId,
                 FunctionName = function,
-                RichContent = richContent
+                RichContent = richContent,
+                SecondaryContent = secondaryContent,
+                SecondaryRichContent = secondaryRichContent,
             };
             results.Add(record);
 
diff --git a/src/Infrastructure/BotSharp.Core/Plugins/PluginLoader.cs b/src/Infrastructure/BotSharp.Core/Plugins/PluginLoader.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using System.Reflection;
 using System.Xml;
-using BotSharp.Abstraction.Repositories;
 
 namespace BotSharp.Core.Plugins;
 
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ChatResponseModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ChatResponseModel.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Models/DialogMongoElement.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Models/DialogMongoElement.cs

Original file line number	Diff line number	Diff line change
`@@ -34,23 +34,28 @@ public class DialogElement`
`34`	`34`	`{`
`35`	`35`	`public DialogMetaData MetaData { get; set; }`
`36`	`36`	`public string Content { get; set; }`
	`37`	`+ public string? SecondaryContent { get; set; }`
`37`	`38`	`public string? RichContent { get; set; }`
	`39`	`+ public string? SecondaryRichContent { get; set; }`
`38`	`40`
`39`	`41`	`public DialogElement()`
`40`	`42`	`{`
`41`	`43`
`42`	`44`	`}`
`43`	`45`
`44`		`- public DialogElement(DialogMetaData meta, string content, string? richContent = null)`
	`46`	`+ public DialogElement(DialogMetaData meta, string content, string? richContent = null,`
	`47`	`+ string? secondaryContent = null, string? secondaryRichContent = null)`
`45`	`48`	`{`
`46`	`49`	`MetaData = meta;`
`47`	`50`	`Content = content;`
`48`	`51`	`RichContent = richContent;`
	`52`	`+ SecondaryContent = secondaryContent;`
	`53`	`+ SecondaryRichContent = secondaryRichContent;`
`49`	`54`	`}`
`50`	`55`
`51`	`56`	`public override string ToString()`
`52`	`57`	`{`
`53`		`- return $"{MetaData.Role}: {Content} [{MetaData.CreateTime}]";`
	`58`	`+ return $"{MetaData.Role}: {Content} [{MetaData?.CreateTime}]";`
`54`	`59`	`}`
`55`	`60`	`}`
`56`	`61`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`	`using BotSharp.Abstraction.Messaging.Enums;`
	`2`	`+using Newtonsoft.Json;`
`2`	`3`
`3`	`4`	`namespace BotSharp.Abstraction.Messaging;`
`4`	`5`
`5`	`6`	`public interface IRichMessage`
`6`	`7`	`{`
`7`	`8`	`[JsonPropertyName("text")]`
	`9`	`+ [JsonProperty("text")]`
`8`	`10`	`string Text { get; set; }`
`9`	`11`
`10`	`12`	`[JsonPropertyName("rich_type")]`
	`13`	`+ [JsonProperty("rich_type")]`
`11`	`14`	`string RichType => RichTypeEnum.Text;`
`12`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
	`1`	`+using Newtonsoft.Json;`
	`2`	`+`
`1`	`3`	`namespace BotSharp.Abstraction.Messaging;`
`2`	`4`
`3`	`5`	`public interface ITemplateMessage`
`4`	`6`	`{`
`5`	`7`	`[JsonPropertyName("template_type")]`
	`8`	`+ [JsonProperty("template_type")]`
`6`	`9`	`string TemplateType => string.Empty;`
`7`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,16 @@`
`1`	`1`	`using BotSharp.Abstraction.Messaging.Enums;`
	`2`	`+using Newtonsoft.Json;`
`2`	`3`
`3`	`4`	`namespace BotSharp.Abstraction.Messaging.Models.RichContent;`
`4`	`5`
`5`	`6`	`public class QuickReplyMessage : IRichMessage`
`6`	`7`	`{`
`7`	`8`	`[JsonPropertyName("rich_type")]`
	`9`	`+ [JsonProperty("rich_type")]`
`8`	`10`	`public string RichType => RichTypeEnum.QuickReply;`
`9`	`11`	`public string Text { get; set; } = string.Empty;`
`10`	`12`
`11`	`13`	`[JsonPropertyName("quick_replies")]`
	`14`	`+ [JsonProperty("quick_replies")]`
`12`	`15`	`public List<QuickReplyElement> QuickReplies { get; set; } = new List<QuickReplyElement>();`
`13`	`16`	`}`