* ✨ feat: Add connection status endpoint for MCP servers - Implemented a new endpoint to retrieve the connection status of all MCP servers without disconnecting idle connections. - Enhanced MCPManager class with a method to get all user-specific connections. * feat: add silencer arg to loadCustomConfig function to conditionally print config details - Modified loadCustomConfig to accept a printConfig parameter that allows me to prevent the entire custom config being printed every time it is called * fix: new status endpoint actually works now, changes to manager.ts to support it - Updated the connection status endpoint to utilize Maps for app and user connections, rather than incorrectly treating them as objects. - Introduced a new method + variable in MCPManager to track servers requiring OAuth discovered at startup. - Stopped OAuth flow from continuing once detected during startup for a new connection * refactor: Remove hasAuthConfig since we can get that on the frontend without needing to use the endpoint * feat: Add MCP connection status query and query key for new endpoint - Introduced a new query hook `useMCPConnectionStatusQuery` to fetch the connection status of MCP servers. - Added request in data-service - Defined the API endpoint for retrieving MCP connection status in api-endpoints.ts. - Defined new types for MCP connection status responses in the types module. - Added mcpConnectionStatus key * feat: Enhance MCPSelect component with connection status and server configuration - Added connection status handling for MCP servers using the new `useMCPConnectionStatusQuery` hook. - Implemented logic to display appropriate status icons based on connection state and authentication configuration. - Updated the server selection logic to utilize configured MCP servers from the startup configuration. - Refactored the rendering of configuration buttons and status indicators for improved user interaction. * refactor: move MCPConfigDialog to its own MCP subdir in ui and update import * refactor: silence loadCustomConfig in status endpoint * feat: Add optional pluginKey parameter to getUserPluginAuthValue * feat: Add MCP authentication values endpoint and related queries - Implemented a new endpoint to check authentication value flags for specific MCP servers, returning boolean indicators for each custom user variable. - Added a corresponding query hook `useMCPAuthValuesQuery` to fetch authentication values from the frontend. - Defined the API endpoint for retrieving MCP authentication values in api-endpoints.ts. - Updated data-service to include a method for fetching MCP authentication values. - Introduced new types for MCP authentication values responses in the types module. - Added a new query key for MCP authentication values. * feat: Localize MCPSelect component status labels and aria attributes - Updated the MCPSelect component to use localized strings for connection status labels and aria attributes, enhancing accessibility and internationalization support. - Added new translation keys for various connection states in the translation.json file. * feat: Implement filtered MCP values selection based on connection status in MCPSelect - Added a new `filteredSetMCPValues` function to ensure only connected servers are selectable in the MCPSelect component. - Updated the rendering logic to visually indicate the connection status of servers by adjusting opacity. - Enhanced accessibility by localizing the aria-label for the configuration button. * feat: Add CustomUserVarsSection component for managing user variables - Introduced a new `CustomUserVarsSection` component to allow users to configure custom variables for MCP servers. - Integrated localization for user interface elements and added new translation keys for variable management. - Added functionality to save and revoke user variables, with visual indicators for set/unset states. * feat: Enhance MCPSelect and MCPConfigDialog with improved state management and UI updates - Integrated `useQueryClient` to refetch queries for tools, authentication values, and connection status upon successful plugin updates in MCPSelect. - Simplified plugin key handling by directly using the formatted plugin key in save and revoke operations. - Updated MCPConfigDialog to include server status indicators and improved dialog content structure for better user experience. - Added new translation key for active status in the localization files. * feat: Enhance MCPConfigDialog with dynamic server status badges and localization updates - Added a helper function to render status badges based on the connection state of the MCP server, improving user feedback on connection status. - Updated the localization files to include new translation keys for connection states such as "Connecting" and "Offline". - Refactored the dialog to utilize the new status rendering function for better code organization and readability. * feat: Implement OAuth handling and server initialization in MCP reinitialize flow - Added OAuth handling to the MCP reinitialize endpoint, allowing the server to capture and return OAuth URLs when required. - Updated the MCPConfigDialog to include a new ServerInitializationSection for managing server initialization and OAuth flow. - Enhanced the user experience by providing feedback on server status and OAuth requirements through localized messages. - Introduced new translation keys for OAuth-related messages in the localization files. - Refactored the MCPSelect component to remove unused authentication configuration props. * feat: Make OAuth actually work / update after OAuth link authorized - Improved the handling of OAuth flows in the MCP reinitialize process, allowing for immediate return when OAuth is initiated. - Updated the UserController to extract server names from plugin keys for better logging and connection management. - Enhanced the MCPSelect component to reflect authentication status based on OAuth requirements. - Implemented polling for OAuth completion in the ServerInitializationSection to improve user feedback during the connection process. - Refactored MCPManager to support new OAuth flow initiation logic and connection handling. * refactor: Simplify MCPPanel component and enhance server status display - Removed unused imports and state management related to user plugins and server reinitialization. - Integrated connection status handling directly into the MCPPanel for improved user feedback. - Updated the rendering logic to display server connection states with visual indicators. - Refactored the editing view to utilize new components for server initialization and custom user variables management. * chore: remove comments * chore: remove unused translation key for MCP panel * refactor: Rename returnOnOAuthInitiated to returnOnOAuth for clarity * refactor: attempt initialize on server click * feat: add cancel OAuth flow functionality and related UI updates * refactor: move server status icon logic into its own component * chore: remove old localization strings (makes more sense for icon labels to just use configure stirng since thats where it leads to) * fix: fix accessibility issues with MCPSelect * fix: add missing save/revoke mutation logic to MCPPanel * styling: add margin to checkmark in MultiSelect * fix: add back in customUserVars check to hide gear config icon for servers without customUserVars --------- Co-authored-by: Dustin Healy <dustinhealy1@gmail.com> Co-authored-by: Dustin Healy <54083382+dustinhealy@users.noreply.github.com>
183 lines
6.0 KiB
JavaScript
183 lines
6.0 KiB
JavaScript
const path = require('path');
|
|
const axios = require('axios');
|
|
const yaml = require('js-yaml');
|
|
const keyBy = require('lodash/keyBy');
|
|
const { loadYaml } = require('@librechat/api');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const {
|
|
CacheKeys,
|
|
configSchema,
|
|
paramSettings,
|
|
EImageOutputType,
|
|
agentParamSettings,
|
|
validateSettingDefinitions,
|
|
} = require('librechat-data-provider');
|
|
const getLogStores = require('~/cache/getLogStores');
|
|
|
|
const projectRoot = path.resolve(__dirname, '..', '..', '..', '..');
|
|
const defaultConfigPath = path.resolve(projectRoot, 'librechat.yaml');
|
|
|
|
let i = 0;
|
|
|
|
/**
|
|
* Load custom configuration files and caches the object if the `cache` field at root is true.
|
|
* Validation via parsing the config file with the config schema.
|
|
* @function loadCustomConfig
|
|
* @returns {Promise<TCustomConfig | null>} A promise that resolves to null or the custom config object.
|
|
* */
|
|
async function loadCustomConfig(printConfig = true) {
|
|
// Use CONFIG_PATH if set, otherwise fallback to defaultConfigPath
|
|
const configPath = process.env.CONFIG_PATH || defaultConfigPath;
|
|
|
|
let customConfig;
|
|
|
|
if (/^https?:\/\//.test(configPath)) {
|
|
try {
|
|
const response = await axios.get(configPath);
|
|
customConfig = response.data;
|
|
} catch (error) {
|
|
i === 0 && logger.error(`Failed to fetch the remote config file from ${configPath}`, error);
|
|
i === 0 && i++;
|
|
return null;
|
|
}
|
|
} else {
|
|
customConfig = loadYaml(configPath);
|
|
if (!customConfig) {
|
|
i === 0 &&
|
|
logger.info(
|
|
'Custom config file missing or YAML format invalid.\n\nCheck out the latest config file guide for configurable options and features.\nhttps://www.librechat.ai/docs/configuration/librechat_yaml\n\n',
|
|
);
|
|
i === 0 && i++;
|
|
return null;
|
|
}
|
|
|
|
if (customConfig.reason || customConfig.stack) {
|
|
i === 0 && logger.error('Config file YAML format is invalid:', customConfig);
|
|
i === 0 && i++;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
if (typeof customConfig === 'string') {
|
|
try {
|
|
customConfig = yaml.load(customConfig);
|
|
} catch (parseError) {
|
|
i === 0 && logger.info(`Failed to parse the YAML config from ${configPath}`, parseError);
|
|
i === 0 && i++;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
const result = configSchema.strict().safeParse(customConfig);
|
|
if (result?.error?.errors?.some((err) => err?.path && err.path?.includes('imageOutputType'))) {
|
|
throw new Error(
|
|
`
|
|
Please specify a correct \`imageOutputType\` value (case-sensitive).
|
|
|
|
The available options are:
|
|
- ${EImageOutputType.JPEG}
|
|
- ${EImageOutputType.PNG}
|
|
- ${EImageOutputType.WEBP}
|
|
|
|
Refer to the latest config file guide for more information:
|
|
https://www.librechat.ai/docs/configuration/librechat_yaml`,
|
|
);
|
|
}
|
|
if (!result.success) {
|
|
let errorMessage = `Invalid custom config file at ${configPath}:
|
|
${JSON.stringify(result.error, null, 2)}`;
|
|
|
|
if (i === 0) {
|
|
logger.error(errorMessage);
|
|
const speechError = result.error.errors.find(
|
|
(err) =>
|
|
err.code === 'unrecognized_keys' &&
|
|
(err.message?.includes('stt') || err.message?.includes('tts')),
|
|
);
|
|
|
|
if (speechError) {
|
|
logger.warn(`
|
|
The Speech-to-text and Text-to-speech configuration format has recently changed.
|
|
If you're getting this error, please refer to the latest documentation:
|
|
|
|
https://www.librechat.ai/docs/configuration/stt_tts`);
|
|
}
|
|
|
|
i++;
|
|
}
|
|
|
|
return null;
|
|
} else {
|
|
if (printConfig) {
|
|
logger.info('Custom config file loaded:');
|
|
logger.info(JSON.stringify(customConfig, null, 2));
|
|
logger.debug('Custom config:', customConfig);
|
|
}
|
|
}
|
|
|
|
(customConfig.endpoints?.custom ?? [])
|
|
.filter((endpoint) => endpoint.customParams)
|
|
.forEach((endpoint) => parseCustomParams(endpoint.name, endpoint.customParams));
|
|
|
|
if (customConfig.cache) {
|
|
const cache = getLogStores(CacheKeys.CONFIG_STORE);
|
|
await cache.set(CacheKeys.CUSTOM_CONFIG, customConfig);
|
|
}
|
|
|
|
if (result.data.modelSpecs) {
|
|
customConfig.modelSpecs = result.data.modelSpecs;
|
|
}
|
|
|
|
return customConfig;
|
|
}
|
|
|
|
// Validate and fill out missing values for custom parameters
|
|
function parseCustomParams(endpointName, customParams) {
|
|
const paramEndpoint = customParams.defaultParamsEndpoint;
|
|
customParams.paramDefinitions = customParams.paramDefinitions || [];
|
|
|
|
// Checks if `defaultParamsEndpoint` is a key in `paramSettings`.
|
|
const validEndpoints = new Set([
|
|
...Object.keys(paramSettings),
|
|
...Object.keys(agentParamSettings),
|
|
]);
|
|
if (!validEndpoints.has(paramEndpoint)) {
|
|
throw new Error(
|
|
`defaultParamsEndpoint of "${endpointName}" endpoint is invalid. ` +
|
|
`Valid options are ${Array.from(validEndpoints).join(', ')}`,
|
|
);
|
|
}
|
|
|
|
// creates default param maps
|
|
const regularParams = paramSettings[paramEndpoint] ?? [];
|
|
const agentParams = agentParamSettings[paramEndpoint] ?? [];
|
|
const defaultParams = regularParams.concat(agentParams);
|
|
const defaultParamsMap = keyBy(defaultParams, 'key');
|
|
|
|
// TODO: Remove this check once we support new parameters not part of default parameters.
|
|
// Checks if every key in `paramDefinitions` is valid.
|
|
const validKeys = new Set(Object.keys(defaultParamsMap));
|
|
const paramKeys = customParams.paramDefinitions.map((param) => param.key);
|
|
if (paramKeys.some((key) => !validKeys.has(key))) {
|
|
throw new Error(
|
|
`paramDefinitions of "${endpointName}" endpoint contains invalid key(s). ` +
|
|
`Valid parameter keys are ${Array.from(validKeys).join(', ')}`,
|
|
);
|
|
}
|
|
|
|
// Fill out missing values for custom param definitions
|
|
customParams.paramDefinitions = customParams.paramDefinitions.map((param) => {
|
|
return { ...defaultParamsMap[param.key], ...param, optionType: 'custom' };
|
|
});
|
|
|
|
try {
|
|
validateSettingDefinitions(customParams.paramDefinitions);
|
|
} catch (e) {
|
|
throw new Error(
|
|
`Custom parameter definitions for "${endpointName}" endpoint is malformed: ${e.message}`,
|
|
);
|
|
}
|
|
}
|
|
|
|
module.exports = loadCustomConfig;
|