🤖 Assistants V2 Support: Part 2

🎹 fix: Autocompletion Chrome Bug on Action API Key Input

chore: remove `useOriginNavigate`

chore: set correct OpenAI Storage Source

fix: azure file deletions, instantiate clients by source for deletion

update code interpret files info

feat: deleteResourceFileId

chore: increase poll interval as azure easily rate limits

fix: openai file deletions, TODO: evaluate rejected deletion settled promises to determine which to delete from db records

file source icons

update table file filters

chore: file search info and versioning

fix: retrieval update with necessary tool_resources if specified

fix(useMentions): add optional chaining in case listMap value is undefined

fix: force assistant avatar roundedness

fix: azure assistants, check correct flag

chore: bump data-provider

api/server/controllers/assistants/chatV1.js

@@ -3,11 +3,11 @@ const {
   Constants,
   RunStatus,
   CacheKeys,
-  FileSources,
   ContentTypes,
   EModelEndpoint,
   ViolationTypes,
   ImageVisionTool,
+  checkOpenAIStorage,
   AssistantStreamEvents,
 } = require('librechat-data-provider');
 const {
@@ -361,10 +361,7 @@ const chatV2 = async (req, res) => {
 
       /** @type {MongoFile[]} */
       const attachments = await req.body.endpointOption.attachments;
-      if (
-        attachments &&
-        attachments.every((attachment) => attachment.source === FileSources.openai)
-      ) {
+      if (attachments && attachments.every((attachment) => checkOpenAIStorage(attachment.source))) {
         return;
       }
 
@@ -422,7 +419,7 @@ const chatV2 = async (req, res) => {
 
       if (processedFiles) {
         for (const file of processedFiles) {
-          if (file.source !== FileSources.openai) {
+          if (!checkOpenAIStorage(file.source)) {
             attachedFileIds.delete(file.file_id);
             const index = file_ids.indexOf(file.file_id);
             if (index > -1) {

api/server/controllers/assistants/helpers.js

@@ -1,9 +1,4 @@
-const {
-  EModelEndpoint,
-  FileSources,
-  CacheKeys,
-  defaultAssistantsVersion,
-} = require('librechat-data-provider');
+const { EModelEndpoint, CacheKeys, defaultAssistantsVersion } = require('librechat-data-provider');
 const {
   initializeClient: initAzureClient,
 } = require('~/server/services/Endpoints/azureAssistants');
@@ -121,13 +116,8 @@ const listAssistantsForAzure = async ({ req, res, version, azureConfig = {}, que
   };
 };
 
-async function getOpenAIClient({ req, res, endpointOption, initAppClient }) {
-  let endpoint = req.body.endpoint ?? req.query.endpoint;
-  if (!endpoint && req.baseUrl.includes('files') && req.body.files) {
-    const source = req.body.files[0]?.source;
-    endpoint =
-      source === FileSources.openai ? EModelEndpoint.assistants : EModelEndpoint.azureAssistants;
-  }
+async function getOpenAIClient({ req, res, endpointOption, initAppClient, overrideEndpoint }) {
+  let endpoint = overrideEndpoint ?? req.body.endpoint ?? req.query.endpoint;
   const version = await getCurrentVersion(req, endpoint);
   if (!endpoint) {
     throw new Error(`[${req.baseUrl}] Endpoint is required`);

api/server/controllers/assistants/v2.js

@@ -1,3 +1,4 @@
+const { ToolCallTypes } = require('librechat-data-provider');
 const { validateAndUpdateTool } = require('~/server/services/ActionService');
 const { getOpenAIClient } = require('./helpers');
 const { logger } = require('~/config');
@@ -54,6 +55,7 @@ const createAssistant = async (req, res) => {
 const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
   const tools = [];
 
+  let hasFileSearch = false;
   for (const tool of updateData.tools ?? []) {
     let actualTool = typeof tool === 'string' ? req.app.locals.availableTools[tool] : tool;
 
@@ -61,6 +63,10 @@ const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
       continue;
     }
 
+    if (actualTool.type === ToolCallTypes.FILE_SEARCH) {
+      hasFileSearch = true;
+    }
+
     if (!actualTool.function) {
       tools.push(actualTool);
       continue;
@@ -72,6 +78,20 @@ const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
     }
   }
 
+  if (hasFileSearch && !updateData.tool_resources) {
+    const assistant = await openai.beta.assistants.retrieve(assistant_id);
+    updateData.tool_resources = assistant.tool_resources ?? null;
+  }
+
+  if (hasFileSearch && !updateData.tool_resources?.file_search) {
+    updateData.tool_resources = {
+      ...(updateData.tool_resources ?? {}),
+      file_search: {
+        vector_store_ids: [],
+      },
+    };
+  }
+
   updateData.tools = tools;
 
   if (openai.locals?.azureOptions && updateData.model) {