WIP: Update UI to match Official Style; Vision and Assistants 👷🏽

.gitignore

@@ -40,7 +40,7 @@ meili_data/
 api/node_modules/
 client/node_modules/
 bower_components/
-types/
+*.d.ts
 
 # Floobits
 .floo

api/models/schema/convoSchema.js

@@ -18,36 +18,36 @@ const convoSchema = mongoose.Schema(
     user: {
       type: String,
       index: true,
-      default: null,
+      // default: null,
     },
     messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message' }],
     // google only
     examples: [{ type: mongoose.Schema.Types.Mixed }],
     agentOptions: {
       type: mongoose.Schema.Types.Mixed,
-      default: null,
+      // default: null,
     },
     ...conversationPreset,
     // for bingAI only
     bingConversationId: {
       type: String,
-      default: null,
+      // default: null,
     },
     jailbreakConversationId: {
       type: String,
-      default: null,
+      // default: null,
     },
     conversationSignature: {
       type: String,
-      default: null,
+      // default: null,
     },
     clientId: {
       type: String,
-      default: null,
+      // default: null,
     },
     invocationId: {
       type: Number,
-      default: 1,
+      // default: 1,
     },
   },
   { timestamps: true },

api/models/schema/defaults.js

@@ -8,147 +8,147 @@ const conversationPreset = {
   // for azureOpenAI, openAI, chatGPTBrowser only
   model: {
     type: String,
-    default: null,
+    // default: null,
     required: false,
   },
   // for azureOpenAI, openAI only
   chatGptLabel: {
     type: String,
-    default: null,
+    // default: null,
     required: false,
   },
   // for google only
   modelLabel: {
     type: String,
-    default: null,
+    // default: null,
     required: false,
   },
   promptPrefix: {
     type: String,
-    default: null,
+    // default: null,
     required: false,
   },
   temperature: {
     type: Number,
-    default: 1,
+    // default: 1,
     required: false,
   },
   top_p: {
     type: Number,
-    default: 1,
+    // default: 1,
     required: false,
   },
   // for google only
   topP: {
     type: Number,
-    default: 0.95,
+    // default: 0.95,
     required: false,
   },
   topK: {
     type: Number,
-    default: 40,
+    // default: 40,
     required: false,
   },
   maxOutputTokens: {
     type: Number,
-    default: 1024,
+    // default: 1024,
     required: false,
   },
   presence_penalty: {
     type: Number,
-    default: 0,
+    // default: 0,
     required: false,
   },
   frequency_penalty: {
     type: Number,
-    default: 0,
+    // default: 0,
     required: false,
   },
   // for bingai only
   jailbreak: {
     type: Boolean,
-    default: false,
+    // default: false,
   },
   context: {
     type: String,
-    default: null,
+    // default: null,
   },
   systemMessage: {
     type: String,
-    default: null,
+    // default: null,
   },
   toneStyle: {
     type: String,
-    default: null,
+    // default: null,
   },
 };
 
 const agentOptions = {
   model: {
     type: String,
-    default: null,
+    // default: null,
     required: false,
   },
   // for azureOpenAI, openAI only
   chatGptLabel: {
     type: String,
-    default: null,
+    // default: null,
     required: false,
   },
   // for google only
   modelLabel: {
     type: String,
-    default: null,
+    // default: null,
     required: false,
   },
   promptPrefix: {
     type: String,
-    default: null,
+    // default: null,
     required: false,
   },
   temperature: {
     type: Number,
-    default: 1,
+    // default: 1,
     required: false,
   },
   top_p: {
     type: Number,
-    default: 1,
+    // default: 1,
     required: false,
   },
   // for google only
   topP: {
     type: Number,
-    default: 0.95,
+    // default: 0.95,
     required: false,
   },
   topK: {
     type: Number,
-    default: 40,
+    // default: 40,
     required: false,
   },
   maxOutputTokens: {
     type: Number,
-    default: 1024,
+    // default: 1024,
     required: false,
   },
   presence_penalty: {
     type: Number,
-    default: 0,
+    // default: 0,
     required: false,
   },
   frequency_penalty: {
     type: Number,
-    default: 0,
+    // default: 0,
     required: false,
   },
   context: {
     type: String,
-    default: null,
+    // default: null,
   },
   systemMessage: {
     type: String,
-    default: null,
+    // default: null,
   },
 };
 

api/server/controllers/EndpointController.js

