diff --git a/public/scripts/extensions/caption/settings.html b/public/scripts/extensions/caption/settings.html index 52240e71b..b5baf27fc 100644 --- a/public/scripts/extensions/caption/settings.html +++ b/public/scripts/extensions/caption/settings.html @@ -65,6 +65,7 @@ + diff --git a/src/endpoints/google.js b/src/endpoints/google.js index 8ef0900a9..fcd253417 100644 --- a/src/endpoints/google.js +++ b/src/endpoints/google.js @@ -16,7 +16,7 @@ router.post('/caption-image', async (request, response) => { const base64Data = request.body.image.split(',')[1]; const apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.MAKERSUITE); const apiUrl = new URL(request.body.reverse_proxy || API_MAKERSUITE); - const model = request.body.model || 'gemini-pro-vision'; + const model = request.body.model || 'gemini-2.0-flash'; const url = `${apiUrl.origin}/v1beta/models/${model}:generateContent?key=${apiKey}`; const body = { contents: [{ @@ -30,7 +30,6 @@ router.post('/caption-image', async (request, response) => { }], }], safetySettings: GEMINI_SAFETY, - generationConfig: { maxOutputTokens: 1000 }, }; console.debug('Multimodal captioning request', model, body); diff --git a/src/prompt-converters.js b/src/prompt-converters.js index 904283263..8e47a0108 100644 --- a/src/prompt-converters.js +++ b/src/prompt-converters.js @@ -360,6 +360,7 @@ export function convertCohereMessages(messages, names) { */ export function convertGooglePrompt(messages, model, useSysPrompt, names) { const visionSupportedModels = [ + 'gemini-2.5-pro-preview-03-25', 'gemini-2.5-pro-exp-03-25', 'gemini-2.0-pro-exp', 'gemini-2.0-pro-exp-02-05',