Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add payload #438

Merged
merged 1 commit into from
May 7, 2024
Merged

add payload #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,22 @@ public class DialogElement
public string? SecondaryContent { get; set; }
public string? RichContent { get; set; }
public string? SecondaryRichContent { get; set; }
public string? Payload { get; set; }

public DialogElement()
{

}

public DialogElement(DialogMetaData meta, string content, string? richContent = null,
string? secondaryContent = null, string? secondaryRichContent = null)
string? secondaryContent = null, string? secondaryRichContent = null, string? payload = null)
{
MetaData = meta;
Content = content;
RichContent = richContent;
SecondaryContent = secondaryContent;
SecondaryRichContent = secondaryRichContent;
Payload = payload;
}

public override string ToString()
Expand Down
4 changes: 4 additions & 0 deletions src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ public class RoleDialogModel : ITrackableMessage

public string? SecondaryContent { get; set; }

[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
[JsonPropertyName("payload")]
public string? Payload { get; set; }

/// <summary>
/// Indicator message used to provide UI feedback for function execution
/// </summary>
Expand Down
20 changes: 18 additions & 2 deletions src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ public void Append(string conversationId, RoleDialogModel dialog)
{
return;
}
dialogElements.Add(new DialogElement(meta, content, dialog.SecondaryContent));
dialogElements.Add(new DialogElement
{
MetaData = meta,
Content = dialog.Content,
SecondaryContent = dialog.SecondaryContent,
Payload = dialog.Payload
});
}
else
{
Expand All @@ -72,7 +78,15 @@ public void Append(string conversationId, RoleDialogModel dialog)

var richContent = dialog.RichContent != null ? JsonSerializer.Serialize(dialog.RichContent, _options.JsonSerializerOptions) : null;
var secondaryRichContent = dialog.SecondaryRichContent != null ? JsonSerializer.Serialize(dialog.SecondaryRichContent, _options.JsonSerializerOptions) : null;
dialogElements.Add(new DialogElement(meta, content, richContent, dialog.SecondaryContent, secondaryRichContent));
dialogElements.Add(new DialogElement
{
MetaData = meta,
Content = dialog.Content,
SecondaryContent = dialog.SecondaryContent,
RichContent = richContent,
SecondaryRichContent = secondaryRichContent,
Payload = dialog.Payload
});
}

db.AppendConversationDialogs(conversationId, dialogElements);
Expand All @@ -90,6 +104,7 @@ public List<RoleDialogModel> GetDialogs(string conversationId)
var meta = dialog.MetaData;
var content = dialog.Content;
var secondaryContent = dialog.SecondaryContent;
var payload = dialog.Payload;
var role = meta.Role;
var currentAgentId = meta.AgentId;
var messageId = meta.MessageId;
Expand All @@ -111,6 +126,7 @@ public List<RoleDialogModel> GetDialogs(string conversationId)
RichContent = richContent,
SecondaryContent = secondaryContent,
SecondaryRichContent = secondaryRichContent,
Payload = payload
};
results.Add(record);

Expand Down
34 changes: 22 additions & 12 deletions src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ private List<DialogElement> CollectDialogElements(string dialogDir)
var trimmedContent = content.Substring(4);
var secondaryContent = rawDialogs[i + 4];
var trimmedSecondaryContent = string.IsNullOrEmpty(secondaryContent) ? null : secondaryContent.Substring(4);
var payload = blocks.Count() > 6 ? blocks[6] : null;

var meta = new DialogMetaData
{
Expand All @@ -540,9 +541,17 @@ private List<DialogElement> CollectDialogElements(string dialogDir)
CreateTime = DateTime.Parse(blocks[0])
};

