Move endpoint version to conifg. Refactor ugli model lists

61c7f53d22ce351e3d7fcbf4c3a3a0922de4acdc

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

Parents: acc05e633d0ae4f023a4ef0c36a2b369dce32f42

default/config.yaml+4 -0 Viewed

   # should be ideal for most use cases.
   # Any value other than a non-negative integer will be ignored and caching at depth will not be enabled.
   cachingAtDepth: -1
 +# -- GOOGLE GEMINI API CONFIGURATION --
 +gemini:
 +  # API endpoint version ("v1beta" or "v1alpha")
 +  apiVersion: 'v1beta'
 # -- SERVER PLUGIN CONFIGURATION --
 enableServerPlugins: false
 # Attempt to automatically update server plugins on startup

src/endpoints/backends/chat-completions.js+26 -23 Viewed

     const enableWebSearch = Boolean(request.body.enable_web_search);
     const requestImages = Boolean(request.body.request_images);
     const reasoningEffort = String(request.body.reasoning_effort);
 -    const isThinking = model.includes('thinking');
     const isGemma = model.includes('gemma');
     const isLearnLM = model.includes('learnlm');

     };
     function getGeminiBody() {
 +        // #region UGLY MODEL LISTS AREA
 +        const imageGenerationModels =  [
 +            'gemini-2.0-flash-exp',
 +            'gemini-2.0-flash-exp-image-generation',
 +        ];
++
 +        const blockNoneModels = [
 +            'gemini-1.5-pro-001',
 +            'gemini-1.5-flash-001',
 +            'gemini-1.5-flash-8b-exp-0827',
 +            'gemini-1.5-flash-8b-exp-0924',
 +        ];
++
 +        const thinkingBudgetModels = [
 +            'gemini-2.5-flash-preview-04-17',
 +        ];
 +        // #endregion
++
         if (!Array.isArray(generationConfig.stopSequences) || !generationConfig.stopSequences.length) {
             delete generationConfig.stopSequences;
+        }
         const useMultiModalenableImageModality = requestImages && ['gemini-2.0-flash-exp', 'gemini-2.0-flash-exp-image-generation']imageGenerationModels.includes(model);
         if (useMultiModalenableImageModality) {
             generationConfig.responseModalities = ['text', 'image'];
+        }
         const useSystemPrompt = !useMultiModalenableImageModality && (!isGemma && request.body.use_makersuite_sysprompt;
 -            model.includes('gemini-2.5-pro') ||
 -            model.includes('gemini-2.5-flash') ||
 -            model.includes('gemini-2.0-pro') ||
 -            model.includes('gemini-2.0-flash') ||
 -            model.includes('gemini-1.5-pro') ||
 -            model.includes('gemini-1.5-flash') ||
 -            model.includes('learnlm') ||
 -            model.startsWith('gemini-exp')
 -        ) && request.body.use_makersuite_sysprompt;
         const tools = [];
         const prompt = convertGooglePrompt(request.body.messages, model, useSystemPrompt, getPromptNames(request));
         let safetySettings = GEMINI_SAFETY;
         // These models do not support setting the threshold to OFF at all.
 -        if (['gemini-1.5-pro-001', 'gemini-1.5-flash-001', 'gemini-1.5-flash-8b-exp-0827', 'gemini-1.5-flash-8b-exp-0924'].includes(model)) {
 +        if (blockNoneModels.includes(model)) {
             safetySettings = GEMINI_SAFETY.map(setting => ({ ...setting, threshold: 'BLOCK_NONE' }));
+        }
         if (enableWebSearch && !useMultiModalenableImageModality && !isGemma && !isLearnLM && !model.includes('gemini-2.0-flash-lite')) {
             const searchTool = model.includes('1.5') || model.includes('1.0')
                 ? ({ google_search_retrieval: {} })
                 : ({ google_search: {} });
             tools.push(searchTool);
+        }
         if (Array.isArray(request.body.tools) && request.body.tools.length > 0 && !useMultiModalenableImageModality && !isGemma) {
             const functionDeclarations = [];
             for (const tool of request.body.tools) {
                 if (tool.type === 'function') {

             tools.push({ function_declarations: functionDeclarations });
+        }
 -        // One more models list to maintain, yay
 -        const thinkingBudgetModels = [
 -            'gemini-2.5-flash-preview-04-17',
 -        ];
+-
         if (thinkingBudgetModels.includes(model)) {
             const thinkingBudget = calculateGoogleBudgetTokens(generationConfig.maxOutputTokens, reasoningEffort);

             controller.abort();
         });
         const apiVersion = isThinking ? getConfigValue('v1alphagemini.apiVersion' :, 'v1beta');
         const responseType = (stream ? 'streamGenerateContent' : 'generateContent');
         const generateResponse = await fetch(`${apiUrl.toString().replace(/\/$/, '')}/${apiVersion}/models/${model}:${responseType}?key=${apiKey}${stream ? '&alt=sse' : ''}`, {