SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1180 from hchen2020/master

Browse source 
skip file selection if there is only 1 image.
This commit is contained in:
Haiping 2025-10-09 20:02:33 -05:00 committed by GitHub
parent 0f6a4a5dc3 bbfa2eb932
commit 5a6a93cfba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Image.cs
View file

@ -49,7 +49,7 @@ public partial class FileInstructService
var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName); var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
var textContent = text.IfNullOrEmptyAs(instruction).IfNullOrEmptyAs(string.Empty); var textContent = text.IfNullOrEmptyAs(instruction).IfNullOrEmptyAs(string.Empty);
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1"); var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
var message = await completion.GetImageGeneration(new Agent() var message = await completion.GetImageGeneration(new Agent()
{ {
Id = innerAgentId, Id = innerAgentId,
@ -124,7 +124,7 @@ public partial class FileInstructService
var innerAgentId = options?.AgentId ?? Guid.Empty.ToString(); var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName); var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1"); var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
var binary = await DownloadFile(image); var binary = await DownloadFile(image);
// Convert image // Convert image
@ -173,7 +173,7 @@ public partial class FileInstructService
var innerAgentId = options?.AgentId ?? Guid.Empty.ToString(); var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName); var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1"); var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
var imageBinary = await DownloadFile(image); var imageBinary = await DownloadFile(image);
var maskBinary = await DownloadFile(mask); var maskBinary = await DownloadFile(mask);

2
src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs
View file

@ -213,7 +213,7 @@ public class CompletionProvider
model = agentConfig?.Model ?? agentSetting.LlmConfig?.Model; model = agentConfig?.Model ?? agentSetting.LlmConfig?.Model;
if (state.ContainsState("model")) if (state.ContainsState("model"))
{ {
model = state.GetState("model", model ?? "gpt-image-1"); model = state.GetState("model", model ?? "gpt-image-1-mini");
} }
else if (state.ContainsState("model_id") || !string.IsNullOrEmpty(modelId)) else if (state.ContainsState("model_id") || !string.IsNullOrEmpty(modelId))
{ {

4
src/Plugins/BotSharp.Plugin.FileHandler/Functions/EditImageFn.cs
View file

@ -137,7 +137,7 @@ public class EditImageFn : IFunctionCallback
LlmConfig = new AgentLlmConfig LlmConfig = new AgentLlmConfig
{ {
Provider = llmConfig?.Provider ?? "openai", Provider = llmConfig?.Provider ?? "openai",
Model = llmConfig?.Model ?? "gpt-4o-mini", Model = llmConfig?.Model ?? "gpt-5-mini",
MaxOutputTokens = llmConfig?.MaxOutputTokens, MaxOutputTokens = llmConfig?.MaxOutputTokens,
ReasoningEffortLevel = llmConfig?.ReasoningEffortLevel ReasoningEffortLevel = llmConfig?.ReasoningEffortLevel
} }
@ -168,7 +168,7 @@ public class EditImageFn : IFunctionCallback
} }
provider = "openai"; provider = "openai";
model = "gpt-image-1"; model = "gpt-image-1-mini";
return (provider, model); return (provider, model);
} }

4
src/Plugins/BotSharp.Plugin.FileHandler/Functions/GenerateImageFn.cs
View file

@ -101,7 +101,7 @@ public class GenerateImageFn : IFunctionCallback
LlmConfig = new AgentLlmConfig LlmConfig = new AgentLlmConfig
{ {
Provider = llmConfig?.Provider ?? "openai", Provider = llmConfig?.Provider ?? "openai",
Model = llmConfig?.Model ?? "gpt-4o-mini", Model = llmConfig?.Model ?? "gpt-5-mini",
MaxOutputTokens = llmConfig?.MaxOutputTokens, MaxOutputTokens = llmConfig?.MaxOutputTokens,
ReasoningEffortLevel = llmConfig?.ReasoningEffortLevel ReasoningEffortLevel = llmConfig?.ReasoningEffortLevel
} }
@ -132,7 +132,7 @@ public class GenerateImageFn : IFunctionCallback
} }
provider = "openai"; provider = "openai";
model = "gpt-image-1"; model = "gpt-image-1-mini";
return (provider, model); return (provider, model);
} }

6
src/Plugins/BotSharp.Plugin.FileHandler/Helpers/AiResponseHelper.cs
View file

@ -21,11 +21,11 @@ internal static class AiResponseHelper
internal static async Task<string> GetImageGenerationResponse(IServiceProvider services, Agent agent, string description) internal static async Task<string> GetImageGenerationResponse(IServiceProvider services, Agent agent, string description)
{ {
var text = $"Please generate a user-friendly response from the following description to " + var text = $"Please generate a user-friendly and short response from the following description to " +
$"inform user that you have completed the required image: {description}"; $"inform user that the required image is generated : {description}";
var provider = agent?.LlmConfig?.Provider ?? "openai"; var provider = agent?.LlmConfig?.Provider ?? "openai";
var model = agent?.LlmConfig?.Model ?? "gpt-4o-mini"; var model = agent?.LlmConfig?.Model ?? "gpt-5-mini";
var completion = CompletionProvider.GetChatCompletion(services, provider: provider, model: model); var completion = CompletionProvider.GetChatCompletion(services, provider: provider, model: model);
var response = await completion.GetChatCompletions(agent, [new RoleDialogModel(AgentRole.User, text)]); var response = await completion.GetChatCompletions(agent, [new RoleDialogModel(AgentRole.User, text)]);
return response.Content; return response.Content;