var richContent = DecodeRichContent(rawDialogs[i + 1]);
var secondaryRichContent = DecodeRichContent(rawDialogs[i + 3]);
dialogs.Add(new DialogElement(meta, trimmedContent, richContent, trimmedSecondaryContent, secondaryRichContent));
var richContent = DecodeText(rawDialogs[i + 1]);
var secondaryRichContent = DecodeText(rawDialogs[i + 3]);
dialogs.Add(new DialogElement
{
MetaData = meta,
Content = trimmedContent,
SecondaryContent = trimmedSecondaryContent,
RichContent = richContent,
SecondaryRichContent = secondaryRichContent,
Payload = payload
});
}
}
return dialogs;
Expand All @@ -557,9 +566,10 @@ private List<string> ParseDialogElements(List<DialogElement> dialogs)
{
var meta = element.MetaData;
var createTime = meta.CreateTime.ToString("MM/dd/yyyy hh:mm:ss.ffffff tt", CultureInfo.InvariantCulture);
var encodedRichContent = EncodeRichContent(element.RichContent);
var encodedSecondaryRichContent = EncodeRichContent(element.SecondaryRichContent);
var metaStr = $"{createTime}|{meta.Role}|{meta.AgentId}|{meta.MessageId}|{meta.SenderId}|{meta.FunctionName}";
var encodedRichContent = EncodeText(element.RichContent);
var encodedSecondaryRichContent = EncodeText(element.SecondaryRichContent);
var payload = element.Payload;
var metaStr = $"{createTime}|{meta.Role}|{meta.AgentId}|{meta.MessageId}|{meta.SenderId}|{meta.FunctionName}|{payload}";
dialogTexts.Add(metaStr);

dialogTexts.Add(encodedRichContent);
Expand Down Expand Up @@ -715,20 +725,20 @@ private bool SaveTruncatedBreakpoints(string breakpointDir, List<ConversationBre
return true;
}

private string? EncodeRichContent(string? content)
private string? EncodeText(string? text)
{
if (string.IsNullOrEmpty(content)) return content;
if (string.IsNullOrEmpty(text)) return text;

var bytes = Encoding.UTF8.GetBytes(content);
var bytes = Encoding.UTF8.GetBytes(text);
var encoded = Convert.ToBase64String(bytes);
return encoded;
}

private string? DecodeRichContent(string? content)
private string? DecodeText(string? text)
{
if (string.IsNullOrEmpty(content)) return content;
if (string.IsNullOrEmpty(text)) return text;

var decoded = Convert.FromBase64String(content);
var decoded = Convert.FromBase64String(text);
var origin = Encoding.UTF8.GetString(decoded);
return origin;
}
Expand Down
3 changes: 2 additions & 1 deletion src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs([FromRoute] string
CreatedAt = message.CreatedAt,
Text = !string.IsNullOrEmpty(message.SecondaryContent) ? message.SecondaryContent : message.Content,
Data = message.Data,
Sender = UserViewModel.FromUser(user)
Sender = UserViewModel.FromUser(user),
Payload = message.Payload
});
}
else if (message.Role == AgentRole.Assistant)
Expand Down
4 changes: 4 additions & 0 deletions src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/ChatResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ public class ChatResponseModel : InstructResult
[JsonPropertyName("rich_content")]
public RichContent<IRichMessage>? RichContent { get; set; }

[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
[JsonPropertyName("payload")]
public string? Payload { get; set; }

[JsonPropertyName("created_at")]
public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
}
7 changes: 5 additions & 2 deletions src/Plugins/BotSharp.Plugin.MongoStorage/Models/DialogMongoElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public class DialogMongoElement
public string? SecondaryContent { get; set; }
public string? RichContent { get; set; }
public string? SecondaryRichContent { get; set; }
public string? Payload { get; set; }

public DialogMongoElement()
{
Expand All @@ -23,7 +24,8 @@ public static DialogMongoElement ToMongoElement(DialogElement dialog)
Content = dialog.Content,
SecondaryContent = dialog.SecondaryContent,
RichContent = dialog.RichContent,
SecondaryRichContent = dialog.SecondaryRichContent
SecondaryRichContent = dialog.SecondaryRichContent,
Payload = dialog.Payload
};
}

Expand All @@ -35,7 +37,8 @@ public static DialogElement ToDomainElement(DialogMongoElement dialog)
Content = dialog.Content,
SecondaryContent = dialog.SecondaryContent,
RichContent = dialog.RichContent,
SecondaryRichContent = dialog.SecondaryRichContent
SecondaryRichContent = dialog.SecondaryRichContent,
Payload = dialog.Payload
};
}
}
Expand Down