Vision models clean-up

65aec223a310ac6f13de898500a8a1538089b0fd

equal-l2 <eng.equall2@gmail.com>

2 files changed, +27 -84Ignore whitespace
public/scripts/openai.js+22 -54
@@ -5098,68 +5098,36 @@ export function isImageInliningSupported() {
50985098
50995099 // gultra just isn't being offered as multimodal, thanks google.
51005100 const visionSupportedModels = [
5101- 'gpt-4-vision',
5101+ // OpenAI
5102- 'gemini-2.5-pro-exp-03-25',
5102+ 'chatgpt-4o-latest',
5103- 'gemini-2.5-pro-preview-03-25',
5104- 'gemini-2.0-pro-exp',
5105- 'gemini-2.0-pro-exp-02-05',
5106- 'gemini-2.5-flash-preview-04-17',
5107- 'gemini-2.0-flash-lite-preview',
5108- 'gemini-2.0-flash-lite-preview-02-05',
5109- 'gemini-2.0-flash',
5110- 'gemini-2.0-flash-001',
5111- 'gemini-2.0-flash-thinking-exp-1219',
5112- 'gemini-2.0-flash-thinking-exp-01-21',
5113- 'gemini-2.0-flash-thinking-exp',
5114- 'gemini-2.0-flash-exp',
5115- 'gemini-2.0-flash-exp-image-generation',
5116- 'gemini-1.5-flash',
5117- 'gemini-1.5-flash-latest',
5118- 'gemini-1.5-flash-001',
5119- 'gemini-1.5-flash-002',
5120- 'gemini-1.5-flash-exp-0827',
5121- 'gemini-1.5-flash-8b',
5122- 'gemini-1.5-flash-8b-exp-0827',
5123- 'gemini-1.5-flash-8b-exp-0924',
5124- 'gemini-exp-1114',
5125- 'gemini-exp-1121',
5126- 'gemini-exp-1206',
5127- 'gemini-1.0-pro-vision-latest',
5128- 'gemini-1.5-pro',
5129- 'gemini-1.5-pro-latest',
5130- 'gemini-1.5-pro-001',
5131- 'gemini-1.5-pro-002',
5132- 'gemini-1.5-pro-exp-0801',
5133- 'gemini-1.5-pro-exp-0827',
5134- 'claude-3',
5135- 'claude-3-5',
5136- 'claude-3-7',
51375103 'gpt-4-turbo',
51385104 'gpt-4o4-vision',
51395105 'gpt-4o-mini4.1',
51405106 'gpt-4.5-preview',
51415107 'gpt-4.5-preview-2025-02-274o',
51425108 'o1',
51435109 'o1-2024-12-17o3',
51445110 'chatgpt-4oo4-latestmini',
5111+ // 01.AI (Yi)
51455112 'yi-vision',
5146- 'mistral-large-pixtral-2411',
5113+ // Claude
5114+ 'claude-3',
5115+ // Cohere
5116+ 'c4ai-aya-vision',
5117+ // Google AI Studio
5118+ 'gemini-1.5',
5119+ 'gemini-2.0',
5120+ 'gemini-2.5',
5121+ 'gemini-exp-1114',
5122+ 'gemini-exp-1121',
5123+ 'gemini-exp-1206',
5124+ // MistralAI
51475125 'mistral-small-2503',
51485126 'mistral-small-latest',
51495127 'pixtral-12b-latest',
5150- 'pixtral-12b',
5128+ // xAI (Grok)
5151- 'pixtral-12b-2409',
5152- 'pixtral-large-latest',
5153- 'pixtral-large-2411',
5154- 'c4ai-aya-vision-8b',
5155- 'c4ai-aya-vision-32b',
51565129 'grok-2-vision',
51575130 'grok-vision',
5158- 'gpt-4.1',
5159- 'o3',
5160- 'o3-2025-04-16',
5161- 'o4-mini',
5162- 'o4-mini-2025-04-16',
51635131 ];
51645132
51655133 switch (oai_settings.chat_completion_source) {
src/prompt-converters.js+5 -30
@@ -359,41 +359,16 @@ export function convertCohereMessages(messages, names) {
359359 * @returns {{contents: *[], system_instruction: {parts: {text: string}}}} Prompt for Google MakerSuite models
360360 */
361361export function convertGooglePrompt(messages, model, useSysPrompt, names) {
362362 const visionSupportedModelsvisionSupportedModelPrefix = [
363363 'gemini-21.5-pro-preview-03-25',
364364 'gemini-2.5-pro-exp-03-250',
365365 'gemini-2.0-pro-exp5',
366- 'gemini-2.0-pro-exp-02-05',
367- 'gemini-2.5-flash-preview-04-17',
368- 'gemini-2.0-flash-lite-preview',
369- 'gemini-2.0-flash-lite-preview-02-05',
370- 'gemini-2.0-flash',
371- 'gemini-2.0-flash-001',
372- 'gemini-2.0-flash-thinking-exp',
373- 'gemini-2.0-flash-thinking-exp-01-21',
374- 'gemini-2.0-flash-thinking-exp-1219',
375- 'gemini-2.0-flash-exp',
376- 'gemini-2.0-flash-exp-image-generation',
377- 'gemini-1.5-flash',
378- 'gemini-1.5-flash-latest',
379- 'gemini-1.5-flash-001',
380- 'gemini-1.5-flash-002',
381- 'gemini-1.5-flash-exp-0827',
382- 'gemini-1.5-flash-8b',
383- 'gemini-1.5-flash-8b-exp-0827',
384- 'gemini-1.5-flash-8b-exp-0924',
385366 'gemini-exp-1114',
386367 'gemini-exp-1121',
387368 'gemini-exp-1206',
388- 'gemini-1.5-pro',
389- 'gemini-1.5-pro-latest',
390- 'gemini-1.5-pro-001',
391- 'gemini-1.5-pro-002',
392- 'gemini-1.5-pro-exp-0801',
393- 'gemini-1.5-pro-exp-0827',
394369 ];
395370
396371 const isMultimodal = visionSupportedModelsvisionSupportedModelPrefix.includessome(prefix => model.startsWith(prefix));
397372
398373 let sys_prompt = '';
399374 if (useSysPrompt) {