feat: feat: new endpoint-style submit

api/app/clients/bingai.js

@@ -1,8 +1,22 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
 
-const askBing = async ({ text, onProgress, convo }) => {
+const askBing = async ({
+  text,
+  parentMessageId,
+  conversationId,
+  jailbreak,
+  jailbreakConversationId,
+  conversationSignature,
+  clientId,
+  invocationId,
+  toneStyle,
+  onProgress
+}) => {
   const { BingAIClient } = await import('@waylaidwanderer/chatgpt-api');
+  const store = {
+    store: new KeyvFile({ filename: './data/cache.json' })
+  };
 
   const bingAIClient = new BingAIClient({
     // "_U" cookie from bing.com
@@ -10,23 +24,25 @@ const askBing = async ({ text, onProgress, convo }) => {
     // 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' }) },
+    cache: store,
     proxy: process.env.PROXY || null
   });
 
-  let options = { onProgress };
-  if (convo) {
-    options = { ...options, ...convo };
-  }
+  let options = {
+    jailbreakConversationId: jailbreakConversationId || jailbreak,
+    parentMessageId,
+    conversationId,
+    conversationSignature,
+    clientId,
+    invocationId,
+    toneStyle,
+    onProgress
+  };
 
   if (options?.jailbreakConversationId == 'false') {
     options.jailbreakConversationId = false;
   }
 
-  if (convo.toneStyle) {
-    options.toneStyle = convo.toneStyle;
-  }
-
   console.log('bing options', options);
 
   const res = await bingAIClient.sendMessage(text, options);

api/app/clients/chatgpt-browser.js

@@ -1,40 +1,45 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
-const set = new Set(["gpt-4", "text-davinci-002-render", "text-davinci-002-render-paid", "text-davinci-002-render-sha"]);
+// const set = new Set([
+//   'gpt-4',
+//   'text-davinci-002-render',
+//   'text-davinci-002-render-paid',
+//   'text-davinci-002-render-sha'
+// ]);
 
-const clientOptions = {
-  // Warning: This will expose your access token to a third party. Consider the risks before using this.
-  reverseProxyUrl: 'https://bypass.duti.tech/api/conversation',
-  // Access token from https://chat.openai.com/api/auth/session
-  accessToken: process.env.CHATGPT_TOKEN,
-  // debug: true
-  proxy: process.env.PROXY || null,
-};
-
-// You can check which models you have access to by opening DevTools and going to the Network tab. 
-// Refresh the page and look at the response body for https://chat.openai.com/backend-api/models.
-if (set.has(process.env.BROWSER_MODEL)) {
-  clientOptions.model = process.env.BROWSER_MODEL;
-}
-
-const browserClient = async ({ text, onProgress, convo, abortController }) => {
+const browserClient = async ({
+  text,
+  parentMessageId,
+  conversationId,
+  model,
+  onProgress,
+  abortController
+}) => {
   const { ChatGPTBrowserClient } = await import('@waylaidwanderer/chatgpt-api');
-
   const store = {
     store: new KeyvFile({ filename: './data/cache.json' })
   };
 
+  const clientOptions = {
+    // Warning: This will expose your access token to a third party. Consider the risks before using this.
+    reverseProxyUrl: 'https://bypass.duti.tech/api/conversation',
+    // Access token from https://chat.openai.com/api/auth/session
+    accessToken: process.env.CHATGPT_TOKEN,
+    model,
+    // debug: true
+    proxy: process.env.PROXY || null
+  };
+
   const client = new ChatGPTBrowserClient(clientOptions, store);
   let options = { onProgress, abortController };
 
-  if (!!convo.parentMessageId && !!convo.conversationId) {
-    options = { ...options, ...convo };
+  if (!!parentMessageId && !!conversationId) {
+    options = { ...options, parentMessageId, conversationId };
   }
 
-  console.log('gptBrowser options', options, clientOptions);
+  // console.log('gptBrowser options', options, clientOptions);
 
-  /* will error if given a convoId at the start */
-  if (convo.parentMessageId.startsWith('0000')) {
+  if (parentMessageId === '00000000-0000-0000-0000-000000000000') {
     delete options.conversationId;
   }
 

api/app/clients/chatgpt-client.js

@@ -1,30 +1,43 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
-const set = new Set(['gpt-4', 'text-davinci-003', 'gpt-3.5-turbo', 'gpt-3.5-turbo-0301']);
+// const set = new Set(['gpt-4', 'text-davinci-003', 'gpt-3.5-turbo', 'gpt-3.5-turbo-0301']);
 
-const clientOptions = {
-  modelOptions: {
-    model: 'gpt-3.5-turbo'
-  },
-  proxy: process.env.PROXY || null,
-  debug: false
-};
-
-if (set.has(process.env.DEFAULT_API_GPT)) {
-  clientOptions.modelOptions.model = process.env.DEFAULT_API_GPT;
-}
-
-const askClient = async ({ text, onProgress, convo, abortController }) => {
+const askClient = async ({
+  text,
+  parentMessageId,
+  conversationId,
+  model,
+  chatGptLabel,
+  promptPrefix,
+  temperature,
+  top_p,
+  presence_penalty,
+  onProgress,
+  abortController
+}) => {
   const ChatGPTClient = (await import('@waylaidwanderer/chatgpt-api')).default;
   const store = {
     store: new KeyvFile({ filename: './data/cache.json' })
   };
 
+  const clientOptions = {
+    modelOptions: {
+      model: model,
+      temperature,
+      top_p,
+      presence_penalty
+    },
+    chatGptLabel,
+    promptPrefix,
+    proxy: process.env.PROXY || null,
+    debug: false
+  };
+
   const client = new ChatGPTClient(process.env.OPENAI_KEY, clientOptions, store);
   let options = { onProgress, abortController };
 
-  if (!!convo.parentMessageId && !!convo.conversationId) {
-    options = { ...options, ...convo };
+  if (!!parentMessageId && !!conversationId) {
+    options = { ...options, parentMessageId, conversationId };
   }
 
   const res = await client.sendMessage(text, options);

api/app/clients/chatgpt-custom.js

@@ -1,35 +0,0 @@
-require('dotenv').config();
-const { KeyvFile } = require('keyv-file');
-
-const clientOptions = {
-  modelOptions: {
-    model: 'gpt-3.5-turbo'
-  },
-  proxy: process.env.PROXY || null,
-  debug: false
-};
-
-const customClient = async ({ text, onProgress, convo, promptPrefix, chatGptLabel, abortController }) => {
-  const ChatGPTClient = (await import('@waylaidwanderer/chatgpt-api')).default;
-  const store = {
-    store: new KeyvFile({ filename: './data/cache.json' })
-  };
-
-  clientOptions.chatGptLabel = chatGptLabel;
-
-  if (promptPrefix?.length > 0) {
-    clientOptions.promptPrefix = promptPrefix;
-  }
-
-  const client = new ChatGPTClient(process.env.OPENAI_KEY, clientOptions, store);
-
-  let options = { onProgress, abortController };
-  if (!!convo.parentMessageId && !!convo.conversationId) {
-    options = { ...options, ...convo };
-  }
-
-  const res = await client.sendMessage(text, options);
-  return res;
-};
-
-module.exports = customClient;

api/app/index.js

@@ -2,7 +2,6 @@ const { askClient } = require('./clients/chatgpt-client');
 const { browserClient } = require('./clients/chatgpt-browser');
 const { askBing } = require('./clients/bingai');
 const { askSydney } = require('./clients/sydney');
-const customClient = require('./clients/chatgpt-custom');
 const titleConvo = require('./titleConvo');
 const getCitations = require('../lib/parse/getCitations');
 const citeText = require('../lib/parse/citeText');
@@ -10,10 +9,9 @@ const citeText = require('../lib/parse/citeText');
 module.exports = {
   askClient,
   browserClient,
-  customClient,
   askBing,
   askSydney,
   titleConvo,
   getCitations,
-  citeText,
+  citeText
 };

api/app/titleConvo.js

@@ -16,7 +16,7 @@ const proxyEnvToAxiosProxy = proxyString => {
   return proxyConfig;
 };
 
-const titleConvo = async ({ model, text, response }) => {
+const titleConvo = async ({ endpoint, text, response }) => {
   let title = 'New Chat';
   const messages = [
     {