Gemini: Fix search tool is not supported when function tools are used

068c6bdccdab05ba6755d638f6fb96fb9ad0a289

Cohee <18619528+Cohee1207@users.noreply.github.com>

src/endpoints/backends/chat-completions.js+7 -4 Viewed

         const prompt = convertGooglePrompt(request.body.messages, model, useSystemPrompt, getPromptNames(request));
         const safetySettings = [...GEMINI_SAFETY, ...(useVertexAi ? VERTEX_SAFETY : [])];
 -        if (enableWebSearch && !enableImageModality && !isGemma && !isLearnLM && !noSearchModels.includes(model)) {
 -            tools.push({ google_search: {} });
 -        }
+-
         if (Array.isArray(request.body.tools) && request.body.tools.length > 0 && !enableImageModality && !isGemma) {
             const functionDeclarations = [];
             for (const tool of request.body.tools) {

+            }
+        }
 +        if (enableWebSearch && !enableImageModality && !isGemma && !isLearnLM && !noSearchModels.includes(model)) {
 +            // Tool use with function calling is unsupported
 +            if (!tools.some(t => t.function_declarations)) {
 +                tools.push({ google_search: {} });
 +            }
 +        }
++
         if (isThinkingConfigModel(model)) {
             const thinkingConfig = { includeThoughts: includeReasoning };