mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
189 lines
6.9 KiB
JavaScript
189 lines
6.9 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { CacheKeys, Constants } = require('librechat-data-provider');
|
|
const {
|
|
getToolkitKey,
|
|
checkPluginAuth,
|
|
filterUniquePlugins,
|
|
convertMCPToolToPlugin,
|
|
convertMCPToolsToPlugins,
|
|
} = require('@librechat/api');
|
|
const { getCachedTools, setCachedTools, mergeUserTools } = require('~/server/services/Config');
|
|
const { availableTools, toolkits } = require('~/app/clients/tools');
|
|
const { getAppConfig } = require('~/server/services/Config');
|
|
const { getMCPManager } = require('~/config');
|
|
const { getLogStores } = require('~/cache');
|
|
|
|
const getAvailablePluginsController = async (req, res) => {
|
|
try {
|
|
const cache = getLogStores(CacheKeys.CONFIG_STORE);
|
|
const cachedPlugins = await cache.get(CacheKeys.PLUGINS);
|
|
if (cachedPlugins) {
|
|
res.status(200).json(cachedPlugins);
|
|
return;
|
|
}
|
|
|
|
const appConfig = await getAppConfig({ role: req.user?.role });
|
|
/** @type {{ filteredTools: string[], includedTools: string[] }} */
|
|
const { filteredTools = [], includedTools = [] } = appConfig;
|
|
/** @type {import('@librechat/api').LCManifestTool[]} */
|
|
const pluginManifest = availableTools;
|
|
|
|
const uniquePlugins = filterUniquePlugins(pluginManifest);
|
|
let authenticatedPlugins = [];
|
|
for (const plugin of uniquePlugins) {
|
|
authenticatedPlugins.push(
|
|
checkPluginAuth(plugin) ? { ...plugin, authenticated: true } : plugin,
|
|
);
|
|
}
|
|
|
|
let plugins = authenticatedPlugins;
|
|
|
|
if (includedTools.length > 0) {
|
|
plugins = plugins.filter((plugin) => includedTools.includes(plugin.pluginKey));
|
|
} else {
|
|
plugins = plugins.filter((plugin) => !filteredTools.includes(plugin.pluginKey));
|
|
}
|
|
|
|
await cache.set(CacheKeys.PLUGINS, plugins);
|
|
res.status(200).json(plugins);
|
|
} catch (error) {
|
|
res.status(500).json({ message: error.message });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Retrieves and returns a list of available tools, either from a cache or by reading a plugin manifest file.
|
|
*
|
|
* This function first attempts to retrieve the list of tools from a cache. If the tools are not found in the cache,
|
|
* it reads a plugin manifest file, filters for unique plugins, and determines if each plugin is authenticated.
|
|
* Only plugins that are marked as available in the application's local state are included in the final list.
|
|
* The resulting list of tools is then cached and sent to the client.
|
|
*
|
|
* @param {object} req - The request object, containing information about the HTTP request.
|
|
* @param {object} res - The response object, used to send back the desired HTTP response.
|
|
* @returns {Promise<void>} A promise that resolves when the function has completed.
|
|
*/
|
|
const getAvailableTools = async (req, res) => {
|
|
try {
|
|
const userId = req.user?.id;
|
|
if (!userId) {
|
|
logger.warn('[getAvailableTools] User ID not found in request');
|
|
return res.status(401).json({ message: 'Unauthorized' });
|
|
}
|
|
const cache = getLogStores(CacheKeys.CONFIG_STORE);
|
|
const cachedToolsArray = await cache.get(CacheKeys.TOOLS);
|
|
const cachedUserTools = await getCachedTools({ userId });
|
|
|
|
const mcpManager = getMCPManager();
|
|
const userPlugins =
|
|
cachedUserTools != null
|
|
? convertMCPToolsToPlugins({ functionTools: cachedUserTools, mcpManager })
|
|
: undefined;
|
|
|
|
if (cachedToolsArray != null && userPlugins != null) {
|
|
const dedupedTools = filterUniquePlugins([...userPlugins, ...cachedToolsArray]);
|
|
res.status(200).json(dedupedTools);
|
|
return;
|
|
}
|
|
|
|
/** @type {Record<string, FunctionTool> | null} Get tool definitions to filter which tools are actually available */
|
|
let toolDefinitions = await getCachedTools({ includeGlobal: true });
|
|
let prelimCachedTools;
|
|
|
|
/** @type {import('@librechat/api').LCManifestTool[]} */
|
|
let pluginManifest = availableTools;
|
|
|
|
const appConfig = req.config ?? (await getAppConfig({ role: req.user?.role }));
|
|
if (appConfig?.mcpConfig != null) {
|
|
try {
|
|
const mcpTools = await mcpManager.getAllToolFunctions(userId);
|
|
prelimCachedTools = prelimCachedTools ?? {};
|
|
for (const [toolKey, toolData] of Object.entries(mcpTools)) {
|
|
const plugin = convertMCPToolToPlugin({
|
|
toolKey,
|
|
toolData,
|
|
mcpManager,
|
|
});
|
|
if (plugin) {
|
|
pluginManifest.push(plugin);
|
|
}
|
|
prelimCachedTools[toolKey] = toolData;
|
|
}
|
|
await mergeUserTools({ userId, cachedUserTools, userTools: prelimCachedTools });
|
|
} catch (error) {
|
|
logger.error(
|
|
'[getAvailableTools] Error loading MCP Tools, servers may still be initializing:',
|
|
error,
|
|
);
|
|
}
|
|
} else if (prelimCachedTools != null) {
|
|
await setCachedTools(prelimCachedTools, { isGlobal: true });
|
|
}
|
|
|
|
/** @type {TPlugin[]} Deduplicate and authenticate plugins */
|
|
const uniquePlugins = filterUniquePlugins(pluginManifest);
|
|
const authenticatedPlugins = uniquePlugins.map((plugin) => {
|
|
if (checkPluginAuth(plugin)) {
|
|
return { ...plugin, authenticated: true };
|
|
} else {
|
|
return plugin;
|
|
}
|
|
});
|
|
|
|
/** Filter plugins based on availability and add MCP-specific auth config */
|
|
const toolsOutput = [];
|
|
for (const plugin of authenticatedPlugins) {
|
|
const isToolDefined = toolDefinitions[plugin.pluginKey] !== undefined;
|
|
const isToolkit =
|
|
plugin.toolkit === true &&
|
|
Object.keys(toolDefinitions).some(
|
|
(key) => getToolkitKey({ toolkits, toolName: key }) === plugin.pluginKey,
|
|
);
|
|
|
|
if (!isToolDefined && !isToolkit) {
|
|
continue;
|
|
}
|
|
|
|
const toolToAdd = { ...plugin };
|
|
|
|
if (plugin.pluginKey.includes(Constants.mcp_delimiter)) {
|
|
const parts = plugin.pluginKey.split(Constants.mcp_delimiter);
|
|
const serverName = parts[parts.length - 1];
|
|
const serverConfig = appConfig?.mcpConfig?.[serverName];
|
|
|
|
if (serverConfig?.customUserVars) {
|
|
const customVarKeys = Object.keys(serverConfig.customUserVars);
|
|
if (customVarKeys.length === 0) {
|
|
toolToAdd.authConfig = [];
|
|
toolToAdd.authenticated = true;
|
|
} else {
|
|
toolToAdd.authConfig = Object.entries(serverConfig.customUserVars).map(
|
|
([key, value]) => ({
|
|
authField: key,
|
|
label: value.title || key,
|
|
description: value.description || '',
|
|
}),
|
|
);
|
|
toolToAdd.authenticated = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
toolsOutput.push(toolToAdd);
|
|
}
|
|
|
|
const finalTools = filterUniquePlugins(toolsOutput);
|
|
await cache.set(CacheKeys.TOOLS, finalTools);
|
|
|
|
const dedupedTools = filterUniquePlugins([...(userPlugins ?? []), ...finalTools]);
|
|
res.status(200).json(dedupedTools);
|
|
} catch (error) {
|
|
logger.error('[getAvailableTools]', error);
|
|
res.status(500).json({ message: error.message });
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
getAvailableTools,
|
|
getAvailablePluginsController,
|
|
};
|