diff --git a/default/content/presets/openai/Default.json b/default/content/presets/openai/Default.json index 0a84299d7..10a9826d1 100644 --- a/default/content/presets/openai/Default.json +++ b/default/content/presets/openai/Default.json @@ -1,7 +1,7 @@ { "chat_completion_source": "openai", "openai_model": "gpt-4-turbo", - "claude_model": "claude-3-5-sonnet-20240620", + "claude_model": "claude-sonnet-4-5", "openrouter_model": "OR_Website", "openrouter_use_fallback": false, "openrouter_group_models": false, @@ -16,8 +16,8 @@ "custom_include_body": "", "custom_exclude_body": "", "custom_include_headers": "", - "google_model": "gemini-pro", - "vertexai_model": "gemini-2.0-flash-001", + "google_model": "gemini-2.5-pro", + "vertexai_model": "gemini-2.5-pro", "temperature": 1, "frequency_penalty": 0, "presence_penalty": 0, diff --git a/default/content/settings.json b/default/content/settings.json index 4bd8e9ff5..d827fbeed 100644 --- a/default/content/settings.json +++ b/default/content/settings.json @@ -620,7 +620,7 @@ }, "wi_format": "{0}", "openai_model": "gpt-4-turbo", - "claude_model": "claude-3-5-sonnet-20240620", + "claude_model": "claude-sonnet-4-5", "ai21_model": "jamba-large", "openrouter_model": "OR_Website", "reverse_proxy": "", diff --git a/public/index.html b/public/index.html index be9f3ddeb..b34b87d22 100644 --- a/public/index.html +++ b/public/index.html @@ -3156,46 +3156,32 @@ - + - + + - - - + + + - - - + + + - - - - - - - - - - - - - - - @@ -3207,6 +3193,9 @@ + + + @@ -3332,15 +3321,9 @@ - - - - - - - + diff --git a/public/scripts/extensions/caption/settings.html b/public/scripts/extensions/caption/settings.html index 4600c86f9..32a67056f 100644 --- a/public/scripts/extensions/caption/settings.html +++ b/public/scripts/extensions/caption/settings.html @@ -101,49 +101,33 @@ - + - + + - - - + + + - - - + + + - - - - - - - - - - - - - + - - - - - - + diff --git a/public/scripts/openai.js b/public/scripts/openai.js index 902f1b0ec..696431686 100644 --- a/public/scripts/openai.js +++ b/public/scripts/openai.js @@ -372,9 +372,9 @@ const default_settings = { scenario_format: default_scenario_format, personality_format: default_personality_format, openai_model: 'gpt-4-turbo', - claude_model: 'claude-3-5-sonnet-20240620', - google_model: 'gemini-1.5-pro', - vertexai_model: 'gemini-2.0-flash-001', + claude_model: 'claude-sonnet-4-5', + google_model: 'gemini-2.5-pro', + vertexai_model: 'gemini-2.5-pro', ai21_model: 'jamba-large', mistralai_model: 'mistral-large-latest', cohere_model: 'command-r-plus', @@ -468,9 +468,9 @@ const oai_settings = { scenario_format: default_scenario_format, personality_format: default_personality_format, openai_model: 'gpt-4-turbo', - claude_model: 'claude-3-5-sonnet-20240620', - google_model: 'gemini-1.5-pro', - vertexai_model: 'gemini-2.0-flash-001', + claude_model: 'claude-sonnet-4-5', + google_model: 'gemini-2.5-pro', + vertexai_model: 'gemini-2.5-pro', ai21_model: 'jamba-large', mistralai_model: 'mistral-large-latest', cohere_model: 'command-r-plus', @@ -4981,17 +4981,15 @@ async function onModelChange() { if ([chat_completion_sources.MAKERSUITE, chat_completion_sources.VERTEXAI].includes(oai_settings.chat_completion_source)) { if (oai_settings.max_context_unlocked) { $('#openai_max_context').attr('max', max_2mil); - } else if (value.includes('gemini-1.5-pro')) { - $('#openai_max_context').attr('max', max_2mil); - } else if (value.includes('gemini-2.5-flash-image-preview')) { + } else if (value.includes('gemini-2.5-flash-image')) { $('#openai_max_context').attr('max', max_32k); - } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash') || value.includes('gemini-2.0-pro') || value.includes('gemini-exp') || value.includes('gemini-2.5-flash') || value.includes('gemini-2.5-pro') || value.includes('learnlm-2.0-flash')) { + } else if (value.includes('gemini-2.0-flash') || value.includes('gemini-2.0-pro') || value.includes('gemini-exp') || value.includes('gemini-2.5-flash') || value.includes('gemini-2.5-pro') || value.includes('learnlm-2.0-flash') || value.includes('gemini-robotics')) { $('#openai_max_context').attr('max', max_1mil); } else if (value.includes('gemma-3-27b-it')) { $('#openai_max_context').attr('max', max_128k); } else if (value.includes('gemma-3n-e4b-it')) { $('#openai_max_context').attr('max', max_8k); - } else if (value.includes('gemma-3') || value.includes('learnlm-1.5-pro-experimental')) { + } else if (value.includes('gemma-3')) { $('#openai_max_context').attr('max', max_32k); } else { $('#openai_max_context').attr('max', max_32k); @@ -5754,11 +5752,11 @@ export function isImageInliningSupported() { 'c4ai-aya-vision', 'command-a-vision', // Google AI Studio - 'gemini-1.5', 'gemini-2.0', 'gemini-2.5', 'gemini-exp-1206', 'learnlm', + 'gemini-robotics', // MistralAI 'mistral-small-2503', 'mistral-small-2506', diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js index 2511e039b..aab2c0fda 100644 --- a/src/endpoints/backends/chat-completions.js +++ b/src/endpoints/backends/chat-completions.js @@ -377,24 +377,16 @@ async function sendMakerSuiteRequest(request, response) { 'gemini-2.0-flash-exp-image-generation', 'gemini-2.0-flash-preview-image-generation', 'gemini-2.5-flash-image-preview', + 'gemini-2.5-flash-image', ]; - // These models do not support setting the threshold to OFF at all. - 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 isThinkingConfigModel = m => /^gemini-2.5-(flash|pro)/.test(m) && !/-image-preview$/.test(m); + const isThinkingConfigModel = m => /^gemini-2.5-(flash|pro)/.test(m) && !/-image(-preview)?$/.test(m); const noSearchModels = [ 'gemini-2.0-flash-lite', 'gemini-2.0-flash-lite-001', 'gemini-2.0-flash-lite-preview-02-05', - 'gemini-1.5-flash-8b-exp-0924', - 'gemini-1.5-flash-8b-exp-0827', + 'gemini-robotics-er-1.5-preview', ]; // #endregion @@ -413,15 +405,8 @@ async function sendMakerSuiteRequest(request, response) { const prompt = convertGooglePrompt(request.body.messages, model, useSystemPrompt, getPromptNames(request)); let safetySettings = GEMINI_SAFETY; - if (blockNoneModels.includes(model)) { - safetySettings = GEMINI_SAFETY.map(setting => ({ ...setting, threshold: 'BLOCK_NONE' })); - } - if (enableWebSearch && !enableImageModality && !isGemma && !isLearnLM && !noSearchModels.includes(model)) { - const searchTool = model.includes('1.5') - ? ({ google_search_retrieval: {} }) - : ({ google_search: {} }); - tools.push(searchTool); + tools.push({ google_search: {} }); } if (Array.isArray(request.body.tools) && request.body.tools.length > 0 && !enableImageModality && !isGemma) {