Skip to content

Commit bb9feb2

Browse files
committed
minor change
1 parent 1d687a3 commit bb9feb2

File tree

5 files changed

+29
-27
lines changed

5 files changed

+29
-27
lines changed

src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ public async Task<ImageGenerationViewModel> ImageVariation([FromBody] IncomingMe
141141
try
142142
{
143143
var file = input.Files.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.FileUrl) || !string.IsNullOrWhiteSpace(x.FileData));
144+
if (file == null)
145+
{
146+
return new ImageGenerationViewModel { Message = "Error! Cannot find an image!" };
147+
}
144148
var message = await fileService.VarifyImage(input.Provider, input.Model, file);
145149
imageViewModel.Content = message.Content;
146150
imageViewModel.Images = message.GeneratedImages.Select(x => ImageViewModel.ToViewModel(x)).ToList();

src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Image/ImageCompletionProvider.Generation.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ public async Task<RoleDialogModel> GetImageGeneration(Agent agent, RoleDialogMod
5353
var prompt = message?.Payload ?? message?.Content ?? string.Empty;
5454

5555
var state = _services.GetRequiredService<IConversationStateService>();
56-
var size = state.GetState("image_size");
57-
var quality = state.GetState("image_quality");
58-
var style = state.GetState("image_style");
59-
var format = state.GetState("image_format");
56+
var size = GetImageSize(state.GetState("image_size"));
57+
var quality = GetImageQuality(state.GetState("image_quality"));
58+
var style = GetImageStyle(state.GetState("image_style"));
59+
var format = GetImageFormat(state.GetState("image_format"));
6060
var count = GetImageCount(state.GetState("image_count", "1"));
6161

6262
var options = new ImageGenerationOptions
6363
{
64-
Size = GetImageSize(size),
65-
Quality = GetImageQuality(quality),
66-
Style = GetImageStyle(style),
67-
ResponseFormat = GetImageFormat(format)
64+
Size = size,
65+
Quality = quality,
66+
Style = style,
67+
ResponseFormat = format
6868
};
6969
return (prompt, count, options);
7070
}

src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Image/ImageCompletionProvider.Variation.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ public async Task<RoleDialogModel> GetImageVariation(Agent agent, RoleDialogMode
5151
private (int, ImageVariationOptions) PrepareOptions()
5252
{
5353
var state = _services.GetRequiredService<IConversationStateService>();
54-
var size = state.GetState("image_size");
55-
var format = state.GetState("image_format");
54+
var size = GetImageSize(state.GetState("image_size"));
55+
var format = GetImageFormat(state.GetState("image_format"));
5656
var count = GetImageCount(state.GetState("image_count", "1"));
5757

5858
var options = new ImageVariationOptions
5959
{
60-
Size = GetImageSize(size),
61-
ResponseFormat = GetImageFormat(format)
60+
Size = size,
61+
ResponseFormat = format
6262
};
6363
return (count, options);
6464
}

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,19 @@ public async Task<RoleDialogModel> GetImageGeneration(Agent agent, RoleDialogMod
5353
var prompt = message?.Payload ?? message?.Content ?? string.Empty;
5454

5555
var state = _services.GetRequiredService<IConversationStateService>();
56-
var size = state.GetState("image_size");
57-
var quality = state.GetState("image_quality");
58-
var style = state.GetState("image_style");
59-
var format = state.GetState("image_format");
56+
var size = GetImageSize(state.GetState("image_size"));
57+
var quality = GetImageQuality(state.GetState("image_quality"));
58+
var style = GetImageStyle(state.GetState("image_style"));
59+
var format = GetImageFormat(state.GetState("image_format"));
6060
var count = GetImageCount(state.GetState("image_count", "1"));
6161

6262
var options = new ImageGenerationOptions
6363
{
64-
Size = GetImageSize(size),
65-
Quality = GetImageQuality(quality),
66-
Style = GetImageStyle(style),
67-
ResponseFormat = GetImageFormat(format)
64+
Size = size,
65+
Quality = quality,
66+
Style = style,
67+
ResponseFormat = format
6868
};
6969
return (prompt, count, options);
7070
}
71-
72-
7371
}

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public async Task<RoleDialogModel> GetImageVariation(Agent agent, RoleDialogMode
1010
var (imageCount, options) = PrepareOptions();
1111
var imageClient = client.GetImageClient(_model);
1212

13-
var response = imageClient.GenerateImageVariations(image, imageFileName, imageCount, options);
13+
var response = await imageClient.GenerateImageVariationsAsync(image, imageFileName, imageCount, options);
1414
var values = response.Value;
1515

1616
var generatedImages = new List<ImageGeneration>();
@@ -51,14 +51,14 @@ public async Task<RoleDialogModel> GetImageVariation(Agent agent, RoleDialogMode
5151
private (int, ImageVariationOptions) PrepareOptions()
5252
{
5353
var state = _services.GetRequiredService<IConversationStateService>();
54-
var size = state.GetState("image_size");
55-
var format = state.GetState("image_format");
54+
var size = GetImageSize(state.GetState("image_size"));
55+
var format = GetImageFormat(state.GetState("image_format"));
5656
var count = GetImageCount(state.GetState("image_count", "1"));
5757

5858
var options = new ImageVariationOptions
5959
{
60-
Size = GetImageSize(size),
61-
ResponseFormat = GetImageFormat(format)
60+
Size = size,
61+
ResponseFormat = format
6262
};
6363
return (count, options);
6464
}

0 commit comments

Comments
 (0)