Skip to content

skip file selection if there is only 1 image. #1180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2025
Merged

skip file selection if there is only 1 image. #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff2b1da
skip file selection if there is only 1 image.
Oct 9, 2025
bbfa2eb
Merge branch 'master' into master
hchen2020 Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Image.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public async Task<RoleDialogModel> GenerateImage(string text, InstructOptions? o
var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);

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()
{
Id = innerAgentId,
Expand Down Expand Up @@ -124,7 +124,7 @@ public async Task<RoleDialogModel> EditImage(string text, InstructFileModel imag
var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
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);

// Convert image
Expand Down Expand Up @@ -173,7 +173,7 @@ public async Task<RoleDialogModel> EditImage(string text, InstructFileModel imag
var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
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 maskBinary = await DownloadFile(mask);

Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ private static (string, string) GetProviderAndModel(IServiceProvider services,
model = agentConfig?.Model ?? agentSetting.LlmConfig?.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))
{
Expand Down
4 changes: 2 additions & 2 deletions src/Plugins/BotSharp.Plugin.FileHandler/Functions/EditImageFn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ private async Task<string> GetImageEditResponse(string description, string? defa
LlmConfig = new AgentLlmConfig
{
Provider = llmConfig?.Provider ?? "openai",
Model = llmConfig?.Model ?? "gpt-4o-mini",
Model = llmConfig?.Model ?? "gpt-5-mini",
MaxOutputTokens = llmConfig?.MaxOutputTokens,
ReasoningEffortLevel = llmConfig?.ReasoningEffortLevel
}
Expand Down Expand Up @@ -168,7 +168,7 @@ private async Task<string> GetImageEditResponse(string description, string? defa
}

provider = "openai";
model = "gpt-image-1";
model = "gpt-image-1-mini";

return (provider, model);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Plugins/BotSharp.Plugin.FileHandler/Functions/GenerateImageFn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private async Task<string> GetImageGenerationResponse(string description, string
LlmConfig = new AgentLlmConfig
{
Provider = llmConfig?.Provider ?? "openai",
Model = llmConfig?.Model ?? "gpt-4o-mini",
Model = llmConfig?.Model ?? "gpt-5-mini",
MaxOutputTokens = llmConfig?.MaxOutputTokens,
ReasoningEffortLevel = llmConfig?.ReasoningEffortLevel
}
Expand Down Expand Up @@ -132,7 +132,7 @@ private async Task<string> GetImageGenerationResponse(string description, string
}

provider = "openai";
model = "gpt-image-1";
model = "gpt-image-1-mini";

return (provider, model);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Plugins/BotSharp.Plugin.FileHandler/Helpers/AiResponseHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ internal static string GetDefaultResponse(IEnumerable<string> files)

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 " +
$"inform user that you have completed the required image: {description}";
var text = $"Please generate a user-friendly and short response from the following description to " +
$"inform user that the required image is generated : {description}";

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 response = await completion.GetChatCompletions(agent, [new RoleDialogModel(AgentRole.User, text)]);
return response.Content;
Expand Down
Loading