mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-08-31 08:56:48 +00:00
* fix(mcp): handle dynamic tool list changes Co-authored-by: Pascal Garber <pascal@artandcode.studio> * test(mcp): fix CI validation * fix(mcp): keep dynamic tool catalogs live * fix(mcp): harden dynamic catalog lifecycle * test(mcp): use typed startup connection * test(mcp): isolate dynamic e2e fixtures * fix(mcp): refresh tools after reconnect * fix(mcp): close dynamic catalog cache gaps * test(mcp): update OAuth connection mocks * fix(mcp): preserve app snapshot ownership * style(mcp): sort connection imports * fix(mcp): close review race conditions * fix(mcp): preserve cache ownership edges * fix(mcp): harden recovery lifecycle * fix(mcp): guard tool-less app refresh * fix(mcp): fence distributed cache races * fix(mcp): retire stale connection state * fix(mcp): keep tool snapshots authoritative * fix(mcp): fence stale app tool publications * style(mcp): sort repository test imports * test(mcp): mock empty startup publication * fix(mcp): preserve app publication generations * fix(mcp): harden publication recovery races * fix(mcp): address tool catalogs by runtime config * fix(mcp): load scoped catalogs for assistant writes * fix(mcp): harden catalog publication recovery * fix(mcp): serialize forced connection replacement * fix(mcp): serialize ordinary creation with replacements * fix(mcp): harden catalog fallback boundaries * fix(mcp): close lifecycle fencing gaps * fix(mcp): preserve catalog authority on failures * fix(mcp): compensate failed catalog mutations * fix(mcp): fence catalog refresh ordering * style(mcp): sort agent loader imports * fix(mcp): cancel stale connection creation * fix(mcp): fence catalog coordination * fix(mcp): close catalog race windows * fix(mcp): harden cross-pod catalog fencing * fix(mcp): close catalog lifecycle edges * style(mcp): sort assistant imports * fix(mcp): reject stale recovery authority * fix(mcp): restore static catalog on every startup * fix(mcp): order app catalog publications * style(mcp): sort catalog revision imports * fix(mcp): separate catalog allocation and commit fences --------- Co-authored-by: Pascal Garber <pascal@artandcode.studio>
407 lines
13 KiB
JavaScript
407 lines
13 KiB
JavaScript
const fs = require('fs').promises;
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { FileContext } = require('librechat-data-provider');
|
|
const { deleteFileByFilter, updateAssistantDoc, getAssistants } = require('~/models');
|
|
const { uploadImageBuffer, filterFile } = require('~/server/services/Files/process');
|
|
const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
|
|
const { getStrategyFunctions } = require('~/server/services/Files/strategies');
|
|
const { deleteAssistantActions } = require('~/server/services/ActionService');
|
|
const { getOpenAIClient, fetchAssistants } = require('./helpers');
|
|
const { healMcpToolNames, getAssistantToolDefinitions } = require('~/server/services/MCP');
|
|
const { manifestToolMap, isAgentsOnlyTool } = require('~/app/clients/tools');
|
|
|
|
/**
|
|
* Create an assistant.
|
|
* @route POST /assistants
|
|
* @param {AssistantCreateParams} req.body - The assistant creation parameters.
|
|
* @returns {Assistant} 201 - success response - application/json
|
|
*/
|
|
const createAssistant = async (req, res) => {
|
|
try {
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
|
|
const {
|
|
tools = [],
|
|
endpoint,
|
|
conversation_starters,
|
|
append_current_datetime,
|
|
...assistantData
|
|
} = req.body;
|
|
delete assistantData.conversation_starters;
|
|
delete assistantData.append_current_datetime;
|
|
|
|
const toolDefinitions = await getAssistantToolDefinitions({ req, tools });
|
|
const healedTools = await healMcpToolNames({ req, tools, toolDefinitions });
|
|
|
|
assistantData.tools = healedTools
|
|
.map((tool) => {
|
|
/** Agents-runtime-only tools (e.g. ask_user_question) cannot execute on
|
|
* the assistants runtime — drop them even when posted directly, since
|
|
* the tools-dialog scoping doesn't gate REST clients or stale payloads. */
|
|
if (isAgentsOnlyTool(tool)) {
|
|
logger.warn(
|
|
`[/assistants] Dropping agents-only tool from assistant payload: ${typeof tool === 'string' ? tool : tool?.function?.name}`,
|
|
);
|
|
return undefined;
|
|
}
|
|
if (typeof tool !== 'string') {
|
|
return tool;
|
|
}
|
|
|
|
const toolDef = toolDefinitions[tool];
|
|
if (!toolDef && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
|
|
return Object.entries(toolDefinitions)
|
|
.filter(([key]) => key.startsWith(`${tool}_`))
|
|
|
|
.map(([_, val]) => val);
|
|
}
|
|
|
|
return toolDef;
|
|
})
|
|
.filter((tool) => tool)
|
|
.flat();
|
|
|
|
let azureModelIdentifier = null;
|
|
if (openai.locals?.azureOptions) {
|
|
azureModelIdentifier = assistantData.model;
|
|
assistantData.model = openai.locals.azureOptions.azureOpenAIApiDeploymentName;
|
|
}
|
|
|
|
assistantData.metadata = {
|
|
author: req.user.id,
|
|
endpoint,
|
|
};
|
|
|
|
const assistant = await openai.beta.assistants.create(assistantData);
|
|
|
|
const createData = { user: req.user.id };
|
|
if (conversation_starters) {
|
|
createData.conversation_starters = conversation_starters;
|
|
}
|
|
if (append_current_datetime !== undefined) {
|
|
createData.append_current_datetime = append_current_datetime;
|
|
}
|
|
|
|
const document = await updateAssistantDoc({ assistant_id: assistant.id }, createData);
|
|
|
|
if (azureModelIdentifier) {
|
|
assistant.model = azureModelIdentifier;
|
|
}
|
|
|
|
if (document.conversation_starters) {
|
|
assistant.conversation_starters = document.conversation_starters;
|
|
}
|
|
|
|
if (append_current_datetime !== undefined) {
|
|
assistant.append_current_datetime = append_current_datetime;
|
|
}
|
|
|
|
logger.debug('/assistants/', assistant);
|
|
res.status(201).json(assistant);
|
|
} catch (error) {
|
|
logger.error('[/assistants] Error creating assistant', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Retrieves an assistant.
|
|
* @route GET /assistants/:id
|
|
* @param {string} req.params.id - Assistant identifier.
|
|
* @returns {Assistant} 200 - success response - application/json
|
|
*/
|
|
const retrieveAssistant = async (req, res) => {
|
|
try {
|
|
/* NOTE: not actually being used right now */
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
const assistant_id = req.params.id;
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
res.json(assistant);
|
|
} catch (error) {
|
|
logger.error('[/assistants/:id] Error retrieving assistant', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Modifies an assistant.
|
|
* @route PATCH /assistants/:id
|
|
* @param {object} req - Express Request
|
|
* @param {object} req.params - Request params
|
|
* @param {string} req.params.id - Assistant identifier.
|
|
* @param {AssistantUpdateParams} req.body - The assistant update parameters.
|
|
* @returns {Assistant} 200 - success response - application/json
|
|
*/
|
|
const patchAssistant = async (req, res) => {
|
|
try {
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
await validateAuthor({ req, openai });
|
|
|
|
const assistant_id = req.params.id;
|
|
const {
|
|
endpoint: _e,
|
|
conversation_starters,
|
|
append_current_datetime,
|
|
...updateData
|
|
} = req.body;
|
|
|
|
const toolDefinitions = await getAssistantToolDefinitions({ req, tools: updateData.tools });
|
|
const healedTools = await healMcpToolNames({ req, tools: updateData.tools, toolDefinitions });
|
|
|
|
updateData.tools = healedTools
|
|
.map((tool) => {
|
|
/** Agents-runtime-only tools (e.g. ask_user_question) cannot execute on
|
|
* the assistants runtime — drop them even when posted directly, since
|
|
* the tools-dialog scoping doesn't gate REST clients or stale payloads. */
|
|
if (isAgentsOnlyTool(tool)) {
|
|
logger.warn(
|
|
`[/assistants] Dropping agents-only tool from assistant payload: ${typeof tool === 'string' ? tool : tool?.function?.name}`,
|
|
);
|
|
return undefined;
|
|
}
|
|
if (typeof tool !== 'string') {
|
|
return tool;
|
|
}
|
|
|
|
const toolDef = toolDefinitions[tool];
|
|
if (!toolDef && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
|
|
return Object.entries(toolDefinitions)
|
|
.filter(([key]) => key.startsWith(`${tool}_`))
|
|
|
|
.map(([_, val]) => val);
|
|
}
|
|
|
|
return toolDef;
|
|
})
|
|
.filter((tool) => tool)
|
|
.flat();
|
|
|
|
if (openai.locals?.azureOptions && updateData.model) {
|
|
updateData.model = openai.locals.azureOptions.azureOpenAIApiDeploymentName;
|
|
}
|
|
|
|
const updatedAssistant = await openai.beta.assistants.update(assistant_id, updateData);
|
|
|
|
if (conversation_starters !== undefined) {
|
|
const conversationStartersUpdate = await updateAssistantDoc(
|
|
{ assistant_id },
|
|
{ conversation_starters },
|
|
);
|
|
updatedAssistant.conversation_starters = conversationStartersUpdate.conversation_starters;
|
|
}
|
|
|
|
if (append_current_datetime !== undefined) {
|
|
await updateAssistantDoc({ assistant_id }, { append_current_datetime });
|
|
updatedAssistant.append_current_datetime = append_current_datetime;
|
|
}
|
|
|
|
res.json(updatedAssistant);
|
|
} catch (error) {
|
|
logger.error('[/assistants/:id] Error updating assistant', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Deletes an assistant.
|
|
* @route DELETE /assistants/:id
|
|
* @param {object} req - Express Request
|
|
* @param {object} req.params - Request params
|
|
* @param {string} req.params.id - Assistant identifier.
|
|
* @returns {Assistant} 200 - success response - application/json
|
|
*/
|
|
const deleteAssistant = async (req, res) => {
|
|
try {
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
await validateAuthor({ req, openai });
|
|
|
|
const assistant_id = req.params.id;
|
|
const deletionStatus = await openai.beta.assistants.delete(assistant_id);
|
|
if (deletionStatus?.deleted) {
|
|
await deleteAssistantActions({ req, assistant_id });
|
|
}
|
|
res.json(deletionStatus);
|
|
} catch (error) {
|
|
logger.error('[/assistants/:id] Error deleting assistant', error);
|
|
res.status(500).json({ error: 'Error deleting assistant' });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Returns a list of assistants.
|
|
* @route GET /assistants
|
|
* @param {object} req - Express Request
|
|
* @param {AssistantListParams} req.query - The assistant list parameters for pagination and sorting.
|
|
* @returns {AssistantListResponse} 200 - success response - application/json
|
|
*/
|
|
const listAssistants = async (req, res) => {
|
|
try {
|
|
const body = await fetchAssistants({ req, res });
|
|
res.json(body);
|
|
} catch (error) {
|
|
logger.error('[/assistants] Error listing assistants', error);
|
|
res.status(500).json({ message: 'Error listing assistants' });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Filter assistants based on configuration.
|
|
*
|
|
* @param {object} params - The parameters object.
|
|
* @param {string} params.userId - The user ID to filter private assistants.
|
|
* @param {AssistantDocument[]} params.assistants - The list of assistants to filter.
|
|
* @param {Partial<TAssistantEndpoint>} [params.assistantsConfig] - The assistant configuration.
|
|
* @returns {AssistantDocument[]} - The filtered list of assistants.
|
|
*/
|
|
function filterAssistantDocs({ documents, userId, assistantsConfig = {} }) {
|
|
const { supportedIds, excludedIds, privateAssistants } = assistantsConfig;
|
|
const removeUserId = (doc) => {
|
|
const { user: _u, ...document } = doc;
|
|
return document;
|
|
};
|
|
|
|
if (privateAssistants) {
|
|
return documents.filter((doc) => userId === doc.user.toString()).map(removeUserId);
|
|
} else if (supportedIds?.length) {
|
|
return documents.filter((doc) => supportedIds.includes(doc.assistant_id)).map(removeUserId);
|
|
} else if (excludedIds?.length) {
|
|
return documents.filter((doc) => !excludedIds.includes(doc.assistant_id)).map(removeUserId);
|
|
}
|
|
return documents.map(removeUserId);
|
|
}
|
|
|
|
/**
|
|
* Returns a list of the user's assistant documents (metadata saved to database).
|
|
* @route GET /assistants/documents
|
|
* @returns {AssistantDocument[]} 200 - success response - application/json
|
|
*/
|
|
const getAssistantDocuments = async (req, res) => {
|
|
try {
|
|
const appConfig = req.config;
|
|
const endpoint = req.query?.endpoint;
|
|
const assistantsConfig = appConfig.endpoints?.[endpoint];
|
|
const documents = await getAssistants(
|
|
{},
|
|
{
|
|
user: 1,
|
|
assistant_id: 1,
|
|
conversation_starters: 1,
|
|
createdAt: 1,
|
|
updatedAt: 1,
|
|
append_current_datetime: 1,
|
|
},
|
|
);
|
|
|
|
const docs = filterAssistantDocs({
|
|
documents,
|
|
userId: req.user.id,
|
|
assistantsConfig,
|
|
});
|
|
res.json(docs);
|
|
} catch (error) {
|
|
logger.error('[/assistants/documents] Error listing assistant documents', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Uploads and updates an avatar for a specific assistant.
|
|
* @route POST /:assistant_id/avatar
|
|
* @param {object} req - Express Request
|
|
* @param {object} req.params - Request params
|
|
* @param {string} req.params.assistant_id - The ID of the assistant.
|
|
* @param {Express.Multer.File} req.file - The avatar image file.
|
|
* @param {object} req.body - Request body
|
|
* @returns {Object} 200 - success response - application/json
|
|
*/
|
|
const uploadAssistantAvatar = async (req, res) => {
|
|
try {
|
|
const appConfig = req.config;
|
|
filterFile({ req, file: req.file, image: true, isAvatar: true });
|
|
const { assistant_id } = req.params;
|
|
if (!assistant_id) {
|
|
return res.status(400).json({ message: 'Assistant ID is required' });
|
|
}
|
|
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
await validateAuthor({ req, openai });
|
|
|
|
const buffer = await fs.readFile(req.file.path);
|
|
const image = await uploadImageBuffer({
|
|
req,
|
|
context: FileContext.avatar,
|
|
metadata: { buffer },
|
|
});
|
|
|
|
let _metadata;
|
|
|
|
try {
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
if (assistant) {
|
|
_metadata = assistant.metadata;
|
|
}
|
|
} catch (error) {
|
|
logger.error('[/:assistant_id/avatar] Error fetching assistant', error);
|
|
_metadata = {};
|
|
}
|
|
|
|
if (_metadata.avatar && _metadata.avatar_source) {
|
|
const { deleteFile } = getStrategyFunctions(_metadata.avatar_source);
|
|
try {
|
|
await deleteFile(req, {
|
|
filepath: _metadata.avatar,
|
|
user: req.user.id,
|
|
tenantId: req.user.tenantId,
|
|
});
|
|
await deleteFileByFilter({ user: req.user.id, filepath: _metadata.avatar });
|
|
} catch (error) {
|
|
logger.error('[/:assistant_id/avatar] Error deleting old avatar', error);
|
|
}
|
|
}
|
|
|
|
const metadata = {
|
|
..._metadata,
|
|
avatar: image.filepath,
|
|
avatar_source: appConfig.fileStrategy,
|
|
};
|
|
|
|
const promises = [];
|
|
promises.push(
|
|
updateAssistantDoc(
|
|
{ assistant_id },
|
|
{
|
|
avatar: {
|
|
filepath: image.filepath,
|
|
source: appConfig.fileStrategy,
|
|
},
|
|
user: req.user.id,
|
|
},
|
|
),
|
|
);
|
|
promises.push(openai.beta.assistants.update(assistant_id, { metadata }));
|
|
|
|
const resolved = await Promise.all(promises);
|
|
res.status(201).json(resolved[1]);
|
|
} catch (error) {
|
|
const message = 'An error occurred while updating the Assistant Avatar';
|
|
logger.error(message, error);
|
|
res.status(500).json({ message });
|
|
} finally {
|
|
try {
|
|
await fs.unlink(req.file.path);
|
|
logger.debug('[/:agent_id/avatar] Temp. image upload file deleted');
|
|
} catch {
|
|
logger.debug('[/:agent_id/avatar] Temp. image upload file already deleted');
|
|
}
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
createAssistant,
|
|
retrieveAssistant,
|
|
patchAssistant,
|
|
deleteAssistant,
|
|
listAssistants,
|
|
getAssistantDocuments,
|
|
uploadAssistantAvatar,
|
|
};
|