Merge branch 'SciSharp:master' into master

SciSharp · Oct 4, 2024 · e2c8e44 · e2c8e44
2 parents 022c050 + 9798426
commit e2c8e44
Show file tree

Hide file tree

Showing 16 changed files with 630 additions and 312 deletions.
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -67,17 +67,6 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
                     responseMessage.FunctionName = responseMessage.FunctionName.Split('.').Last();
                 }
             }
-            //else if (reason == ChatFinishReason.ToolCalls)
-            //{
-            //    var toolCall = value.ToolCalls.FirstOrDefault();
-            //    responseMessage = new RoleDialogModel(AgentRole.Function, text)
-            //    {
-            //        CurrentAgentId = agent.Id,
-            //        MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
-            //        FunctionName = toolCall?.FunctionName,
-            //        FunctionArgs = toolCall?.FunctionArguments
-            //    };
-            //}
             else
             {
                 responseMessage = new RoleDialogModel(AgentRole.Assistant, text)
@@ -281,13 +270,6 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD
         {
             if (message.Role == AgentRole.Function)
             {
-                //messages.Add(new AssistantChatMessage(string.Empty)
-                //{
-                //    FunctionCall = new ChatFunctionCall(message.FunctionName, message.FunctionArgs ?? string.Empty)
-                //});
-
-                //messages.Add(new FunctionChatMessage(message.FunctionName, message.Content));
-
                 messages.Add(new AssistantChatMessage(new List<ChatToolCall>
                 {
                     ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))

diff --git a/src/Plugins/BotSharp.Plugin.ExcelHandler/BotSharp.Plugin.ExcelHandler.csproj b/src/Plugins/BotSharp.Plugin.ExcelHandler/BotSharp.Plugin.ExcelHandler.csproj
@@ -13,14 +13,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
-    <PackageReference Include="NPOI" Version="2.7.1" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\handle_excel_request.json" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\handle_excel_request.fn.liquid" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\" />
-    <Folder Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\" />
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\handle_excel_request.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\handle_excel_request.fn.liquid">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
+    <PackageReference Include="MySql.Data" Version="9.0.0" />
+    <PackageReference Include="NPOI" Version="2.7.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Plugins/BotSharp.Plugin.ExcelHandler/Enums/UtilityName.cs b/src/Plugins/BotSharp.Plugin.ExcelHandler/Enums/UtilityName.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace BotSharp.Plugin.ExcelHandler.Enums;
 
 public class UtilityName

diff --git a/src/Plugins/BotSharp.Plugin.ExcelHandler/ExcelHandlerPlugin.cs b/src/Plugins/BotSharp.Plugin.ExcelHandler/ExcelHandlerPlugin.cs
@@ -5,8 +5,10 @@
 using System.Threading.Tasks;
 using BotSharp.Abstraction.Plugins;
 using BotSharp.Abstraction.Settings;
-using BotSharp.Plugin.ExcelHandler.Helpers;
+using BotSharp.Plugin.ExcelHandler.Helpers.MySql;
+using BotSharp.Plugin.ExcelHandler.Helpers.Sqlite;
 using BotSharp.Plugin.ExcelHandler.Hooks;
+using BotSharp.Plugin.ExcelHandler.Services;
 using BotSharp.Plugin.ExcelHandler.Settings;
 using Microsoft.Extensions.Configuration;
 
@@ -17,6 +19,7 @@ public class ExcelHandlerPlugin : IBotSharpPlugin
     public string Id => "c56a8e29-b16f-4d75-8766-8309342130cb";
     public string Name => "Excel Handler";
     public string Description => "Load data from excel file and transform it into a list of JSON format.";
+    public string IconUrl => "https://w7.pngwing.com/pngs/162/301/png-transparent-microsoft-excel-logo-thumbnail.png";
 
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
@@ -28,6 +31,9 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
 
         services.AddScoped<IAgentUtilityHook, ExcelHandlerUtilityHook>();
         services.AddScoped<IAgentHook, ExcelHandlerHook>();
-        services.AddScoped<IDbHelpers, DbHelpers>();
+        services.AddScoped<ISqliteDbHelpers, SqliteDbHelpers>();
+        services.AddScoped<IMySqlDbHelper, MySqlDbHelpers>();
+        services.AddScoped<ISqliteService, SqliteService>();
+        services.AddScoped<IMySqlService, MySqlService>();
     }
 }