Merge pull request #4113 from InterestingDarknessII/google-dynamic-model Implement Google AI Studio model list dynamic fetching

88cd8bbbf3b46dc714babf4815312798f2398bc9

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: 63b4896d5657a844b7a2c9f7e78b05cbd88ef23d a106602f254713351e6f2cf47397dff53a307ada

public/index.html+1 -0 Viewed

                                     <optgroup label="LearnLM">
                                         <option value="learnlm-2.0-flash-experimental">learnlm-2.0-flash-experimental</option>
                                     </optgroup>
+                                    <optgroup id="google_other_models" label="Other"></optgroup>
                                 </select>
                             </div>
                         </form>

public/scripts/openai.js+30 -1 Viewed

         $('#model_pollinations_select').val(oai_settings.pollinations_model).trigger('change');
+    }
+    if (oai_settings.chat_completion_source === chat_completion_sources.MAKERSUITE) {
+        // Clear only the "Other" optgroup for dynamic models
+        $('#google_other_models').empty();
+        // Get static model options that are already in the HTML
+        const staticModels = [];
+        $('#model_google_select option').each(function() {
+            staticModels.push($(this).val());
+        });
+        // Add dynamic models to the "Other" group
+        model_list.forEach((model) => {
+            // Only add if not already in static list
+            if (!staticModels.includes(model.id)) {
+                $('#google_other_models').append(
+                    $('<option>', {
+                        value: model.id,
+                        text: model.id,
+                    }));
+            }
+        });
+        const selectedModel = model_list.find(model => model.id === oai_settings.google_model);
+        if (model_list.length > 0 && (!selectedModel || !oai_settings.google_model)) {
+            oai_settings.google_model = model_list[0].id;
+        }
+        $('#model_google_select').val(oai_settings.google_model).trigger('change');
+    }
+}
 function appendOpenRouterOptions(model_list, groupModels = false, sort = false) {

         chat_completion_sources.SCALE,
         chat_completion_sources.CLAUDE,
         chat_completion_sources.AI21,
-        chat_completion_sources.MAKERSUITE,
         chat_completion_sources.VERTEXAI,
         chat_completion_sources.PERPLEXITY,
         chat_completion_sources.GROQ,

src/endpoints/backends/chat-completions.js+43 -0 Viewed

         api_url = 'https://text.pollinations.ai';
         api_key_openai = 'NONE';
         headers = {};
+    } else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.MAKERSUITE) {
+        // For Google AI Studio, we need to get models from the API
+        const api_key_makersuite = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.MAKERSUITE);
+        const api_url = new URL(request.body.reverse_proxy || API_MAKERSUITE);
+        const apiVersion = getConfigValue('gemini.apiVersion', 'v1beta');
+        let models_url = `${api_url.origin}/${apiVersion}/models?key=${api_key_makersuite}`;
+        if (!api_key_makersuite && request.body.reverse_proxy) {
+            models_url = `${api_url.origin}/${apiVersion}/models`; // For some special reverse proxy, we can't pass the API key
+        } else if (!api_key_makersuite && !request.body.reverse_proxy) {
+            console.warn('Google AI Studio API key is missing.');
+            return response_getstatus_openai.status(400).send({ error: true });
+        }
+        try {
+            const response = await fetch(models_url, {
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (response.ok) {
+                /** @type {any} */
+                const data = await response.json();
+                // Transform Google AI Studio models to OpenAI format
+                const models = data.models
+                    ?.filter(model => model.supportedGenerationMethods?.includes('generateContent'))
+                    ?.map(model => ({
+                        id: model.name.replace('models/', ''),
+                    })) || [];
+                response_getstatus_openai.send({ data: models });
+                console.info('Available Google AI Studio models:', models.map(m => m.id));
+                return;
+            } else {
+                console.error('Google AI Studio models endpoint failed:', response.status, response.statusText);
+                return response_getstatus_openai.send({ error: true, can_bypass: true, data: { data: [] } });
+            }
+        } catch (error) {
+            console.error('Error fetching Google AI Studio models:', error);
+            return response_getstatus_openai.send({ error: true, can_bypass: true, data: { data: [] } });
+        }
     } else {
         console.warn('This chat completion source is not supported yet.');
         return response_getstatus_openai.status(400).send({ error: true });