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

add pdf upload

Browse source
This commit is contained in:
Jicheng Lu 2024-06-05 20:16:48 -05:00
parent d20a42d40c
commit b336ef57a4
5 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Infrastructure/BotSharp.Abstraction/Files/IBotSharpFileService.cs
View file

@ -6,7 +6,7 @@ public interface IBotSharpFileService
IEnumerable<MessageFileModel> GetChatImages(string conversationId, List<RoleDialogModel> conversations, int offset = 2);
IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds, bool imageOnly = false);
string GetMessageFile(string conversationId, string messageId, string fileName);
bool SaveMessageFiles(string conversationId, string messageId, List<BotSharpFile> files);
Task<bool> SaveMessageFiles(string conversationId, string messageId, List<BotSharpFile> files);
string GetUserAvatar();
bool SaveUserAvatar(BotSharpFile file);

2
src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
View file

@ -48,7 +48,7 @@ public partial class ConversationService
// Save message files
var fileService = _services.GetRequiredService<IBotSharpFileService>();
fileService.SaveMessageFiles(_conversationId, message.MessageId, message.Files);
await fileService.SaveMessageFiles(_conversationId, message.MessageId, message.Files);
message.Files?.Clear();
// Save payload

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

@ -1,4 +1,6 @@
using BotSharp.Abstraction.Browsing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.EntityFrameworkCore;
using System.IO;
using System.Threading;
@ -44,7 +46,7 @@ public partial class BotSharpFileService
foreach (var file in Directory.GetFiles(dir))
{
var contentType = GetFileContentType(file);
if (imageOnly && !_allowedTypes.Contains(contentType))
if (imageOnly && !_allowedImageTypes.Contains(contentType))
{
continue;
}
@ -81,15 +83,27 @@ public partial class BotSharpFileService
return found;
}
public bool SaveMessageFiles(string conversationId, string messageId, List<BotSharpFile> files)
public async Task<bool> SaveMessageFiles(string conversationId, string messageId, List<BotSharpFile> files)
{
if (files.IsNullOrEmpty()) return false;
var dir = GetConversationFileDirectory(conversationId, messageId, createNewDir: true);
if (!ExistDirectory(dir)) return false;
var contextId = string.Empty;
var web = _services.GetRequiredService<IWebBrowser>();
var isNeedScreenShot = files.Any(x => _allowScreenShotTypes.Contains(Path.GetExtension(x.FileName)));
var preFixPath = Path.Combine(_baseDir, CONVERSATION_FOLDER, conversationId, FILE_FOLDER, messageId);
try
{
if (isNeedScreenShot)
{
var state = _services.GetRequiredService<IConversationStateService>();
contextId = state.GetConversationId() ?? Guid.NewGuid().ToString();
await web.LaunchBrowser(contextId, string.Empty);
}
for (int i = 0; i < files.Count; i++)
{
var file = files[i];
@ -103,7 +117,21 @@ public partial class BotSharpFileService
var fileName = $"{i + 1}{fileType}";
Thread.Sleep(100);
File.WriteAllBytes(Path.Combine(dir, fileName), bytes);
if (isNeedScreenShot && _allowScreenShotTypes.Contains(fileType))
{
var path = Path.Combine(preFixPath, fileName);
await web.GoToPage(contextId, path);
path = Path.Combine(preFixPath, $"{Guid.NewGuid()}.png");
await web.ScreenshotAsync(contextId, path);
}
}
if (isNeedScreenShot)
{
await web.CloseBrowser(contextId);
}
return true;
}
catch (Exception ex)

3
src/Infrastructure/BotSharp.Core/Files/BotSharpFileService.cs
View file

@ -12,7 +12,8 @@ public partial class BotSharpFileService : IBotSharpFileService
private readonly IUserIdentity _user;
private readonly ILogger<BotSharpFileService> _logger;
private readonly string _baseDir;
private readonly IEnumerable<string> _allowedTypes = new List<string> { "image/png", "image/jpeg" };
private readonly IEnumerable<string> _allowedImageTypes = new List<string> { "image/png", "image/jpeg" };
private readonly IEnumerable<string> _allowScreenShotTypes = new List<string> { ".pdf" };
private const string CONVERSATION_FOLDER = "conversations";
private const string FILE_FOLDER = "files";

2
src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
View file

@ -374,7 +374,7 @@ public class ConversationController : ControllerBase
public IEnumerable<MessageFileViewModel> GetMessageFiles([FromRoute] string conversationId, [FromRoute] string messageId)
{
var fileService = _services.GetRequiredService<IBotSharpFileService>();
var files = fileService.GetMessageFiles(conversationId, new List<string> { messageId });
var files = fileService.GetMessageFiles(conversationId, new List<string> { messageId }, imageOnly: true);
return files?.Select(x => MessageFileViewModel.Transform(x))?.ToList() ?? new List<MessageFileViewModel>();
}