Move supported content type into ChatCompletionService layer, fix gemini-2.0-flash-exp

sdcb · sdcb · commit c3152333c8ed · 2025-11-06T20:01:53.000+08:00
diff --git a/src/BE/Services/Models/ChatServices/ChatService.cs b/src/BE/Services/Models/ChatServices/ChatService.cs
@@ -64,7 +64,7 @@ protected virtual async Task<ChatMessage[]> FEPreprocess(IReadOnlyList<ChatMessa
             SetReasoningEffort(options, feOptions.ReasoningEffort);
         }
 
-        if (!string.IsNullOrEmpty(feOptions.ImageSize))
+        if (!string.IsNullOrEmpty(feOptions.ImageSize) && Model.GetSupportedImageSizesAsArray(Model.SupportedImageSizes).Any())
         {
             SetImageSize(options, feOptions.ImageSize);
         }
diff --git a/src/BE/Services/Models/ChatServices/ChatServiceExtensions.cs b/src/BE/Services/Models/ChatServices/ChatServiceExtensions.cs
@@ -76,10 +76,7 @@ public async IAsyncEnumerable<InternalChatSegment> ChatStreamedSimulated(bool su
     protected virtual bool SupportsVisionLink => true;
     protected virtual HashSet<string> SupportedContentTypes =>
     [
-        "image/jpeg",
-        "image/png",
-        "image/gif",
-        "image/webp",
+        "*"
     ];
 
     protected virtual async Task<ChatMessage> FilterVision(bool allowVision, ChatMessage message, FileUrlProvider fup, CancellationToken cancellationToken)
@@ -95,7 +92,7 @@ protected virtual async Task<ChatMessage> FilterVision(bool allowVision, ChatMes
                 {
                     true => scfp.File.FileContentType.ContentType switch
                     {
-                        var x when SupportedContentTypes.Contains(x) => SupportsVisionLink switch
+                        var x when SupportedContentTypes.Contains("*") || SupportedContentTypes.Contains(x) => SupportsVisionLink switch
                         {
                             true => await fup.CreateOpenAIImagePart(scfp.File, cancellationToken),
                             false => await fup.CreateOpenAIImagePartForceDownload(scfp.File, cancellationToken),
diff --git a/src/BE/Services/Models/ChatServices/GoogleAI/GoogleAI2ChatService.cs b/src/BE/Services/Models/ChatServices/GoogleAI/GoogleAI2ChatService.cs
@@ -23,7 +23,6 @@ public class GoogleAI2ChatService : ChatService
         new SafetySetting { Category = HarmCategory.HarmCategoryDangerousContent, Threshold = HarmBlockThreshold.BlockNone },
         new SafetySetting { Category = HarmCategory.HarmCategoryHarassment, Threshold = HarmBlockThreshold.BlockNone },
     ];
-    private DBReasoningEffort _reasoningEffort = default;
 
     protected override bool SupportsVisionLink => false;
 
@@ -61,9 +60,9 @@ public override async IAsyncEnumerable<ChatSegment> ChatStreamed(IReadOnlyList<C
         {
             gc.ThinkingConfig = new ThinkingConfig
             {
-                ThinkingBudget = _reasoningEffort switch
+                ThinkingBudget = options.ReasoningEffortLevel switch
                 {
-                    var x when x.IsLowOrMinimal() => 1024,
+                    var x when x == ChatReasoningEffortLevel.Minimal || x == ChatReasoningEffortLevel.Low => 1024,
                     _ => null,
                 },
                 IncludeThoughts = true,
@@ -90,7 +89,7 @@ var x when x.IsLowOrMinimal() => 1024,
             SystemInstruction = OpenAIChatMessageToGoogleContent(messages.Where(x => x is SystemChatMessage)) switch { [] => null, var x => x[0] },
             GenerationConfig = gc,
             SafetySettings = _safetySettings,
-            Tools = tool == null ? null : [tool],
+            Tools = Model.AllowToolCall && tool != null ? [tool] : null,
         };
         Stopwatch codeExecutionSw = new();
         string? codeExecutionId = null;
diff --git a/src/BE/Services/Models/ChatServices/OpenAI/ChatCompletionService.cs b/src/BE/Services/Models/ChatServices/OpenAI/ChatCompletionService.cs
@@ -15,6 +15,14 @@ public ChatCompletionService(Model model, Uri? suggestedApiUrl = null, params Pi
     {
     }
 
+    protected override HashSet<string> SupportedContentTypes =>
+    [
+        "image/jpeg",
+        "image/png",
+        "image/gif",
+        "image/webp",
+    ];
+
     private static ChatClient CreateChatClient(Model model, Uri? suggestedApiUrl, PipelinePolicy[] perCallPolicies)
     {
         OpenAIClient api = CreateOpenAIClient(model.ModelKey, suggestedApiUrl, perCallPolicies);

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected virtual async Task<ChatMessage[]> FEPreprocess(IReadOnlyList<ChatMessa`
`64`	`64`	`SetReasoningEffort(options, feOptions.ReasoningEffort);`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (!string.IsNullOrEmpty(feOptions.ImageSize))`
	`67`	`+ if (!string.IsNullOrEmpty(feOptions.ImageSize) && Model.GetSupportedImageSizesAsArray(Model.SupportedImageSizes).Any())`
`68`	`68`	`{`
`69`	`69`	`SetImageSize(options, feOptions.ImageSize);`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,7 @@ public async IAsyncEnumerable<InternalChatSegment> ChatStreamedSimulated(bool su`
`76`	`76`	`protected virtual bool SupportsVisionLink => true;`
`77`	`77`	`protected virtual HashSet<string> SupportedContentTypes =>`
`78`	`78`	`[`
`79`		`- "image/jpeg",`
`80`		`- "image/png",`
`81`		`- "image/gif",`
`82`		`- "image/webp",`
	`79`	`+ "*"`
`83`	`80`	`];`
`84`	`81`
`85`	`82`	`protected virtual async Task<ChatMessage> FilterVision(bool allowVision, ChatMessage message, FileUrlProvider fup, CancellationToken cancellationToken)`
`@@ -95,7 +92,7 @@ protected virtual async Task<ChatMessage> FilterVision(bool allowVision, ChatMes`
`95`	`92`	`{`
`96`	`93`	`true => scfp.File.FileContentType.ContentType switch`
`97`	`94`	`{`
`98`		`- var x when SupportedContentTypes.Contains(x) => SupportsVisionLink switch`
	`95`	`+ var x when SupportedContentTypes.Contains("*") \|\| SupportedContentTypes.Contains(x) => SupportsVisionLink switch`
`99`	`96`	`{`
`100`	`97`	`true => await fup.CreateOpenAIImagePart(scfp.File, cancellationToken),`
`101`	`98`	`false => await fup.CreateOpenAIImagePartForceDownload(scfp.File, cancellationToken),`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,14 @@ public ChatCompletionService(Model model, Uri? suggestedApiUrl = null, params Pi`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ protected override HashSet<string> SupportedContentTypes =>`
	`19`	`+ [`
	`20`	`+ "image/jpeg",`
	`21`	`+ "image/png",`
	`22`	`+ "image/gif",`
	`23`	`+ "image/webp",`
	`24`	`+ ];`
	`25`	`+`
`18`	`26`	`private static ChatClient CreateChatClient(Model model, Uri? suggestedApiUrl, PipelinePolicy[] perCallPolicies)`
`19`	`27`	`{`
`20`	`28`	`OpenAIClient api = CreateOpenAIClient(model.ModelKey, suggestedApiUrl, perCallPolicies);`