Merge branch 'staging' into neo-server

src/endpoints/backends/chat-completions.js

@@ -252,17 +252,25 @@ async function sendMakerSuiteRequest(request, response) {
     };
 
     function getGeminiBody() {
-        return {
-            contents: convertGooglePrompt(request.body.messages, model),
+        const should_use_system_prompt = model === 'gemini-1.5-pro-latest' && request.body.use_makersuite_sysprompt;
+        const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
+        let body = {
+            contents: prompt.contents,
             safetySettings: GEMINI_SAFETY,
             generationConfig: generationConfig,
         };
+
+        if (should_use_system_prompt) {
+            body.system_instruction = prompt.system_instruction;
+        }
+
+        return body;
     }
 
     function getBisonBody() {
         const prompt = isText
             ? ({ text: convertTextCompletionPrompt(request.body.messages) })
-            : ({ messages: convertGooglePrompt(request.body.messages, model) });
+            : ({ messages: convertGooglePrompt(request.body.messages, model).contents });
 
         /** @type {any} Shut the lint up */
         const bisonBody = {
@@ -558,7 +566,7 @@ async function sendCohereRequest(request, response) {
     }
 
     try {
-        const convertedHistory = convertCohereMessages(request.body.messages);
+        const convertedHistory = convertCohereMessages(request.body.messages, request.body.char_name, request.body.user_name);
 
         // https://docs.cohere.com/reference/chat
         const requestBody = {

src/endpoints/tokenizers.js

@@ -399,7 +399,7 @@ router.post('/google/count', jsonParser, async function (req, res) {
             accept: 'application/json',
             'content-type': 'application/json',
         },
-        body: JSON.stringify({ contents: convertGooglePrompt(req.body, String(req.query.model)) }),
+        body: JSON.stringify({ contents: convertGooglePrompt(req.body, String(req.query.model)).contents }),
     };
     try {
         const key = readSecret(req.user.directories, SECRET_KEYS.MAKERSUITE);

src/prompt-converters.js

@@ -252,9 +252,12 @@ function convertCohereMessages(messages, charName = '', userName = '') {
  * Convert a prompt from the ChatML objects to the format used by Google MakerSuite models.
  * @param {object[]} messages Array of messages
  * @param {string} model Model name
- * @returns {object[]} Prompt for Google MakerSuite models
+ * @param {boolean} useSysPrompt Use system prompt
+ * @param {string} charName Character name
+ * @param {string} userName User name
+ * @returns {{contents: *[], system_instruction: {parts: {text: string}}}} Prompt for Google MakerSuite models
  */
-function convertGooglePrompt(messages, model) {
+function convertGooglePrompt(messages, model, useSysPrompt = false, charName = '', userName = '') {
     // This is a 1x1 transparent PNG
     const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
 
@@ -267,6 +270,27 @@ function convertGooglePrompt(messages, model) {
     const isMultimodal = visionSupportedModels.includes(model);
     let hasImage = false;
 
+    let sys_prompt = '';
+    if (useSysPrompt) {
+        while (messages.length > 1 && messages[0].role === 'system') {
+            // Append example names if not already done by the frontend (e.g. for group chats).
+            if (userName && messages[0].name === 'example_user') {
+                if (!messages[0].content.startsWith(`${userName}: `)) {
+                    messages[0].content = `${userName}: ${messages[0].content}`;
+                }
+            }
+            if (charName && messages[0].name === 'example_assistant') {
+                if (!messages[0].content.startsWith(`${charName}: `)) {
+                    messages[0].content = `${charName}: ${messages[0].content}`;
+                }
+            }
+            sys_prompt += `${messages[0].content}\n\n`;
+            messages.shift();
+        }
+    }
+
+    const system_instruction = { parts: { text: sys_prompt.trim() } };
+
     const contents = [];
     messages.forEach((message, index) => {
         // fix the roles
@@ -327,7 +351,7 @@ function convertGooglePrompt(messages, model) {
         });
     }
 
-    return contents;
+    return { contents: contents, system_instruction: system_instruction };
 }
 
 /**