SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix file serialization

Browse source
This commit is contained in:
Jicheng Lu 2024-04-13 10:23:20 -05:00
parent 1992a70cab
commit 668df3e1ba
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
View file

@ -8,8 +8,8 @@ namespace BotSharp.Core.Conversations.Services;
public class ConversationStorage : IConversationStorage
{
private readonly BotSharpDatabaseSettings _dbSettings;
private readonly BotSharpOptions _options;
private readonly IServiceProvider _services;
private readonly JsonSerializerOptions _jsonOptions;
public ConversationStorage(
BotSharpDatabaseSettings dbSettings,
@ -18,7 +18,7 @@ public class ConversationStorage : IConversationStorage
{
_dbSettings = dbSettings;
_services = services;
_jsonOptions = InitJsonSerilizerOptions(options);
_options = options;
}
public void Append(string conversationId, RoleDialogModel dialog)
@ -70,7 +70,7 @@ public class ConversationStorage : IConversationStorage
return;
}
var richContent = dialog.RichContent != null ? JsonSerializer.Serialize(dialog.RichContent, _jsonOptions) : null;
var richContent = dialog.RichContent != null ? JsonSerializer.Serialize(dialog.RichContent, _options.JsonSerializerOptions) : null;
dialogElements.Add(new DialogElement(meta, content, richContent));
}
@ -95,7 +95,7 @@ public class ConversationStorage : IConversationStorage
var senderId = role == AgentRole.Function ? currentAgentId : meta.SenderId;
var createdAt = meta.CreateTime;
var richContent = !string.IsNullOrEmpty(dialog.RichContent) ?
JsonSerializer.Deserialize<RichContent<IRichMessage>>(dialog.RichContent, _jsonOptions) : null;
JsonSerializer.Deserialize<RichContent<IRichMessage>>(dialog.RichContent, _options.JsonSerializerOptions) : null;
var record = new RoleDialogModel(role, content)
{
@ -140,21 +140,4 @@ public class ConversationStorage : IConversationStorage
}
return Path.Combine(dir, "dialogs.txt");
}
private JsonSerializerOptions InitJsonSerilizerOptions(BotSharpOptions botSharOptions)
{
var options = botSharOptions.JsonSerializerOptions;
var jsonOptions = new JsonSerializerOptions
{
PropertyNameCaseInsensitive = options.PropertyNameCaseInsensitive,
PropertyNamingPolicy = options.PropertyNamingPolicy ?? JsonNamingPolicy.CamelCase,
AllowTrailingCommas = options.AllowTrailingCommas,
};
foreach (var converter in options.Converters)
{
jsonOptions.Converters.Add(converter);
}
return jsonOptions;
}
}

23
src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs
View file

@ -521,7 +521,7 @@ namespace BotSharp.Core.Repository
CreateTime = DateTime.Parse(blocks[0])
};
var richContent = blocks.Count() > 6 ? blocks[6] : null;
var richContent = blocks.Count() > 6 ? DecodeRichContent(blocks[6]) : null;
dialogs.Add(new DialogElement(meta, trimmed, richContent));
}
}
@ -537,7 +537,8 @@ namespace BotSharp.Core.Repository
{
var meta = element.MetaData;
var createTime = meta.CreateTime.ToString("MM/dd/yyyy hh:mm:ss.ffffff tt", CultureInfo.InvariantCulture);
var metaStr = $"{createTime}|{meta.Role}|{meta.AgentId}|{meta.MessageId}|{meta.SenderId}|{meta.FunctionName}|{element.RichContent}";
var encodedRichContent = EncodeRichContent(element.RichContent);
var metaStr = $"{createTime}|{meta.Role}|{meta.AgentId}|{meta.MessageId}|{meta.SenderId}|{meta.FunctionName}|{encodedRichContent}";
dialogTexts.Add(metaStr);
var content = $" - {element.Content}";
dialogTexts.Add(content);
@ -686,6 +687,24 @@ namespace BotSharp.Core.Repository
File.WriteAllText(breakpointDir, breakpointStr);
return true;
}
private string? EncodeRichContent(string? content)
{
if (string.IsNullOrEmpty(content)) return content;
var bytes = Encoding.UTF8.GetBytes(content);
var encoded = Convert.ToBase64String(bytes);
return encoded;
}
private string? DecodeRichContent(string? content)
{
if (string.IsNullOrEmpty(content)) return content;
var decoded = Convert.FromBase64String(content);
var origin = Encoding.UTF8.GetString(decoded);
return origin;
}
#endregion
}
}