diff --git a/api/server/routes/files/files.js b/api/server/routes/files/files.js index 5a520bdb65..d2914825b0 100644 --- a/api/server/routes/files/files.js +++ b/api/server/routes/files/files.js @@ -121,6 +121,14 @@ router.delete('/', async (req, res) => { await processDeleteRequest({ req, files: assistantFiles }); res.status(200).json({ message: 'File associations removed successfully from assistant' }); return; + } else if ( + req.body.assistant_id && + req.body.files?.[0]?.filepath === EModelEndpoint.azureAssistants + ) { + await processDeleteRequest({ req, files: req.body.files }); + return res + .status(200) + .json({ message: 'File associations removed successfully from Azure Assistant' }); } await processDeleteRequest({ req, files: dbFiles }); diff --git a/api/server/services/Files/OpenAI/crud.js b/api/server/services/Files/OpenAI/crud.js index 64478ce7b3..a55485fe4b 100644 --- a/api/server/services/Files/OpenAI/crud.js +++ b/api/server/services/Files/OpenAI/crud.js @@ -54,7 +54,7 @@ async function deleteOpenAIFile(req, file, openai) { throw new Error('OpenAI returned `false` for deleted status'); } logger.debug( - `[deleteOpenAIFile] User ${req.user.id} successfully deleted ${file.file_id} from OpenAI`, + `[deleteOpenAIFile] User ${req.user.id} successfully deleted file "${file.file_id}" from OpenAI`, ); } catch (error) { logger.error('[deleteOpenAIFile] Error deleting file from OpenAI: ' + error.message); diff --git a/api/server/services/Files/process.js b/api/server/services/Files/process.js index e8aef7da85..94b1bc4dad 100644 --- a/api/server/services/Files/process.js +++ b/api/server/services/Files/process.js @@ -137,11 +137,13 @@ const processDeleteRequest = async ({ req, files }) => { /** @type {Record} */ const client = { [FileSources.openai]: undefined, [FileSources.azure]: undefined }; const initializeClients = async () => { - const openAIClient = await getOpenAIClient({ - req, - overrideEndpoint: EModelEndpoint.assistants, - }); - client[FileSources.openai] = openAIClient.openai; + if (req.app.locals[EModelEndpoint.assistants]) { + const openAIClient = await getOpenAIClient({ + req, + overrideEndpoint: EModelEndpoint.assistants, + }); + client[FileSources.openai] = openAIClient.openai; + } if (!req.app.locals[EModelEndpoint.azureOpenAI]?.assistants) { return;