mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-26 13:18:51 +01: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
166 lines
4.5 KiB
TypeScript
166 lines
4.5 KiB
TypeScript
import { AuthType, Constants, EToolResources } from 'librechat-data-provider';
|
|
import type { TPlugin } from 'librechat-data-provider';
|
|
import type { MCPManager } from '~/mcp/MCPManager';
|
|
import { LCAvailableTools, LCFunctionTool } from '~/mcp/types';
|
|
|
|
/**
|
|
* Filters out duplicate plugins from the list of plugins.
|
|
*
|
|
* @param plugins The list of plugins to filter.
|
|
* @returns The list of plugins with duplicates removed.
|
|
*/
|
|
export const filterUniquePlugins = (plugins?: TPlugin[]): TPlugin[] => {
|
|
const seen = new Set();
|
|
return (
|
|
plugins?.filter((plugin) => {
|
|
const duplicate = seen.has(plugin.pluginKey);
|
|
seen.add(plugin.pluginKey);
|
|
return !duplicate;
|
|
}) || []
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Determines if a plugin is authenticated by checking if all required authentication fields have non-empty values.
|
|
* Supports alternate authentication fields, allowing validation against multiple possible environment variables.
|
|
*
|
|
* @param plugin The plugin object containing the authentication configuration.
|
|
* @returns True if the plugin is authenticated for all required fields, false otherwise.
|
|
*/
|
|
export const checkPluginAuth = (plugin?: TPlugin): boolean => {
|
|
if (!plugin?.authConfig || plugin.authConfig.length === 0) {
|
|
return false;
|
|
}
|
|
|
|
return plugin.authConfig.every((authFieldObj) => {
|
|
const authFieldOptions = authFieldObj.authField.split('||');
|
|
let isFieldAuthenticated = false;
|
|
|
|
for (const fieldOption of authFieldOptions) {
|
|
const envValue = process.env[fieldOption];
|
|
if (envValue && envValue.trim() !== '' && envValue !== AuthType.USER_PROVIDED) {
|
|
isFieldAuthenticated = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return isFieldAuthenticated;
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Converts MCP function format tool to plugin format
|
|
* @param params
|
|
* @param params.toolKey
|
|
* @param params.toolData
|
|
* @param params.customConfig
|
|
* @returns
|
|
*/
|
|
export function convertMCPToolToPlugin({
|
|
toolKey,
|
|
toolData,
|
|
mcpManager,
|
|
}: {
|
|
toolKey: string;
|
|
toolData: LCFunctionTool;
|
|
mcpManager?: MCPManager;
|
|
}): TPlugin | undefined {
|
|
if (!toolData.function || !toolKey.includes(Constants.mcp_delimiter)) {
|
|
return;
|
|
}
|
|
|
|
const functionData = toolData.function;
|
|
const parts = toolKey.split(Constants.mcp_delimiter);
|
|
const serverName = parts[parts.length - 1];
|
|
|
|
const serverConfig = mcpManager?.getRawConfig(serverName);
|
|
|
|
const plugin: TPlugin = {
|
|
/** Tool name without server suffix */
|
|
name: parts[0],
|
|
pluginKey: toolKey,
|
|
description: functionData.description || '',
|
|
authenticated: true,
|
|
icon: serverConfig?.iconPath,
|
|
};
|
|
|
|
if (!serverConfig?.customUserVars) {
|
|
/** `authConfig` for MCP tools */
|
|
plugin.authConfig = [];
|
|
return plugin;
|
|
}
|
|
|
|
const customVarKeys = Object.keys(serverConfig.customUserVars);
|
|
if (customVarKeys.length === 0) {
|
|
plugin.authConfig = [];
|
|
} else {
|
|
plugin.authConfig = Object.entries(serverConfig.customUserVars).map(([key, value]) => ({
|
|
authField: key,
|
|
label: value.title || key,
|
|
description: value.description || '',
|
|
}));
|
|
}
|
|
|
|
return plugin;
|
|
}
|
|
|
|
/**
|
|
* Converts MCP function format tools to plugin format
|
|
* @param functionTools - Object with function format tools
|
|
* @param customConfig - Custom configuration for MCP servers
|
|
* @returns Array of plugin objects
|
|
*/
|
|
export function convertMCPToolsToPlugins({
|
|
functionTools,
|
|
mcpManager,
|
|
}: {
|
|
functionTools?: LCAvailableTools;
|
|
mcpManager?: MCPManager;
|
|
}): TPlugin[] | undefined {
|
|
if (!functionTools || typeof functionTools !== 'object') {
|
|
return;
|
|
}
|
|
|
|
const plugins: TPlugin[] = [];
|
|
for (const [toolKey, toolData] of Object.entries(functionTools)) {
|
|
const plugin = convertMCPToolToPlugin({ toolKey, toolData, mcpManager });
|
|
if (plugin) {
|
|
plugins.push(plugin);
|
|
}
|
|
}
|
|
|
|
return plugins;
|
|
}
|
|
|
|
/**
|
|
* @param toolkits
|
|
* @param toolName
|
|
* @returns toolKey
|
|
*/
|
|
export function getToolkitKey({
|
|
toolkits,
|
|
toolName,
|
|
}: {
|
|
toolkits: TPlugin[];
|
|
toolName?: string;
|
|
}): string | undefined {
|
|
let toolkitKey: string | undefined;
|
|
if (!toolName) {
|
|
return toolkitKey;
|
|
}
|
|
for (const toolkit of toolkits) {
|
|
if (toolName.startsWith(EToolResources.image_edit)) {
|
|
const splitMatches = toolkit.pluginKey.split('_');
|
|
const suffix = splitMatches[splitMatches.length - 1];
|
|
if (toolName.endsWith(suffix)) {
|
|
toolkitKey = toolkit.pluginKey;
|
|
break;
|
|
}
|
|
}
|
|
if (toolName.startsWith(toolkit.pluginKey)) {
|
|
toolkitKey = toolkit.pluginKey;
|
|
break;
|
|
}
|
|
}
|
|
return toolkitKey;
|
|
}
|