auto route image generation to non streaming if n>1 to fix stream mode not support multiple image

sdcb · sdcb · commit 42b1773e8b71 · 2025-10-22T19:23:09.000+08:00
diff --git a/src/BE/DB/Enums/DBReasoningEffort.cs b/src/BE/DB/Enums/DBReasoningEffort.cs
@@ -30,7 +30,7 @@ public static class DBReasoningEffortExtensions
         DBReasoningEffort.Minimal => GeneratedImageQuality.Low, // treating minimal as low for image quality
         DBReasoningEffort.Low => GeneratedImageQuality.Low,
         DBReasoningEffort.Medium => GeneratedImageQuality.Medium,
-        DBReasoningEffort.High => GeneratedImageQuality.High,
+        DBReasoningEffort.High => new GeneratedImageQuality("high"),
         _ => throw new Exception($"Unknown DBReasoningEffort value: {effort}"),
     };
 
diff --git a/src/BE/Services/Models/ChatServices/OpenAI/Special/ImageGenerationService.cs b/src/BE/Services/Models/ChatServices/OpenAI/Special/ImageGenerationService.cs
@@ -37,6 +37,17 @@ public override async IAsyncEnumerable<ChatSegment> ChatStreamed(IReadOnlyList<C
         string prompt = GetPromptStatic(messages);
         ChatMessageContentPart[] images = GetImagesStatic(messages);
 
+        // 兼容 n>1 时不走 stream
+        int n = options.MaxOutputTokenCount ?? 1;
+        if (n > 1)
+        {
+            // fallback 到 Chat 方法
+            Console.WriteLine("ImageGenerationService.ChatStreamed: n > 1, fallback to non-streaming Chat method.");
+            ChatSegment result = await Chat(messages, options, cancellationToken);
+            yield return result;
+            yield break;
+        }
+
         ClientPipeline pipeline = imageClient.Pipeline;
 
         if (images.Length == 0)
@@ -46,7 +57,7 @@ public override async IAsyncEnumerable<ChatSegment> ChatStreamed(IReadOnlyList<C
             {
                 ["prompt"] = prompt,
                 ["model"] = Model.ApiModelId,
-                ["n"] = options.MaxOutputTokenCount ?? 1,
+                ["n"] = n,
                 ["stream"] = true,
                 ["partial_images"] = 3,
                 ["moderation"] = "low"
@@ -67,17 +78,6 @@ public override async IAsyncEnumerable<ChatSegment> ChatStreamed(IReadOnlyList<C
                     _ => throw new NotSupportedException($"Unsupported image size: {_imageSize}"),
                 };
             }
-            else
-            {
-                if (prompt.Contains("3:2"))
-                {
-                    requestBody["size"] = "1536x1024";
-                }
-                else if (prompt.Contains("2:3"))
-                {
-                    requestBody["size"] = "1024x1536";
-                }
-            }
 
             if (options.EndUserId != null)
             {
@@ -170,7 +170,7 @@ public override async Task<ChatSegment> Chat(IReadOnlyList<ChatMessage> messages
                     Quality = _reasoningEffort.ToGeneratedImageQuality(),
                     Size = _imageSize switch
                     {
-                        DBKnownImageSize.Default => prompt.Contains("3:2") ? GeneratedImageSize.W1536xH1024 : prompt.Contains("2:3") ? GeneratedImageSize.W1024xH1536 : null,
+                        DBKnownImageSize.Default => null,
                         DBKnownImageSize.W1024xH1024 => GeneratedImageSize.W1024xH1024,
                         DBKnownImageSize.W1536xH1024 => GeneratedImageSize.W1536xH1024,
                         DBKnownImageSize.W1024xH1536 => GeneratedImageSize.W1024xH1536,
@@ -297,17 +297,6 @@ private async Task<MultiPartFormDataBinaryContent> BuildImageEditFormAsync(
                 _ => throw new NotSupportedException($"Unsupported image size: {_imageSize}"),
             }, "size");
         }
-        else
-        {
-            if (prompt.Contains("3:2"))
-            {
-                form.Add("1536x1024", "size");
-            }
-            else if (prompt.Contains("2:3"))
-            {
-                form.Add("1024x1536", "size");
-            }
-        }
 
         if (options.EndUserId != null)
         {
