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

Merge branch 'SciSharp:master' into master

Browse source
This commit is contained in:
C. Oceania 2024-07-07 16:03:37 -05:00 committed by GitHub
parent 8e66dc49c7 1ebd0d4295
commit ea01c77442
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/Infrastructure/BotSharp.Core/Files/Functions/GenerateImageFn.cs
View file

@ -1,5 +1,4 @@
using BotSharp.Abstraction.Functions;
using System.Net.Http;
namespace BotSharp.Core.Files.Functions;
@ -55,11 +54,8 @@ public class GenerateImageFn : IFunctionCallback
private void SetImageOptions()
{
var state = _services.GetRequiredService<IConversationStateService>();
var size = state.SetState("image_size", "1024x1024");
var quality = state.SetState("image_quality", "standard");
var style = state.SetState("image_style", "natural");
var format = state.SetState("image_format", "bytes");
var count = state.SetState("image_count", "1");
state.SetState("image_format", "bytes");
state.SetState("image_count", "1");
}
private async Task<string> GetImageGeneration(Agent agent, RoleDialogModel message, string? description)
@ -70,7 +66,7 @@ public class GenerateImageFn : IFunctionCallback
var text = !string.IsNullOrWhiteSpace(description) ? description : message.Content;
var dialog = RoleDialogModel.From(message, AgentRole.User, text);
var result = await completion.GetImageGeneration(agent, new List<RoleDialogModel> { dialog });
await SaveGeneratedImages(result?.GeneratedImages);
SaveGeneratedImages(result?.GeneratedImages);
return result?.Content ?? string.Empty;
}
catch (Exception ex)
@ -81,43 +77,15 @@ public class GenerateImageFn : IFunctionCallback
}
}
private async Task SaveGeneratedImages(List<ImageGeneration>? images)
private void SaveGeneratedImages(List<ImageGeneration>? images)
{
if (images.IsNullOrEmpty()) return;
var files = new List<BotSharpFile>();
foreach (var image in images)
var files = images.Where(x => !string.IsNullOrEmpty(x?.ImageData)).Select(x => new BotSharpFile
{
if (string.IsNullOrEmpty(image?.ImageUrl)
&& string.IsNullOrEmpty(image?.ImageData))
{
continue;
}
try
{
var data = image.ImageData;
if (!string.IsNullOrEmpty(image.ImageUrl))
{
var http = _services.GetRequiredService<IHttpClientFactory>();
using var client = http.CreateClient();
var bytes = await client.GetByteArrayAsync(image.ImageUrl);
data = Convert.ToBase64String(bytes);
}
if (!string.IsNullOrEmpty(data))
{
var imageName = $"{Guid.NewGuid().ToString()}.png";
var imageData = $"data:image/png;base64,{data}";
files.Add(new BotSharpFile { FileName = imageName, FileData = imageData });
}
}
catch (Exception ex)
{
_logger.LogWarning($"Error when saving generated image: {image.ImageUrl ?? image.ImageData}\r\n{ex.Message}");
continue;
}
}
FileName = $"{Guid.NewGuid()}.png",
FileData = $"data:image/png;base64,{x.ImageData}"
}).ToList();
var fileService = _services.GetRequiredService<IBotSharpFileService>();
fileService.SaveMessageFiles(_conversationId, _messageId, FileSourceType.Bot, files);

28
src/Infrastructure/BotSharp.Core/Files/Services/BotSharpFileService.Conversation.cs
View file

@ -188,16 +188,16 @@ public partial class BotSharpFileService
var dir = GetConversationFileDirectory(conversationId, messageId, createNewDir: true);
if (!ExistDirectory(dir)) return false;
try
for (int i = 0; i < files.Count; i++)
{
for (int i = 0; i < files.Count; i++)
var file = files[i];
if (string.IsNullOrEmpty(file.FileData))
{
var file = files[i];
if (string.IsNullOrEmpty(file.FileData))
{
continue;
}
continue;
}
try
{
var (_, bytes) = GetFileInfoFromData(file.FileData);
var subDir = Path.Combine(dir, source, $"{i + 1}");
if (!ExistDirectory(subDir))
@ -213,14 +213,14 @@ public partial class BotSharpFileService
Thread.Sleep(100);
}
}
catch (Exception ex)
{
_logger.LogWarning($"Error when saving message file {file.FileName}: {ex.Message}\r\n{ex.InnerException}");
continue;
}
}
return true;
}
catch (Exception ex)
{
_logger.LogWarning($"Error when saving conversation files: {ex.Message}");
return false;
}
return true;
}

2
src/Plugins/BotSharp.Plugin.SparkDesk/Providers/ChatCompletionProvider.cs
View file

@ -20,7 +20,7 @@ public class ChatCompletionProvider : IChatCompletion
_services = services;
_settings = settings;
_logger = logger;
_model = $"general{settings.ModelVersion.ToString()}";
_model = $"general{settings.ModelVersion}";
}