Merge branch 'staging' into webpack

src/endpoints/search.js

@@ -206,6 +206,54 @@ router.post('/searxng', jsonParser, async (request, response) => {
     }
 });
 
+router.post('/tavily', jsonParser, async (request, response) => {
+    try {
+        const apiKey = readSecret(request.user.directories, SECRET_KEYS.TAVILY);
+
+        if (!apiKey) {
+            console.log('No Tavily key found');
+            return response.sendStatus(400);
+        }
+
+        const { query } = request.body;
+
+        const body = {
+            query: query,
+            api_key: apiKey,
+            search_depth: 'basic',
+            topic: 'general',
+            include_answer: true,
+            include_raw_content: false,
+            include_images: false,
+            include_image_descriptions: false,
+            include_domains: [],
+            max_results: 10,
+        };
+
+        const result = await fetch('https://api.tavily.com/search', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(body),
+        });
+
+        console.log('Tavily query', query);
+
+        if (!result.ok) {
+            const text = await result.text();
+            console.log('Tavily request failed', result.statusText, text);
+            return response.status(500).send(text);
+        }
+
+        const data = await result.json();
+        return response.json(data);
+    } catch (error) {
+        console.log(error);
+        return response.sendStatus(500);
+    }
+});
+
 router.post('/visit', jsonParser, async (request, response) => {
     try {
         const url = request.body.url;

src/endpoints/secrets.js

@@ -47,6 +47,7 @@ export const SECRET_KEYS = {
     STABILITY: 'api_key_stability',
     BLOCKENTROPY: 'api_key_blockentropy',
     CUSTOM_OPENAI_TTS: 'api_key_custom_openai_tts',
+    TAVILY: 'api_key_tavily',
 };
 
 // These are the keys that are safe to expose, even if allowKeysExposure is false

src/prompt-converters.js

@@ -396,11 +396,23 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN
 
         // similar story as claude
         if (message.name) {
-            if (Array.isArray(message.content)) {
-                message.content[0].text = `${message.name}: ${message.content[0].text}`;
-            } else {
-                message.content = `${message.name}: ${message.content}`;
+            if (userName && message.name === 'example_user') {
+                message.name = userName;
             }
+            if (charName && message.name === 'example_assistant') {
+                message.name = charName;
+            }
+
+            if (Array.isArray(message.content)) {
+                if (!message.content[0].text.startsWith(`${message.name}: `)) {
+                    message.content[0].text = `${message.name}: ${message.content[0].text}`;
+                }
+            } else {
+                if (!message.content.startsWith(`${message.name}: `)) {
+                    message.content = `${message.name}: ${message.content}`;
+                }
+            }
+
             delete message.name;
         }