Merge pull request #551 from iceljc/features/relocate-generate_image

move generate image to file handler

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentUtility.cs

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -47,9 +47,7 @@
 
   <ItemGroup>
     <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\agent.json" />
-    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\generate_image.json" />
     <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\instruction.liquid" />
-    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\generate_image.fn.liquid" />
     <None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\agent.json" />
     <None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\functions.json" />
     <None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\functions\human_intervention_needed.json" />
@@ -157,12 +155,6 @@
     <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\instruction.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\generate_image.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\generate_image.fn.liquid">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="data\plugins\config.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj

@@ -1,4 +1,3 @@
-using BotSharp.Core.Files.Hooks;
 using BotSharp.Core.Files.Services;
 using Microsoft.Extensions.Configuration;
 
@@ -16,8 +15,5 @@ public class FilePlugin : IBotSharpPlugin
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         services.AddScoped<IBotSharpFileService, BotSharpFileService>();
-
-        services.AddScoped<IAgentHook, ImageGeneratorHook>();
-        services.AddScoped<IAgentUtilityHook, ImageGeneratorUtilityHook>();
     }
 }

src/Infrastructure/BotSharp.Core/Files/FilePlugin.cs

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -12,8 +12,8 @@
 
   <ItemGroup>
     <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\handle_email_request.json" />
-    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\email_attachment_prompt.liquid" />
     <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\handle_email_request.fn.liquid" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\select_attachment_prompt.liquid" />
   </ItemGroup>
 
   <ItemGroup>
@@ -23,7 +23,7 @@
     <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\handle_email_request.fn.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\email_attachment_prompt.liquid">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\select_attachment_prompt.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

src/Infrastructure/BotSharp.Core/Files/Hooks/ImageGeneratorHook.cs

@@ -56,7 +56,7 @@ public async Task<bool> Execute(RoleDialogModel message)
             }
 
             mailMessage.Body = bodyBuilder.ToMessageBody();
-            var response = await HandleSendEmailBySMTP(mailMessage);
+            var response = await SendEmailBySMTP(mailMessage);
             message.Content = response;
 
             _logger.LogWarning($"Email successfully send over to {recipient}. Email Subject: {subject} [{response}]");
@@ -96,7 +96,7 @@ private async Task<IEnumerable<MessageFileModel>> SelectFiles(IEnumerable<Messag
             {
                 return $"id: {idx + 1}, file_name: {x.FileName}.{x.FileType}, content_type: {x.ContentType}";
             }).ToList();
-            var prompt = db.GetAgentTemplate(BuiltInAgentId.UtilityAssistant, "email_attachment_prompt");
+            var prompt = db.GetAgentTemplate(BuiltInAgentId.UtilityAssistant, "select_attachment_prompt");
             prompt = render.Render(prompt, new Dictionary<string, object>
             {
                 { "file_list", promptFiles }
@@ -140,7 +140,7 @@ private void BuildEmailAttachments(BodyBuilder builder, IEnumerable<MessageFileM
         }
     }
 
-    private async Task<string> HandleSendEmailBySMTP(MimeMessage mailMessage)
+    private async Task<string> SendEmailBySMTP(MimeMessage mailMessage)
     {
         using var smtpClient = new SmtpClient();
         await smtpClient.ConnectAsync(_emailSettings.SMTPServer, _emailSettings.SMTPPort, SecureSocketOptions.StartTls);

src/Infrastructure/BotSharp.Core/Files/Hooks/ImageGeneratorUtilityHook.cs

@@ -1,6 +1,6 @@
 {
   "name": "handle_email_request",
-  "description": "If the user requests to send an email, you need to capture the email content and the recipient email address. If the user explicitly enter email subject use the same if not intelligently capture the email subject from the content. Then call this function to send out email.",
+  "description": "If the user requests to send an email with or without attachments or files, you need to capture the email content and the recipient email address. If the user explicitly enter email subject use the same if not intelligently capture the email subject from the content. Then call this function to send out email.",
   "parameters": {
     "type": "object",
     "properties": {
@@ -18,7 +18,7 @@
       },
       "is_need_attachments": {
         "type": "boolean",
-        "description": "If the user request to send email with attachemnt(s), then this value should be true. Otherwise, this value should be false."
+        "description": "If the user request to send email with attachemnt(s) or file(s), then this value should be True. Otherwise, this value should be False."
       }
     },
     "required": [ "to_address", "email_content", "subject", "is_need_attachments" ]

src/Plugins/BotSharp.Plugin.EmailHandler/BotSharp.Plugin.EmailHandler.csproj

@@ -1,2 +1 @@
-Suppose user has uploaded some attachments.
 Please call handle_email_request if user wants to send out an email.