Skip to content

Commit 5a6a93c

Browse files
authored
Merge pull request #1180 from hchen2020/master
skip file selection if there is only 1 image.
2 parents 0f6a4a5 + bbfa2eb commit 5a6a93c

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public async Task<RoleDialogModel> GenerateImage(string text, InstructOptions? o
4949
var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
5050

5151
var textContent = text.IfNullOrEmptyAs(instruction).IfNullOrEmptyAs(string.Empty);
52-
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1");
52+
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
5353
var message = await completion.GetImageGeneration(new Agent()
5454
{
5555
Id = innerAgentId,
@@ -124,7 +124,7 @@ public async Task<RoleDialogModel> EditImage(string text, InstructFileModel imag
124124
var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
125125
var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
126126

127-
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1");
127+
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
128128
var binary = await DownloadFile(image);
129129

130130
// Convert image
@@ -173,7 +173,7 @@ public async Task<RoleDialogModel> EditImage(string text, InstructFileModel imag
173173
var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
174174
var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
175175

176-
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1");
176+
var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
177177
var imageBinary = await DownloadFile(image);
178178
var maskBinary = await DownloadFile(mask);
179179

src/Infrastructure/BotSharp.Core/Infrastructures/CompletionProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private static (string, string) GetProviderAndModel(IServiceProvider services,
213213
model = agentConfig?.Model ?? agentSetting.LlmConfig?.Model;
214214
if (state.ContainsState("model"))
215215
{
216-
model = state.GetState("model", model ?? "gpt-image-1");
216+
model = state.GetState("model", model ?? "gpt-image-1-mini");
217217
}
218218
else if (state.ContainsState("model_id") || !string.IsNullOrEmpty(modelId))
219219
{

src/Plugins/BotSharp.Plugin.FileHandler/Functions/EditImageFn.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private async Task<string> GetImageEditResponse(string description, string? defa
137137
LlmConfig = new AgentLlmConfig
138138
{
139139
Provider = llmConfig?.Provider ?? "openai",
140-
Model = llmConfig?.Model ?? "gpt-4o-mini",
140+
Model = llmConfig?.Model ?? "gpt-5-mini",
141141
MaxOutputTokens = llmConfig?.MaxOutputTokens,
142142
ReasoningEffortLevel = llmConfig?.ReasoningEffortLevel
143143
}
@@ -168,7 +168,7 @@ private async Task<string> GetImageEditResponse(string description, string? defa
168168
}
169169

170170
provider = "openai";
171-
model = "gpt-image-1";
171+
model = "gpt-image-1-mini";
172172

173173
return (provider, model);
174174
}

src/Plugins/BotSharp.Plugin.FileHandler/Functions/GenerateImageFn.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private async Task<string> GetImageGenerationResponse(string description, string
101101
LlmConfig = new AgentLlmConfig
102102
{
103103
Provider = llmConfig?.Provider ?? "openai",
104-
Model = llmConfig?.Model ?? "gpt-4o-mini",
104+
Model = llmConfig?.Model ?? "gpt-5-mini",
105105
MaxOutputTokens = llmConfig?.MaxOutputTokens,
106106
ReasoningEffortLevel = llmConfig?.ReasoningEffortLevel
107107
}
@@ -132,7 +132,7 @@ private async Task<string> GetImageGenerationResponse(string description, string
132132
}
133133

134134
provider = "openai";
135-
model = "gpt-image-1";
135+
model = "gpt-image-1-mini";
136136

137137
return (provider, model);
138138
}

src/Plugins/BotSharp.Plugin.FileHandler/Helpers/AiResponseHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ internal static string GetDefaultResponse(IEnumerable<string> files)
2121

2222
internal static async Task<string> GetImageGenerationResponse(IServiceProvider services, Agent agent, string description)
2323
{
24-
var text = $"Please generate a user-friendly response from the following description to " +
25-
$"inform user that you have completed the required image: {description}";
24+
var text = $"Please generate a user-friendly and short response from the following description to " +
25+
$"inform user that the required image is generated : {description}";
2626

2727
var provider = agent?.LlmConfig?.Provider ?? "openai";
28-
var model = agent?.LlmConfig?.Model ?? "gpt-4o-mini";
28+
var model = agent?.LlmConfig?.Model ?? "gpt-5-mini";
2929
var completion = CompletionProvider.GetChatCompletion(services, provider: provider, model: model);
3030
var response = await completion.GetChatCompletions(agent, [new RoleDialogModel(AgentRole.User, text)]);
3131
return response.Content;

0 commit comments

Comments
 (0)