fix: error handling titles, remove openAI req

.gitignore

@@ -48,7 +48,7 @@ bower_components/
 cache.json
 api/data/
 .eslintrc.js
-owner.yml
+owner*.yml
 archive
 .vscode/settings.json
 

api/app/bingai.js

@@ -2,27 +2,32 @@ require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
 
 const askBing = async ({ text, progressCallback, convo }) => {
-  const { BingAIClient } = (await import('@waylaidwanderer/chatgpt-api'));
+  const { BingAIClient } = await import('@waylaidwanderer/chatgpt-api');
 
-  const bingAIClient = new BingAIClient({
+  const clientOptions = {
-    // "_U" cookie from bing.com
     userToken: process.env.BING_TOKEN,
-    // If the above doesn't work, provide all your cookies as a string instead
-    // cookies: '',
     debug: false,
     cache: { store: new KeyvFile({ filename: './data/cache.json' }) }
-  });
+  };
+
+  const cookies = process.env.BING_COOKIES;
+
+  if (cookies?.length > 0) {
+    clientOptions.cookies = cookies;
+    delete clientOptions.userToken;
+  }
+
+  const bingAIClient = new BingAIClient(clientOptions);
 
   let options = {
-    onProgress: async (partialRes) => await progressCallback(partialRes),
+    onProgress: async (partialRes) => await progressCallback(partialRes)
   };
 
   if (convo) {
     options = { ...options, ...convo };
   }
 
-  const res = await bingAIClient.sendMessage(text, options
+  const res = await bingAIClient.sendMessage(text, options);
-  );
 
   return res;
 

api/app/sydney.js

@@ -2,30 +2,39 @@ require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
 
 const askSydney = async ({ text, progressCallback, convo }) => {
-  const { BingAIClient } = (await import('@waylaidwanderer/chatgpt-api'));
+  const { BingAIClient } = await import('@waylaidwanderer/chatgpt-api');
 
-  const sydneyClient = new BingAIClient({
+  const clientOptions = {
-    // "_U" cookie from bing.com
     userToken: process.env.BING_TOKEN,
-    // If the above doesn't work, provide all your cookies as a string instead
-    // cookies: '',
     debug: false,
     cache: { store: new KeyvFile({ filename: './data/cache.json' }) }
-  });
+  };
+
+  const cookies = process.env.BING_COOKIES;
+
+  if (cookies?.length > 0) {
+    clientOptions.cookies = cookies;
+    delete clientOptions.userToken;
+  }
+
+  const sydneyClient = new BingAIClient(clientOptions);
 
   let options = {
     jailbreakConversationId: true,
-    onProgress: async (partialRes) => await progressCallback(partialRes),
+    onProgress: async (partialRes) => await progressCallback(partialRes)
   };
 
   if (convo.parentMessageId) {
-    options = { ...options, jailbreakConversationId: convo.jailbreakConversationId, parentMessageId: convo.parentMessageId };
+    options = {
+      ...options,
+      jailbreakConversationId: convo.jailbreakConversationId,
+      parentMessageId: convo.parentMessageId
+    };
   }
 
   console.log('sydney options', options);
 
-  const res = await sydneyClient.sendMessage(text, options
+  const res = await sydneyClient.sendMessage(text, options);
-  );
 
   return res;
 

api/app/titleConvo.js

@@ -1,6 +1,7 @@
 const { Configuration, OpenAIApi } = require('openai');
 
 const titleConvo = async ({ message, response, model }) => {
+  try {
     const configuration = new Configuration({
       apiKey: process.env.OPENAI_KEY
     });
@@ -13,12 +14,19 @@ const titleConvo = async ({ message, response, model }) => {
           content:
             'You are a title-generator with one job: titling the conversation provided by a user in title case.'
         },
-      { role: 'user', content: `In 5 words or less, summarize the conversation below with a title in title case. Don't refer to the participants of the conversation by name. Do not include punctuation or quotation marks. Your response should be in title case, exclusively containing the title. Conversation:\n\nUser: "${message}"\n\n${model}: "${response}"\n\nTitle: ` },
+        {
+          role: 'user',
+          content: `In 5 words or less, summarize the conversation below with a title in title case. Don't refer to the participants of the conversation by name. Do not include punctuation or quotation marks. Your response should be in title case, exclusively containing the title. Conversation:\n\nUser: "${message}"\n\n${model}: "${response}"\n\nTitle: `
+        }
       ]
     });
 
     //eslint-disable-next-line
     return completion.data.choices[0].message.content.replace(/["\.]/g, '');
+  } catch (error) {
+    console.log(error);
+    return 'New Chat';
+  }
 };
 
 module.exports = titleConvo;