Update: [chat-completions.js] Update sendMakerSuiteRequest function Removed branching logic for differences in JSON request body between PaLM and Gemini, following the removal of PaLM from Google AI Studio.

43feffdfae4ecbf54e12d569cd88a35a9dea9170

M0cho <77959408+M0ch0@users.noreply.github.com>

src/endpoints/backends/chat-completions.js+4 -40 Viewed

+    }
     const model = String(request.body.model);
-    const isGemini = model.includes('gemini');
+    const stream = Boolean(request.body.stream);
-    const isText = model.includes('text');
-    const stream = Boolean(request.body.stream) && isGemini;
     const generationConfig = {
         stopSequences: request.body.stop,

         return body;
+    }
-    function getBisonBody() {
+    const body = getGeminiBody();
-        const prompt = isText
-            ? ({ text: convertTextCompletionPrompt(request.body.messages) })
-            : ({ messages: convertGooglePrompt(request.body.messages, model).contents });
-        /** @type {any} Shut the lint up */
-        const bisonBody = {
-            ...generationConfig,
-            safetySettings: BISON_SAFETY,
-            candidate_count: 1, // lewgacy spelling
-            prompt: prompt,
-        };
-        if (!isText) {
-            delete bisonBody.stopSequences;
-            delete bisonBody.maxOutputTokens;
-            delete bisonBody.safetySettings;
-            if (Array.isArray(prompt.messages)) {
-                for (const msg of prompt.messages) {
-                    msg.author = msg.role;
-                    msg.content = msg.parts[0].text;
-                    delete msg.parts;
-                    delete msg.role;
-                }
-            }
-        }
-        delete bisonBody.candidateCount;
-        return bisonBody;
-    }
-    const body = isGemini ? getGeminiBody() : getBisonBody();
     console.log('Google AI Studio request:', body);
     try {

             controller.abort();
         });
-        const apiVersion = isGemini ? 'v1beta' : 'v1beta2';
+        const apiVersion = 'v1beta';
-        const responseType = isGemini
+        const responseType = (stream ? 'streamGenerateContent' : 'generateContent');
-            ? (stream ? 'streamGenerateContent' : 'generateContent')
-            : (isText ? 'generateText' : 'generateMessage');
         const generateResponse = await fetch(`${apiUrl.toString().replace(/\/$/, '')}/${apiVersion}/models/${model}:${responseType}?key=${apiKey}${stream ? '&alt=sse' : ''}`, {
             body: JSON.stringify(body),