Skip to content

Commit 3483fd4

Browse files
committed
Adjust rich content data structure.
1 parent ce10475 commit 3483fd4

File tree

17 files changed

+60
-34
lines changed

17 files changed

+60
-34
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using BotSharp.Abstraction.Functions.Models;
2+
using BotSharp.Abstraction.Messaging.Models;
3+
using BotSharp.Abstraction.Messaging.Models.RichContent;
24

35
namespace BotSharp.Abstraction.Conversations.Models;
46

@@ -35,7 +37,7 @@ public class RoleDialogModel : ITrackableMessage
3537
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
3638
public object Data { get; set; }
3739
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
38-
public object? RichContent { get; set; }
40+
public RichContent<IMessageTemplate>? RichContent { get; set; }
3941

4042
/// <summary>
4143
/// Stop conversation completion

src/Infrastructure/BotSharp.Abstraction/Functions/Models/FunctionCallFromLlm.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ public class FunctionCallFromLlm : RoutingArgs
1212
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
1313
public JsonDocument? Arguments { get; set; }
1414

15+
public bool IsExecutionOnce { get; set; }
16+
1517
public override string ToString()
1618
{
1719
var route = string.IsNullOrEmpty(AgentName) ? "" : $"<Route to {AgentName.ToUpper()} because {Reason}>";
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace BotSharp.Abstraction.Messaging.Models;
2+
3+
public interface IMessageTemplate
4+
{
5+
string Text { get; set; }
6+
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public class QuickReplyElement
99
public string? Payload { get; set; }
1010
[JsonPropertyName("image_url")]
1111
public string? ImageUrl { get; set; }
12-
[JsonPropertyName("postback_url")]
1312
public string? PostBackUrl { get; set; }
1413
}
1514
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11

22
namespace BotSharp.Abstraction.Messaging.Models.RichContent
33
{
4-
public class QuickReplyMessage : TextMessage
4+
public class QuickReplyMessage : IMessageTemplate
55
{
6+
public string Text { get; set; } = string.Empty;
7+
68
[JsonPropertyName("quick_replies")]
79
public List<QuickReplyElement> QuickReplies { get; set; } = new List<QuickReplyElement>();
810
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace BotSharp.Abstraction.Messaging.Models.RichContent
22
{
3-
public class RichContent<T>
3+
public class RichContent<T> where T : IMessageTemplate
44
{
55
public Recipient Recipient { get; set; } = new Recipient();
66
/// <summary>

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11

22
namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
33
{
4-
public class ButtonTemplate : TextMessage
4+
public class ButtonTemplate : IMessageTemplate
55
{
6+
public string Text { get; set; } = string.Empty;
7+
68
[JsonPropertyName("template_type")]
79
public string TemplateType => "button";
810
public List<ButtonElement> Buttons { get; set; } = new List<ButtonElement>();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11

22
namespace BotSharp.Abstraction.Messaging.Models.RichContent.Template
33
{
4-
public class MultiSelectTemplate : TextMessage
4+
public class MultiSelectTemplate : IMessageTemplate
55
{
6+
public string Text { get; set; } = string.Empty;
7+
68
[JsonPropertyName("template_type")]
79
public string TemplateType => "multi-select";
810
public List<OptionElement> Options { get; set; } = new List<OptionElement>();

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)