Merge pull request #528 from iceljc/master

Oceania2018 · web-flow · commit 9fa062106ac8 · 2024-07-07T16:04:36.000-05:00
Change to read_file
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentUtility.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentUtility.cs
@@ -2,6 +2,6 @@ namespace BotSharp.Abstraction.Agents.Enums;
 
 public class AgentUtility
 {
-    public const string FileAnalyzer = "file-analyzer";
+    public const string FileReader = "file-reader";
     public const string ImageGenerator = "image-generator";
 }
diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
@@ -48,10 +48,10 @@
   <ItemGroup>
     <None Remove="data\agents\00000000-0000-0000-0000-000000000000\agent.json" />
     <None Remove="data\agents\00000000-0000-0000-0000-000000000000\functions\generate_image.json" />
+    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\functions\read_file.json" />
     <None Remove="data\agents\00000000-0000-0000-0000-000000000000\instruction.liquid" />
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\functions\load_attachment.json" />
     <None Remove="data\agents\00000000-0000-0000-0000-000000000000\templates\generate_image.fn.liquid" />
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\templates\load_attachment.fn.liquid" />
+    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\templates\read_file.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" />
@@ -159,10 +159,10 @@
     <Content Include="data\agents\00000000-0000-0000-0000-000000000000\instruction.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\functions\load_attachment.json">
+    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\functions\read_file.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\templates\load_attachment.fn.liquid">
+    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\templates\read_file.fn.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\agents\00000000-0000-0000-0000-000000000000\functions\generate_image.json">
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
@@ -20,7 +20,7 @@ public async Task<bool> SendMessage(string agentId,
 
         var content = $"Received [{agent.Name}] {message.Role}: {message.Content}";
 #if DEBUG
-        Console.WriteLine(content, Color.GreenYellow);
+        Console.WriteLine(content);
 #else
         _logger.LogInformation(content);
 #endif
@@ -103,7 +103,7 @@ private async Task HandleAssistantMessage(RoleDialogModel response, Func<RoleDia
         response.Role = AgentRole.Assistant;
         var text = $"Sending [{agentName}] {response.Role}: {response.Content}";
 #if DEBUG
-        Console.WriteLine(text, Color.Yellow);
+        Console.WriteLine(text);
 #else
         _logger.LogInformation(text);
 #endif
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs
@@ -70,7 +70,7 @@ public void PrintStatistics()
         }
         var stats = $"Token Usage: {_promptTokenCount} prompt + {_completionTokenCount} completion = {Total} total tokens ({_timer.ElapsedMilliseconds / 1000f:f2}s). One-Way cost: {Cost:C4}, accumulated cost: {AccumulatedCost:C4}. [{_model}]";
 #if DEBUG
-        Console.WriteLine(stats, Color.DarkGray);
+        Console.WriteLine(stats);
 #else
         _logger.LogInformation(stats);
 #endif
diff --git a/src/Infrastructure/BotSharp.Core/Files/FilePlugin.cs b/src/Infrastructure/BotSharp.Core/Files/FilePlugin.cs
@@ -17,8 +17,8 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         services.AddScoped<IBotSharpFileService, BotSharpFileService>();
 
-        services.AddScoped<IAgentHook, FileAnalyzerHook>();
-        services.AddScoped<IAgentUtilityHook, FileAnalyzerUtilityHook>();
+        services.AddScoped<IAgentHook, FileReaderHook>();
+        services.AddScoped<IAgentUtilityHook, FileReaderUtilityHook>();
         services.AddScoped<IAgentHook, ImageGeneratorHook>();
         services.AddScoped<IAgentUtilityHook, ImageGeneratorUtilityHook>();
     }
diff --git a/src/Infrastructure/BotSharp.Core/Files/Functions/ReadFileFn.cs b/src/Infrastructure/BotSharp.Core/Files/Functions/ReadFileFn.cs
@@ -3,20 +3,20 @@
 
 namespace BotSharp.Core.Files.Functions;
 
