mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
* chore: Update @modelcontextprotocol/sdk to version 1.12.3 in package.json and package-lock.json - Bump version of @modelcontextprotocol/sdk to 1.12.3 to incorporate recent updates. - Update dependencies for ajv and cross-spawn to their latest versions. - Add ajv as a new dependency in the sdk module. - Include json-schema-traverse as a new dependency in the sdk module. * feat: @librechat/auth * feat: Add crypto module exports to auth package - Introduced a new crypto module by creating index.ts in the crypto directory. - Updated the main index.ts of the auth package to export from the new crypto module. * feat: Update package dependencies and build scripts for auth package - Added @librechat/auth as a dependency in package.json and package-lock.json. - Updated build scripts to include the auth package in both frontend and bun build processes. - Removed unused mongoose and openid-client dependencies from package-lock.json for cleaner dependency management. * refactor: Migrate crypto utility functions to @librechat/auth - Replaced local crypto utility imports with the new @librechat/auth package across multiple files. - Removed the obsolete crypto.js file and its exports. - Updated relevant services and models to utilize the new encryption and decryption methods from @librechat/auth. * feat: Enhance OAuth token handling and update dependencies in auth package * chore: Remove Token model and TokenService due to restructuring of OAuth handling - Deleted the Token.js model and TokenService.js, which were responsible for managing OAuth tokens. - This change is part of a broader refactor to streamline OAuth token management and improve code organization. * refactor: imports from '@librechat/auth' to '@librechat/api' and add OAuth token handling functionality * refactor: Simplify logger usage in MCP and FlowStateManager classes * chore: fix imports * feat: Add OAuth configuration schema to MCP with token exchange method support * feat: FIRST PASS Implement MCP OAuth flow with token management and error handling - Added a new route for handling OAuth callbacks and token retrieval. - Integrated OAuth token storage and retrieval mechanisms. - Enhanced MCP connection to support automatic OAuth flow initiation on 401 errors. - Implemented dynamic client registration and metadata discovery for OAuth. - Updated MCPManager to manage OAuth tokens and handle authentication requirements. - Introduced comprehensive logging for OAuth processes and error handling. * refactor: Update MCPConnection and MCPManager to utilize new URL handling - Added a `url` property to MCPConnection for better URL management. - Refactored MCPManager to use the new `url` property instead of a deprecated method for OAuth handling. - Changed logging from info to debug level for flow manager and token methods initialization. - Improved comments for clarity on existing tokens and OAuth event listener setup. * refactor: Improve connection timeout error messages in MCPConnection and MCPManager and use initTimeout for connection - Updated the connection timeout error messages to include the duration of the timeout. - Introduced a configurable `connectTimeout` variable in both MCPConnection and MCPManager for better flexibility. * chore: cleanup MCP OAuth Token exchange handling; fix: erroneous use of flowsCache and remove verbose logs * refactor: Update MCPManager and MCPTokenStorage to use TokenMethods for token management - Removed direct token storage handling in MCPManager and replaced it with TokenMethods for better abstraction. - Refactored MCPTokenStorage methods to accept parameters for token operations, enhancing flexibility and readability. - Improved logging messages related to token persistence and retrieval processes. * refactor: Update MCP OAuth handling to use static methods and improve flow management - Refactored MCPOAuthHandler to utilize static methods for initiating and completing OAuth flows, enhancing clarity and reducing instance dependencies. - Updated MCPManager to pass flowManager explicitly to OAuth handling methods, improving flexibility in flow state management. - Enhanced comments and logging for better understanding of OAuth processes and flow state retrieval. * refactor: Integrate token methods into createMCPTool for enhanced token management * refactor: Change logging from info to debug level in MCPOAuthHandler for improved log management * chore: clean up logging * feat: first pass, auth URL from MCP OAuth flow * chore: Improve logging format for OAuth authentication URL display * chore: cleanup mcp manager comments * feat: add connection reconnection logic in MCPManager * refactor: reorganize token storage handling in MCP - Moved token storage logic from MCPManager to a new MCPTokenStorage class for better separation of concerns. - Updated imports to reflect the new token storage structure. - Enhanced methods for storing, retrieving, updating, and deleting OAuth tokens, improving overall token management. * chore: update comment for SYSTEM_USER_ID in MCPManager for clarity * feat: implement refresh token functionality in MCP - Added refresh token handling in MCPManager to support token renewal for both app-level and user-specific connections. - Introduced a refreshTokens function to facilitate token refresh logic. - Enhanced MCPTokenStorage to manage client information and refresh token processes. - Updated logging for better traceability during token operations. * chore: cleanup @librechat/auth * feat: implement MCP server initialization in a separate service - Added a new service to handle the initialization of MCP servers, improving code organization and readability. - Refactored the server startup logic to utilize the new initializeMCP function. - Removed redundant MCP initialization code from the main server file. * fix: don't log auth url for user connections * feat: enhance OAuth flow with success and error handling components - Updated OAuth callback routes to redirect to new success and error pages instead of sending status messages. - Introduced `OAuthSuccess` and `OAuthError` components to provide user feedback during authentication. - Added localization support for success and error messages in the translation files. - Implemented countdown functionality in the success component for a better user experience. * fix: refresh token handling for user connections, add missing URL and methods - add standard enum for system user id and helper for determining app-lvel vs. user-level connections * refactor: update token handling in MCPManager and MCPTokenStorage * fix: improve error logging in OAuth authentication handler * fix: concurrency issues for both login url emission and concurrency of oauth flows for shared flows (same user, same server, multiple calls for same server) * fix: properly fail shared flows for concurrent server calls and prevent duplication of tokens * chore: remove unused auth package directory from update configuration * ci: fix mocks in samlStrategy tests * ci: add mcpConfig to AppService test setup * chore: remove obsolete MCP OAuth implementation documentation * fix: update build script for API to use correct command * chore: bump version of @librechat/api to 1.2.4 * fix: update abort signal handling in createMCPTool function * fix: add optional clientInfo parameter to refreshTokensFunction metadata * refactor: replace app.locals.availableTools with getCachedTools in multiple services and controllers for improved tool management * fix: concurrent refresh token handling issue * refactor: add signal parameter to getUserConnection method for improved abort handling * chore: JSDoc typing for `loadEphemeralAgent` * refactor: update isConnectionActive method to use destructured parameters for improved readability * feat: implement caching for MCP tools to handle app-level disconnects for loading list of tools * ci: fix agent test
297 lines
9 KiB
JavaScript
297 lines
9 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { ToolCallTypes } = require('librechat-data-provider');
|
|
const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
|
|
const { validateAndUpdateTool } = require('~/server/services/ActionService');
|
|
const { getCachedTools } = require('~/server/services/Config');
|
|
const { updateAssistantDoc } = require('~/models/Assistant');
|
|
const { manifestToolMap } = require('~/app/clients/tools');
|
|
const { getOpenAIClient } = require('./helpers');
|
|
|
|
/**
|
|
* 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 {
|
|
/** @type {{ openai: OpenAIClient }} */
|
|
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 getCachedTools({ includeGlobal: true });
|
|
|
|
assistantData.tools = tools
|
|
.map((tool) => {
|
|
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 });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Modifies an assistant.
|
|
* @param {object} params
|
|
* @param {Express.Request} params.req
|
|
* @param {OpenAIClient} params.openai
|
|
* @param {string} params.assistant_id
|
|
* @param {AssistantUpdateParams} params.updateData
|
|
* @returns {Promise<Assistant>} The updated assistant.
|
|
*/
|
|
const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
|
|
await validateAuthor({ req, openai });
|
|
const tools = [];
|
|
let conversation_starters = null;
|
|
|
|
if (updateData?.conversation_starters) {
|
|
const conversationStartersUpdate = await updateAssistantDoc(
|
|
{ assistant_id: assistant_id },
|
|
{ conversation_starters: updateData.conversation_starters },
|
|
);
|
|
conversation_starters = conversationStartersUpdate.conversation_starters;
|
|
|
|
delete updateData.conversation_starters;
|
|
}
|
|
|
|
if (updateData?.append_current_datetime !== undefined) {
|
|
await updateAssistantDoc(
|
|
{ assistant_id: assistant_id },
|
|
{ append_current_datetime: updateData.append_current_datetime },
|
|
);
|
|
delete updateData.append_current_datetime;
|
|
}
|
|
|
|
let hasFileSearch = false;
|
|
for (const tool of updateData.tools ?? []) {
|
|
const toolDefinitions = await getCachedTools({ includeGlobal: true });
|
|
let actualTool = typeof tool === 'string' ? toolDefinitions[tool] : tool;
|
|
|
|
if (!actualTool && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
|
|
actualTool = Object.entries(toolDefinitions)
|
|
.filter(([key]) => key.startsWith(`${tool}_`))
|
|
|
|
.map(([_, val]) => val);
|
|
} else if (!actualTool) {
|
|
continue;
|
|
}
|
|
|
|
if (Array.isArray(actualTool)) {
|
|
for (const subTool of actualTool) {
|
|
if (!subTool.function) {
|
|
tools.push(subTool);
|
|
continue;
|
|
}
|
|
|
|
const updatedTool = await validateAndUpdateTool({ req, tool: subTool, assistant_id });
|
|
if (updatedTool) {
|
|
tools.push(updatedTool);
|
|
}
|
|
}
|
|
continue;
|
|
}
|
|
|
|
if (actualTool.type === ToolCallTypes.FILE_SEARCH) {
|
|
hasFileSearch = true;
|
|
}
|
|
|
|
if (!actualTool.function) {
|
|
tools.push(actualTool);
|
|
continue;
|
|
}
|
|
|
|
const updatedTool = await validateAndUpdateTool({ req, tool: actualTool, assistant_id });
|
|
if (updatedTool) {
|
|
tools.push(updatedTool);
|
|
}
|
|
}
|
|
|
|
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) {
|
|
updateData.model = openai.locals.azureOptions.azureOpenAIApiDeploymentName;
|
|
}
|
|
|
|
const assistant = await openai.beta.assistants.update(assistant_id, updateData);
|
|
|
|
if (conversation_starters) {
|
|
assistant.conversation_starters = conversation_starters;
|
|
}
|
|
|
|
return assistant;
|
|
};
|
|
|
|
/**
|
|
* Modifies an assistant with the resource file id.
|
|
* @param {object} params
|
|
* @param {Express.Request} params.req
|
|
* @param {OpenAIClient} params.openai
|
|
* @param {string} params.assistant_id
|
|
* @param {string} params.tool_resource
|
|
* @param {string} params.file_id
|
|
* @returns {Promise<Assistant>} The updated assistant.
|
|
*/
|
|
const addResourceFileId = async ({ req, openai, assistant_id, tool_resource, file_id }) => {
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
const { tool_resources = {} } = assistant;
|
|
if (tool_resources[tool_resource]) {
|
|
tool_resources[tool_resource].file_ids.push(file_id);
|
|
} else {
|
|
tool_resources[tool_resource] = { file_ids: [file_id] };
|
|
}
|
|
|
|
delete assistant.id;
|
|
return await updateAssistant({
|
|
req,
|
|
openai,
|
|
assistant_id,
|
|
updateData: { tools: assistant.tools, tool_resources },
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Deletes a file ID from an assistant's resource.
|
|
* @param {object} params
|
|
* @param {Express.Request} params.req
|
|
* @param {OpenAIClient} params.openai
|
|
* @param {string} params.assistant_id
|
|
* @param {string} [params.tool_resource]
|
|
* @param {string} params.file_id
|
|
* @param {AssistantUpdateParams} params.updateData
|
|
* @returns {Promise<Assistant>} The updated assistant.
|
|
*/
|
|
const deleteResourceFileId = async ({ req, openai, assistant_id, tool_resource, file_id }) => {
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
const { tool_resources = {} } = assistant;
|
|
|
|
if (tool_resource && tool_resources[tool_resource]) {
|
|
const resource = tool_resources[tool_resource];
|
|
const index = resource.file_ids.indexOf(file_id);
|
|
if (index !== -1) {
|
|
resource.file_ids.splice(index, 1);
|
|
}
|
|
} else {
|
|
for (const resourceKey in tool_resources) {
|
|
const resource = tool_resources[resourceKey];
|
|
const index = resource.file_ids.indexOf(file_id);
|
|
if (index !== -1) {
|
|
resource.file_ids.splice(index, 1);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
delete assistant.id;
|
|
return await updateAssistant({
|
|
req,
|
|
openai,
|
|
assistant_id,
|
|
updateData: { tools: assistant.tools, tool_resources },
|
|
});
|
|
};
|
|
|
|
/**
|
|
* 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 });
|
|
const assistant_id = req.params.id;
|
|
const { endpoint: _e, ...updateData } = req.body;
|
|
updateData.tools = updateData.tools ?? [];
|
|
const updatedAssistant = await updateAssistant({ req, openai, assistant_id, updateData });
|
|
res.json(updatedAssistant);
|
|
} catch (error) {
|
|
logger.error('[/assistants/:id] Error updating assistant', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
patchAssistant,
|
|
createAssistant,
|
|
updateAssistant,
|
|
addResourceFileId,
|
|
deleteResourceFileId,
|
|
};
|