From 6a51855f193955925e295cf05574d46532f364b5 Mon Sep 17 00:00:00 2001
From: based <phrog@riseup.net>
Date: Wed, 27 Mar 2024 13:52:51 +1000
Subject: [PATCH] Update Makersuite models

---
 public/index.html        | 19 ++++++++++++++-----
 public/scripts/openai.js | 25 +++++++++++++++----------
 src/prompt-converters.js |  8 +++++++-
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/public/index.html b/public/index.html
index 751cce6b3..baf5c2d3d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2604,11 +2604,20 @@
                             <div>
                                 <h4 data-i18n="Google Model">Google Model</h4>
                                 <select id="model_google_select">
-                                    <option value="gemini-1.5-pro">Gemini 1.5 Pro</option>
-                                    <option value="gemini-pro">Gemini Pro</option>
-                                    <option value="gemini-pro-vision">Gemini Pro Vision</option>
-                                    <option value="text-bison-001">Bison Text</option>
-                                    <option value="chat-bison-001">Bison Chat</option>
+                                    <optgroup label="Latest">
+                                        <!-- Points to 1.0, no default 1.5 endpoint -->
+                                        <option value="gemini-pro">Gemini Pro</option>
+                                        <option value="gemini-pro-vision">Gemini Pro Vision</option>
+                                        <option value="gemini-ultra">Gemini Ultra</option>
+                                        <option value="text-bison-001">Bison Text</option>
+                                        <option value="chat-bison-001">Bison Chat</option>
+                                    </optgroup>
+                                    <optgroup label="Sub-versions">
+                                        <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro</option>
+                                        <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro</option>
+                                        <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision</option>
+                                        <option value="gemini-1.0-ultra-latest">Gemini 1.0 Ultra</option>
+                                    </optgroup>
                                 </select>
                             </div>
                         </form>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 5acecfe7d..3a722dc97 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -3507,11 +3507,11 @@ async function onModelChange() {
     if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
         if (oai_settings.max_context_unlocked) {
             $('#openai_max_context').attr('max', unlocked_max);
-        } else if (value === 'gemini-1.5-pro') {
+        } else if (value === 'gemini-1.5-pro-latest') {
             $('#openai_max_context').attr('max', max_1mil);
-        } else if (value === 'gemini-pro') {
+        } else if (value === 'gemini-ultra' || value === 'gemini-1.0-pro-latest' || value === 'gemini-pro' || value === 'gemini-1.0-ultra-latest') {
             $('#openai_max_context').attr('max', max_32k);
-        } else if (value === 'gemini-pro-vision') {
+        } else if (value === 'gemini-1.0-pro-vision-latest' || value === 'gemini-pro-vision') {
             $('#openai_max_context').attr('max', max_16k);
         } else {
             $('#openai_max_context').attr('max', max_8k);
@@ -3939,21 +3939,26 @@ export function isImageInliningSupported() {
         return false;
     }
 
-    const gpt4v = 'gpt-4-vision';
-    const geminiProV = 'gemini-pro-vision';
-    const claude = 'claude-3';
-
     if (!oai_settings.image_inlining) {
         return false;
     }
 
+    // gultra just isn't being offered as multimodal, thanks google.
+    const visionSupportedModels = [
+        'gpt-4-vision',
+        'gemini-1.0-pro-vision-latest',
+        'gemini-1.5-pro-latest',
+        'gemini-pro-vision',
+        'claude-3'
+    ];
+
     switch (oai_settings.chat_completion_source) {
         case chat_completion_sources.OPENAI:
-            return oai_settings.openai_model.includes(gpt4v);
+            return visionSupportedModels.some(model => oai_settings.openai_model.includes(model));
         case chat_completion_sources.MAKERSUITE:
-            return oai_settings.google_model.includes(geminiProV);
+            return visionSupportedModels.some(model => oai_settings.google_model.includes(model));
         case chat_completion_sources.CLAUDE:
-            return oai_settings.claude_model.includes(claude);
+            return visionSupportedModels.some(model => oai_settings.claude_model.includes(model));
         case chat_completion_sources.OPENROUTER:
             return !oai_settings.openrouter_force_instruct;
         case chat_completion_sources.CUSTOM:
diff --git a/src/prompt-converters.js b/src/prompt-converters.js
index 52161b661..3648fa1f8 100644
--- a/src/prompt-converters.js
+++ b/src/prompt-converters.js
@@ -196,7 +196,13 @@ function convertGooglePrompt(messages, model) {
     let lastRole = '';
     let currentText = '';
 
-    const isMultimodal = model === 'gemini-pro-vision';
+    const visionSupportedModels = [
+        'gemini-1.0-pro-vision-latest',
+        'gemini-1.5-pro-latest',
+        'gemini-pro-vision',
+    ];
+
+    const isMultimodal = visionSupportedModels.includes(model);
 
     if (isMultimodal) {
         const combinedText = messages.map((message) => {