Merge pull request #804 from iceljc/master

iceljc · web-flow · commit 4f08ca26b0f2 · 2024-12-24T14:14:43.000-06:00
increase image detail level
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -290,20 +290,20 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD
                         if (!string.IsNullOrEmpty(file.FileData))
                         {
                             var (contentType, bytes) = FileUtility.GetFileInfoFromData(file.FileData);
-                            var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Low);
+                            var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Auto);
                             contentParts.Add(contentPart);
                         }
                         else if (!string.IsNullOrEmpty(file.FileStorageUrl))
                         {
                             var contentType = FileUtility.GetFileContentType(file.FileStorageUrl);
                             var bytes = fileStorage.GetFileBytes(file.FileStorageUrl);
-                            var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Low);
+                            var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Auto);
                             contentParts.Add(contentPart);
                         }
                         else if (!string.IsNullOrEmpty(file.FileUrl))
                         {
                             var uri = new Uri(file.FileUrl);
-                            var contentPart = ChatMessageContentPart.CreateImagePart(uri, ChatImageDetailLevel.Low);
+                            var contentPart = ChatMessageContentPart.CreateImagePart(uri, ChatImageDetailLevel.Auto);
                             contentParts.Add(contentPart);
                         }
                     }
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -268,20 +268,20 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD
                         if (!string.IsNullOrEmpty(file.FileData))
                         {
                             var (contentType, bytes) = FileUtility.GetFileInfoFromData(file.FileData);
-                            var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Low);
+                            var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Auto);
                             contentParts.Add(contentPart);
                         }
                         else if (!string.IsNullOrEmpty(file.FileStorageUrl))
                         {
                             var contentType = FileUtility.GetFileContentType(file.FileStorageUrl);
                             var bytes = fileStorage.GetFileBytes(file.FileStorageUrl);
-                            var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Low);
+                            var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Auto);
                             contentParts.Add(contentPart);
                         }
                         else if (!string.IsNullOrEmpty(file.FileUrl))
                         {
                             var uri = new Uri(file.FileUrl);
-                            var contentPart = ChatMessageContentPart.CreateImagePart(uri, ChatImageDetailLevel.Low);
+                            var contentPart = ChatMessageContentPart.CreateImagePart(uri, ChatImageDetailLevel.Auto);
                             contentParts.Add(contentPart);
                         }
                     }
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/ProviderHelper.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/ProviderHelper.cs
@@ -9,10 +9,8 @@ public static OpenAIClient GetClient(string provider, string model, IServiceProv
     {
         var settingsService = services.GetRequiredService<ILlmProviderService>();
         var settings = settingsService.GetSetting(provider, model);
-        var options = string.IsNullOrEmpty(settings.Endpoint)
-            ? null
-            : new OpenAIClientOptions { Endpoint = new Uri(settings.Endpoint) };
-        return new OpenAIClient(new ApiKeyCredential(settings.ApiKey), options);
+        var client = new OpenAIClient(new ApiKeyCredential(settings.ApiKey));
+        return client;
     }
 
     public static List<RoleDialogModel> GetChatSamples(List<string> lines)

Original file line number	Diff line number	Diff line change
`@@ -290,20 +290,20 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD`
`290`	`290`	`if (!string.IsNullOrEmpty(file.FileData))`
`291`	`291`	`{`
`292`	`292`	`var (contentType, bytes) = FileUtility.GetFileInfoFromData(file.FileData);`
`293`		`- var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Low);`
	`293`	`+ var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Auto);`
`294`	`294`	`contentParts.Add(contentPart);`
`295`	`295`	`}`
`296`	`296`	`else if (!string.IsNullOrEmpty(file.FileStorageUrl))`
`297`	`297`	`{`
`298`	`298`	`var contentType = FileUtility.GetFileContentType(file.FileStorageUrl);`
`299`	`299`	`var bytes = fileStorage.GetFileBytes(file.FileStorageUrl);`
`300`		`- var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Low);`
	`300`	`+ var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Auto);`
`301`	`301`	`contentParts.Add(contentPart);`
`302`	`302`	`}`
`303`	`303`	`else if (!string.IsNullOrEmpty(file.FileUrl))`
`304`	`304`	`{`
`305`	`305`	`var uri = new Uri(file.FileUrl);`
`306`		`- var contentPart = ChatMessageContentPart.CreateImagePart(uri, ChatImageDetailLevel.Low);`
	`306`	`+ var contentPart = ChatMessageContentPart.CreateImagePart(uri, ChatImageDetailLevel.Auto);`
`307`	`307`	`contentParts.Add(contentPart);`
`308`	`308`	`}`
`309`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,20 +268,20 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD`
`268`	`268`	`if (!string.IsNullOrEmpty(file.FileData))`
`269`	`269`	`{`
`270`	`270`	`var (contentType, bytes) = FileUtility.GetFileInfoFromData(file.FileData);`
`271`		`- var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Low);`
	`271`	`+ var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Auto);`
`272`	`272`	`contentParts.Add(contentPart);`
`273`	`273`	`}`
`274`	`274`	`else if (!string.IsNullOrEmpty(file.FileStorageUrl))`
`275`	`275`	`{`
`276`	`276`	`var contentType = FileUtility.GetFileContentType(file.FileStorageUrl);`
`277`	`277`	`var bytes = fileStorage.GetFileBytes(file.FileStorageUrl);`
`278`		`- var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Low);`
	`278`	`+ var contentPart = ChatMessageContentPart.CreateImagePart(BinaryData.FromBytes(bytes), contentType, ChatImageDetailLevel.Auto);`
`279`	`279`	`contentParts.Add(contentPart);`
`280`	`280`	`}`
`281`	`281`	`else if (!string.IsNullOrEmpty(file.FileUrl))`
`282`	`282`	`{`
`283`	`283`	`var uri = new Uri(file.FileUrl);`
`284`		`- var contentPart = ChatMessageContentPart.CreateImagePart(uri, ChatImageDetailLevel.Low);`
	`284`	`+ var contentPart = ChatMessageContentPart.CreateImagePart(uri, ChatImageDetailLevel.Auto);`
`285`	`285`	`contentParts.Add(contentPart);`
`286`	`286`	`}`
`287`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,8 @@ public static OpenAIClient GetClient(string provider, string model, IServiceProv`
`9`	`9`	`{`
`10`	`10`	`var settingsService = services.GetRequiredService<ILlmProviderService>();`
`11`	`11`	`var settings = settingsService.GetSetting(provider, model);`
`12`		`- var options = string.IsNullOrEmpty(settings.Endpoint)`
`13`		`- ? null`
`14`		`- : new OpenAIClientOptions { Endpoint = new Uri(settings.Endpoint) };`
`15`		`- return new OpenAIClient(new ApiKeyCredential(settings.ApiKey), options);`
	`12`	`+ var client = new OpenAIClient(new ApiKeyCredential(settings.ApiKey));`
	`13`	`+ return client;`
`16`	`14`	`}`
`17`	`15`
`18`	`16`	`public static List<RoleDialogModel> GetChatSamples(List<string> lines)`