Skip to content

Commit fa7e387

Browse files
author
Jicheng Lu
committed
move generate image to file handler
1 parent c698dba commit fa7e387

File tree

15 files changed

+18
-88
lines changed

15 files changed

+18
-88
lines changed

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(TargetFramework)</TargetFramework>
@@ -47,9 +47,7 @@
4747

4848
<ItemGroup>
4949
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\agent.json" />
50-
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\generate_image.json" />
5150
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\instruction.liquid" />
52-
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\generate_image.fn.liquid" />
5351
<None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\agent.json" />
5452
<None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\functions.json" />
5553
<None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\functions\human_intervention_needed.json" />
@@ -157,12 +155,6 @@
157155
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\instruction.liquid">
158156
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
159157
</Content>
160-
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\generate_image.json">
161-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
162-
</Content>
163-
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\generate_image.fn.liquid">
164-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
165-
</Content>
166158
<Content Include="data\plugins\config.json">
167159
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
168160
</Content>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using BotSharp.Core.Files.Hooks;
21
using BotSharp.Core.Files.Services;
32
using Microsoft.Extensions.Configuration;
43

@@ -16,8 +15,5 @@ public class FilePlugin : IBotSharpPlugin
1615
public void RegisterDI(IServiceCollection services, IConfiguration config)
1716
{
1817
services.AddScoped<IBotSharpFileService, BotSharpFileService>();
19-
20-
services.AddScoped<IAgentHook, ImageGeneratorHook>();
21-
services.AddScoped<IAgentUtilityHook, ImageGeneratorUtilityHook>();
2218
}
2319
}

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(TargetFramework)</TargetFramework>
@@ -12,8 +12,8 @@
1212

1313
<ItemGroup>
1414
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\handle_email_request.json" />
15-
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\email_attachment_prompt.liquid" />
1615
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\handle_email_request.fn.liquid" />
16+
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\select_attachment_prompt.liquid" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
@@ -23,7 +23,7 @@
2323
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\handle_email_request.fn.liquid">
2424
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2525
</Content>
26-
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\email_attachment_prompt.liquid">
26+
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\select_attachment_prompt.liquid">
2727
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2828
</Content>
2929
</ItemGroup>

‎src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailRequestFn.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private async Task<IEnumerable<MessageFileModel>> SelectFiles(IEnumerable<Messag
9696
{
9797
return $"id: {idx + 1}, file_name: {x.FileName}.{x.FileType}, content_type: {x.ContentType}";
9898
}).ToList();
99-
var prompt = db.GetAgentTemplate(BuiltInAgentId.UtilityAssistant, "email_attachment_prompt");
99+
var prompt = db.GetAgentTemplate(BuiltInAgentId.UtilityAssistant, "select_attachment_prompt");
100100
prompt = render.Render(prompt, new Dictionary<string, object>
101101
{
102102
{ "file_list", promptFiles }

‎src/Plugins/BotSharp.Plugin.EmailHandler/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/email_attachment_prompt.liquid‎ renamed to ‎src/Plugins/BotSharp.Plugin.EmailHandler/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/select_attachment_prompt.liquid‎

File renamed without changes.

‎src/Plugins/BotSharp.Plugin.FileHandler/BotSharp.Plugin.FileHandler.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,24 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14+
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\generate_image.json" />
1415
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\read_image.json" />
1516
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\read_pdf.json" />
17+
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\generate_image.fn.liquid" />
1618
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\read_image.fn.liquid" />
1719
<None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\read_pdf.fn.liquid" />
1820
</ItemGroup>
1921

2022
<ItemGroup>
23+
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\generate_image.json">
24+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25+
</Content>
2126
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\read_image.json">
2227
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2328
</Content>
29+
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\generate_image.fn.liquid">
30+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31+
</Content>
2432
<Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\read_image.fn.liquid">
2533
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2634
</Content>

‎src/Plugins/BotSharp.Plugin.FileHandler/Enums/UtilityName.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ namespace BotSharp.Plugin.FileHandler.Enums;
22

33
public class UtilityName
44
{
5+
public const string ImageGenerator = "image-generator";
56
public const string ImageReader = "image-reader";
67
public const string PdfReader = "pdf-reader";
78
}

0 commit comments

Comments
 (0)