-public class LoadAttachmentFn : IFunctionCallback
+public class ReadFileFn : IFunctionCallback
 {
-    public string Name => "load_attachment";
-    public string Indication => "Analyzing files";
+    public string Name => "read_file";
+    public string Indication => "Reading files";
 
     private readonly IServiceProvider _services;
-    private readonly ILogger<LoadAttachmentFn> _logger;
+    private readonly ILogger<ReadFileFn> _logger;
     private readonly IEnumerable<string> _imageTypes = new List<string> { "image", "images", "png", "jpg", "jpeg" };
     private readonly IEnumerable<string> _pdfTypes = new List<string> { "pdf" };
     private static string UTILITY_ASSISTANT = Guid.Empty.ToString();
 
-    public LoadAttachmentFn(
+    public ReadFileFn(
         IServiceProvider services,
-        ILogger<LoadAttachmentFn> logger)
+        ILogger<ReadFileFn> logger)
     {
         _services = services;
         _logger = logger;
diff --git a/src/Infrastructure/BotSharp.Core/Files/Hooks/FileReaderHook.cs b/src/Infrastructure/BotSharp.Core/Files/Hooks/FileReaderHook.cs
@@ -1,13 +1,13 @@
 namespace BotSharp.Core.Files.Hooks;
 
-public class FileAnalyzerHook : AgentHookBase
+public class FileReaderHook : AgentHookBase
 {
     private static string UTILITY_ASSISTANT = Guid.Empty.ToString();
-    private static string FUNCTION_NAME = "load_attachment";
+    private static string FUNCTION_NAME = "read_file";
 
     public override string SelfId => string.Empty;
 
-    public FileAnalyzerHook(IServiceProvider services, AgentSettings settings)
+    public FileReaderHook(IServiceProvider services, AgentSettings settings)
         : base(services, settings)
     {
     }
@@ -16,7 +16,7 @@ public override void OnAgentLoaded(Agent agent)
     {
         var conv = _services.GetRequiredService<IConversationService>();
         var isConvMode = conv.IsConversationMode();
-        var isEnabled = !agent.Utilities.IsNullOrEmpty() && agent.Utilities.Contains(AgentUtility.FileAnalyzer);
+        var isEnabled = !agent.Utilities.IsNullOrEmpty() && agent.Utilities.Contains(AgentUtility.FileReader);
 
         if (isConvMode && isEnabled)
         {
diff --git a/src/Infrastructure/BotSharp.Core/Files/Hooks/FileReaderUtilityHook.cs b/src/Infrastructure/BotSharp.Core/Files/Hooks/FileReaderUtilityHook.cs
@@ -1,9 +1,9 @@
 namespace BotSharp.Core.Files.Hooks;
 
-public class FileAnalyzerUtilityHook : IAgentUtilityHook
+public class FileReaderUtilityHook : IAgentUtilityHook
 {
     public void AddUtilities(List<string> utilities)
     {
-        utilities.Add(AgentUtility.FileAnalyzer);
+        utilities.Add(AgentUtility.FileReader);
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core/data/agents/00000000-0000-0000-0000-000000000000/functions/read_file.json b/src/Infrastructure/BotSharp.Core/data/agents/00000000-0000-0000-0000-000000000000/functions/read_file.json
@@ -1,5 +1,5 @@
 {
-  "name": "load_attachment",
+  "name": "read_file",
   "description": "If the user's request is related to analyzing files and/or images, you can call this function to analyze files and images.",
   "parameters": {
     "type": "object",
diff --git a/src/Infrastructure/BotSharp.Core/data/agents/00000000-0000-0000-0000-000000000000/templates/load_attachment.fn.liquid b/src/Infrastructure/BotSharp.Core/data/agents/00000000-0000-0000-0000-000000000000/templates/load_attachment.fn.liquid
diff --git a/src/Infrastructure/BotSharp.Core/data/agents/00000000-0000-0000-0000-000000000000/templates/read_file.fn.liquid b/src/Infrastructure/BotSharp.Core/data/agents/00000000-0000-0000-0000-000000000000/templates/read_file.fn.liquid
@@ -0,0 +1 @@
+Please call read_file if user wants to describe files, such as images, pdf.
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Embedding/TextEmbeddingProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Embedding/TextEmbeddingProvider.cs
@@ -62,10 +62,12 @@ private int GetDimension()
     {
         var state = _services.GetRequiredService<IConversationStateService>();
         var stateDimension = state.GetState("embedding_dimension");
+        var defaultDimension = Dimension > 0 ? Dimension : DEFAULT_DIMENSION;
+
         if (int.TryParse(stateDimension, out var dimension))
         {
-            return dimension > 0 ? dimension :(Dimension > 0 ? Dimension: DEFAULT_DIMENSION);
+            return dimension > 0 ? dimension : defaultDimension;
         }
-        return Dimension > 0 ? Dimension : DEFAULT_DIMENSION;
+        return defaultDimension;
     }
 }
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Image/ImageGenerationProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Image/ImageGenerationProvider.cs
@@ -177,7 +177,7 @@ private GeneratedImageStyle GetImageStyle(string style)
         GeneratedImageStyle retStyle;
         switch (value)
         {
-            case "standard":
+            case "natural":
                 retStyle = GeneratedImageStyle.Natural;
                 break;
             case "vivid":
diff --git a/src/Plugins/BotSharp.Plugin.HttpHandler/Functions/HandleHttpRequestFn.cs b/src/Plugins/BotSharp.Plugin.HttpHandler/Functions/HandleHttpRequestFn.cs
@@ -5,19 +5,19 @@
 
 namespace BotSharp.Plugin.HttpHandler.Functions;
 
-public class HandleHttpRequest : IFunctionCallback
+public class HandleHttpRequestFn : IFunctionCallback
 {
     public string Name => "handle_http_request";
     public string Indication => "Handling http request";
 
     private readonly IServiceProvider _services;
-    private readonly ILogger<HandleHttpRequest> _logger;
+    private readonly ILogger<HandleHttpRequestFn> _logger;
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly IHttpContextAccessor _context;
     private readonly BotSharpOptions _options;
 
-    public HandleHttpRequest(IServiceProvider services,
-        ILogger<HandleHttpRequest> logger,
+    public HandleHttpRequestFn(IServiceProvider services,
+        ILogger<HandleHttpRequestFn> logger,
         IHttpClientFactory httpClientFactory,
         IHttpContextAccessor context,
         BotSharpOptions options)
@@ -41,14 +41,16 @@ public async Task<bool> Execute(RoleDialogModel message)
             var response = await SendHttpRequest(url, method, content);
             var responseContent = await HandleHttpResponse(response);
             message.RichContent = BuildRichContent(responseContent);
-            return await Task.FromResult(true);
+            message.StopCompletion = true;
+            return true;
         }
         catch (Exception ex)
         {
             var msg = $"Fail when sending http request. Url: {url}, method: {method}, content: {content}";
             _logger.LogWarning($"{msg}\n(Error: {ex.Message})");
             message.RichContent = BuildRichContent($"{msg}");
-            return await Task.FromResult(false);
+            message.StopCompletion = true;
+            return false;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ namespace BotSharp.Abstraction.Agents.Enums;`
`2`	`2`
`3`	`3`	`public class AgentUtility`
`4`	`4`	`{`
`5`		`- public const string FileAnalyzer = "file-analyzer";`
	`5`	`+ public const string FileReader = "file-reader";`
`6`	`6`	`public const string ImageGenerator = "image-generator";`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void PrintStatistics()`
`70`	`70`	`}`
`71`	`71`	`var stats = $"Token Usage: {_promptTokenCount} prompt + {_completionTokenCount} completion = {Total} total tokens ({_timer.ElapsedMilliseconds / 1000f:f2}s). One-Way cost: {Cost:C4}, accumulated cost: {AccumulatedCost:C4}. [{_model}]";`
`72`	`72`	`#if DEBUG`
`73`		`- Console.WriteLine(stats, Color.DarkGray);`
	`73`	`+ Console.WriteLine(stats);`
`74`	`74`	`#else`
`75`	`75`	`_logger.LogInformation(stats);`
`76`	`76`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)`
`17`	`17`	`{`
`18`	`18`	`services.AddScoped<IBotSharpFileService, BotSharpFileService>();`
`19`	`19`
`20`		`- services.AddScoped<IAgentHook, FileAnalyzerHook>();`
`21`		`- services.AddScoped<IAgentUtilityHook, FileAnalyzerUtilityHook>();`
	`20`	`+ services.AddScoped<IAgentHook, FileReaderHook>();`
	`21`	`+ services.AddScoped<IAgentUtilityHook, FileReaderUtilityHook>();`
`22`	`22`	`services.AddScoped<IAgentHook, ImageGeneratorHook>();`
`23`	`23`	`services.AddScoped<IAgentUtilityHook, ImageGeneratorUtilityHook>();`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`namespace BotSharp.Core.Files.Hooks;`
`2`	`2`
`3`		`-public class FileAnalyzerHook : AgentHookBase`
	`3`	`+public class FileReaderHook : AgentHookBase`
`4`	`4`	`{`
`5`	`5`	`private static string UTILITY_ASSISTANT = Guid.Empty.ToString();`
`6`		`- private static string FUNCTION_NAME = "load_attachment";`
	`6`	`+ private static string FUNCTION_NAME = "read_file";`
`7`	`7`
`8`	`8`	`public override string SelfId => string.Empty;`
`9`	`9`
`10`		`- public FileAnalyzerHook(IServiceProvider services, AgentSettings settings)`
	`10`	`+ public FileReaderHook(IServiceProvider services, AgentSettings settings)`
`11`	`11`	`: base(services, settings)`
`12`	`12`	`{`
`13`	`13`	`}`
`@@ -16,7 +16,7 @@ public override void OnAgentLoaded(Agent agent)`
`16`	`16`	`{`
`17`	`17`	`var conv = _services.GetRequiredService<IConversationService>();`
`18`	`18`	`var isConvMode = conv.IsConversationMode();`
`19`		`- var isEnabled = !agent.Utilities.IsNullOrEmpty() && agent.Utilities.Contains(AgentUtility.FileAnalyzer);`
	`19`	`+ var isEnabled = !agent.Utilities.IsNullOrEmpty() && agent.Utilities.Contains(AgentUtility.FileReader);`
`20`	`20`
`21`	`21`	`if (isConvMode && isEnabled)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`namespace BotSharp.Core.Files.Hooks;`
`2`	`2`
`3`		`-public class FileAnalyzerUtilityHook : IAgentUtilityHook`
	`3`	`+public class FileReaderUtilityHook : IAgentUtilityHook`
`4`	`4`	`{`
`5`	`5`	`public void AddUtilities(List<string> utilities)`
`6`	`6`	`{`
`7`		`- utilities.Add(AgentUtility.FileAnalyzer);`
	`7`	`+ utilities.Add(AgentUtility.FileReader);`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "load_attachment",`
	`2`	`+ "name": "read_file",`
`3`	`3`	`"description": "If the user's request is related to analyzing files and/or images, you can call this function to analyze files and images.",`
`4`	`4`	`"parameters": {`
`5`	`5`	`"type": "object",`