From fc09be75a6adc26f261bcac065fbe600ce0c46ad Mon Sep 17 00:00:00 2001
From: cloak1505 <170299980+cloak1505@users.noreply.github.com>
Date: Sat, 26 Apr 2025 17:54:34 -0500
Subject: [PATCH] Almost done with Google pruning

* Put back 1.5-latest
* Put back missing flash 002 (same deal about safetySettings like pro 001 vs 002)
* Remove dead models and gemma from BLOCK_NONE check
---
 public/index.html                               | 11 +++++------
 public/scripts/extensions/caption/settings.html |  3 +++
 src/endpoints/backends/chat-completions.js      |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/index.html b/public/index.html
index 361cd5299..6853b8c89 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3153,22 +3153,21 @@
                                         <option value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
                                         <option value="gemini-2.0-flash-exp-image-generation">gemini-2.0-flash-exp-image-generation</option>
                                         <option value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
+                                        <option value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
                                         <option value="gemini-1.5-pro-002">gemini-1.5-pro-002</option>
+                                        <option value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
+                                        <option value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
+                                        <option value="gemini-1.5-flash-002">gemini-1.5-flash-002</option>
                                         <option value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
                                         <option value="gemini-1.5-flash-8b-001">gemini-1.5-flash-8b-001</option>
                                     </optgroup>
-                                    <!-- When a model updates, add NEW version to ABOVE and move OLD to BELOW -->
-                                    <optgroup label="Previous">
-                                        <option value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
-                                    </optgroup>
-                                    <!-- Updates to Gemma and Preview groups will be handled differently -->
                                     <optgroup label="Gemma">
                                         <option value="gemma-3-27b-it">gemma-3-27b-it</option>
                                         <option value="gemma-3-12b-it">gemma-3-12b-it</option>
                                         <option value="gemma-3-4b-it">gemma-3-4b-it</option>
                                         <option value="gemma-3-1b-it">gemma-3-1b-it</option>
                                     </optgroup>
-                                    <optgroup label="Preview">
+                                    <optgroup label="LearnLM">
                                         <option value="learnlm-2.0-flash-experimental">learnlm-2.0-flash-experimental</option>
                                         <option value="learnlm-1.5-pro-experimental">learnlm-1.5-pro-experimental</option>
                                     </optgroup>
diff --git a/public/scripts/extensions/caption/settings.html b/public/scripts/extensions/caption/settings.html
index 815d29360..43c143cf5 100644
--- a/public/scripts/extensions/caption/settings.html
+++ b/public/scripts/extensions/caption/settings.html
@@ -83,8 +83,11 @@
                         <option data-type="google" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
                         <option data-type="google" value="gemini-2.0-flash-exp-image-generation">gemini-2.0-flash-exp-image-generation</option>
                         <option data-type="google" value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
+                        <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
                         <option data-type="google" value="gemini-1.5-pro-002">gemini-1.5-pro-002</option>
                         <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
+                        <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
+                        <option data-type="google" value="gemini-1.5-flash-002">gemini-1.5-flash-002</option>
                         <option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
                         <option data-type="google" value="gemini-1.5-flash-8b-001">gemini-1.5-flash-8b-001</option>
                         <option data-type="google" value="learnlm-2.0-flash-experimental">learnlm-2.0-flash-experimental</option>
diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index 6c238eccc..4680a20df 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -384,7 +384,7 @@ async function sendMakerSuiteRequest(request, response) {
         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', 'gemini-pro', 'gemini-1.0-pro', 'gemini-1.0-pro-001', 'gemma-3-27b-it'].includes(model)) {
+        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)) {
             safetySettings = GEMINI_SAFETY.map(setting => ({ ...setting, threshold: 'BLOCK_NONE' }));
         }
         // Interestingly, Gemini 2.0 Flash does support setting the threshold for HARM_CATEGORY_CIVIC_INTEGRITY to OFF.