@@ -1,3 +1,4 @@
+const { EModelEndpoint } = require('../routes/endpoints/schemas');
 const { availableTools } = require('../../app/clients/tools');
 const { addOpenAPISpecs } = require('../../app/clients/tools/util/addOpenAPISpecs');
 const {
@@ -7,6 +8,7 @@ const {
   userProvidedOpenAI,
   palmKey,
   openAI,
+  assistant,
   azureOpenAI,
   bingAI,
   chatGPTBrowser,
@@ -53,7 +55,16 @@ async function endpointController(req, res) {
       : false;
 
   res.send(
-    JSON.stringify({ azureOpenAI, openAI, google, bingAI, chatGPTBrowser, gptPlugins, anthropic }),
+    JSON.stringify({
+      [EModelEndpoint.openAI]: openAI,
+      [EModelEndpoint.assistant]: assistant,
+      [EModelEndpoint.azureOpenAI]: azureOpenAI,
+      [EModelEndpoint.google]: google,
+      [EModelEndpoint.bingAI]: bingAI,
+      [EModelEndpoint.chatGPTBrowser]: chatGPTBrowser,
+      [EModelEndpoint.gptPlugins]: gptPlugins,
+      [EModelEndpoint.anthropic]: anthropic,
+    }),
   );
 }
 

api/server/controllers/ModelController.js

@@ -1,3 +1,4 @@
+const { EModelEndpoint } = require('../routes/endpoints/schemas');
 const {
   getOpenAIModels,
   getChatGPTBrowserModels,
@@ -6,17 +7,28 @@ const {
 
 const { useAzurePlugins } = require('../services/EndpointService').config;
 
+const fitlerAssistantModels = (str) => {
+  return /gpt-4|gpt-3\\.5/i.test(str) && !/vision|instruct/i.test(str);
+};
+
 async function modelController(req, res) {
-  const google = ['chat-bison', 'text-bison', 'codechat-bison'];
   const openAI = await getOpenAIModels();
   const azureOpenAI = await getOpenAIModels({ azure: true });
   const gptPlugins = await getOpenAIModels({ azure: useAzurePlugins, plugins: true });
-  const bingAI = ['BingAI', 'Sydney'];
   const chatGPTBrowser = getChatGPTBrowserModels();
   const anthropic = getAnthropicModels();
 
   res.send(
-    JSON.stringify({ azureOpenAI, openAI, google, bingAI, chatGPTBrowser, gptPlugins, anthropic }),
+    JSON.stringify({
+      [EModelEndpoint.openAI]: openAI,
+      [EModelEndpoint.azureOpenAI]: azureOpenAI,
+      [EModelEndpoint.assistant]: openAI.filter(fitlerAssistantModels),
+      [EModelEndpoint.google]: ['chat-bison', 'text-bison', 'codechat-bison'],
+      [EModelEndpoint.bingAI]: ['BingAI', 'Sydney'],
+      [EModelEndpoint.chatGPTBrowser]: chatGPTBrowser,
+      [EModelEndpoint.gptPlugins]: gptPlugins,
+      [EModelEndpoint.anthropic]: anthropic,
+    }),
   );
 }
 

api/server/index.js

@@ -64,6 +64,7 @@ const startServer = async () => {
   app.use('/api/models', routes.models);
   app.use('/api/plugins', routes.plugins);
   app.use('/api/config', routes.config);
+  app.use('/api/assistants', routes.assistants);
 
   // Static files
   app.get('/*', function (req, res) {

api/server/routes/ask/index.js

@@ -15,6 +15,7 @@ const {
   messageUserLimiter,
 } = require('../../middleware');
 const { isEnabled } = require('../../utils');
+const { EModelEndpoint } = require('../endpoints/schemas');
 
 const { LIMIT_CONCURRENT_MESSAGES, LIMIT_MESSAGE_IP, LIMIT_MESSAGE_USER } = process.env ?? {};
 
@@ -34,11 +35,11 @@ if (isEnabled(LIMIT_MESSAGE_USER)) {
   router.use(messageUserLimiter);
 }
 
-router.use(['/azureOpenAI', '/openAI'], openAI);
-router.use('/google', google);
-router.use('/bingAI', bingAI);
-router.use('/chatGPTBrowser', askChatGPTBrowser);
-router.use('/gptPlugins', gptPlugins);
-router.use('/anthropic', anthropic);
+router.use([`/${EModelEndpoint.azureOpenAI}`, `/${EModelEndpoint.openAI}`], openAI);
+router.use(`/${EModelEndpoint.google}`, google);
+router.use(`/${EModelEndpoint.bingAI}`, bingAI);
+router.use(`/${EModelEndpoint.chatGPTBrowser}`, askChatGPTBrowser);
+router.use(`/${EModelEndpoint.gptPlugins}`, gptPlugins);
+router.use(`/${EModelEndpoint.anthropic}`, anthropic);
 
 module.exports = router;