mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-21 21:50:49 +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
209 lines
7.3 KiB
JavaScript
209 lines
7.3 KiB
JavaScript
const express = require('express');
|
|
const { nanoid } = require('nanoid');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { actionDelimiter, EModelEndpoint, removeNullishValues } = require('librechat-data-provider');
|
|
const { encryptMetadata, domainParser } = require('~/server/services/ActionService');
|
|
const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');
|
|
const { updateAction, getActions, deleteAction } = require('~/models/Action');
|
|
const { updateAssistantDoc, getAssistant } = require('~/models/Assistant');
|
|
const { isActionDomainAllowed } = require('~/server/services/domains');
|
|
|
|
const router = express.Router();
|
|
|
|
/**
|
|
* Adds or updates actions for a specific assistant.
|
|
* @route POST /actions/:assistant_id
|
|
* @param {string} req.params.assistant_id - The ID of the assistant.
|
|
* @param {FunctionTool[]} req.body.functions - The functions to be added or updated.
|
|
* @param {string} [req.body.action_id] - Optional ID for the action.
|
|
* @param {ActionMetadata} req.body.metadata - Metadata for the action.
|
|
* @returns {Object} 200 - success response - application/json
|
|
*/
|
|
router.post('/:assistant_id', async (req, res) => {
|
|
try {
|
|
const appConfig = req.config;
|
|
const { assistant_id } = req.params;
|
|
|
|
/** @type {{ functions: FunctionTool[], action_id: string, metadata: ActionMetadata }} */
|
|
const { functions, action_id: _action_id, metadata: _metadata } = req.body;
|
|
if (!functions.length) {
|
|
return res.status(400).json({ message: 'No functions provided' });
|
|
}
|
|
|
|
let metadata = await encryptMetadata(removeNullishValues(_metadata, true));
|
|
const isDomainAllowed = await isActionDomainAllowed(
|
|
metadata.domain,
|
|
appConfig?.actions?.allowedDomains,
|
|
);
|
|
if (!isDomainAllowed) {
|
|
return res.status(400).json({ message: 'Domain not allowed' });
|
|
}
|
|
|
|
let { domain } = metadata;
|
|
domain = await domainParser(domain, true);
|
|
|
|
if (!domain) {
|
|
return res.status(400).json({ message: 'No domain provided' });
|
|
}
|
|
|
|
const action_id = _action_id ?? nanoid();
|
|
const initialPromises = [];
|
|
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
|
|
initialPromises.push(getAssistant({ assistant_id }));
|
|
initialPromises.push(openai.beta.assistants.retrieve(assistant_id));
|
|
!!_action_id && initialPromises.push(getActions({ action_id }, true));
|
|
|
|
/** @type {[AssistantDocument, Assistant, [Action|undefined]]} */
|
|
const [assistant_data, assistant, actions_result] = await Promise.all(initialPromises);
|
|
|
|
if (actions_result && actions_result.length) {
|
|
const action = actions_result[0];
|
|
metadata = { ...action.metadata, ...metadata };
|
|
}
|
|
|
|
if (!assistant) {
|
|
return res.status(404).json({ message: 'Assistant not found' });
|
|
}
|
|
|
|
const { actions: _actions = [], user: assistant_user } = assistant_data ?? {};
|
|
const actions = [];
|
|
for (const action of _actions) {
|
|
const [_action_domain, current_action_id] = action.split(actionDelimiter);
|
|
if (current_action_id === action_id) {
|
|
continue;
|
|
}
|
|
|
|
actions.push(action);
|
|
}
|
|
|
|
actions.push(`${domain}${actionDelimiter}${action_id}`);
|
|
|
|
/** @type {{ tools: FunctionTool[] | { type: 'code_interpreter'|'retrieval'}[]}} */
|
|
const { tools: _tools = [] } = assistant;
|
|
|
|
const tools = _tools
|
|
.filter(
|
|
(tool) =>
|
|
!(
|
|
tool.function &&
|
|
(tool.function.name.includes(domain) || tool.function.name.includes(action_id))
|
|
),
|
|
)
|
|
.concat(
|
|
functions.map((tool) => ({
|
|
...tool,
|
|
function: {
|
|
...tool.function,
|
|
name: `${tool.function.name}${actionDelimiter}${domain}`,
|
|
},
|
|
})),
|
|
);
|
|
|
|
let updatedAssistant = await openai.beta.assistants.update(assistant_id, { tools });
|
|
const promises = [];
|
|
|
|
// Only update user field for new assistant documents
|
|
const assistantUpdateData = { actions };
|
|
if (!assistant_data) {
|
|
assistantUpdateData.user = req.user.id;
|
|
}
|
|
promises.push(updateAssistantDoc({ assistant_id }, assistantUpdateData));
|
|
|
|
// Only update user field for new actions
|
|
const actionUpdateData = { metadata, assistant_id };
|
|
if (!actions_result || !actions_result.length) {
|
|
// For new actions, use the assistant owner's user ID
|
|
actionUpdateData.user = assistant_user || req.user.id;
|
|
}
|
|
promises.push(updateAction({ action_id }, actionUpdateData));
|
|
|
|
/** @type {[AssistantDocument, Action]} */
|
|
let [assistantDocument, updatedAction] = await Promise.all(promises);
|
|
const sensitiveFields = ['api_key', 'oauth_client_id', 'oauth_client_secret'];
|
|
for (let field of sensitiveFields) {
|
|
if (updatedAction.metadata[field]) {
|
|
delete updatedAction.metadata[field];
|
|
}
|
|
}
|
|
|
|
/* Map Azure OpenAI model to the assistant as defined by config */
|
|
if (appConfig.endpoints?.[EModelEndpoint.azureOpenAI]?.assistants) {
|
|
updatedAssistant = {
|
|
...updatedAssistant,
|
|
model: req.body.model,
|
|
};
|
|
}
|
|
|
|
res.json([assistantDocument, updatedAssistant, updatedAction]);
|
|
} catch (error) {
|
|
const message = 'Trouble updating the Assistant Action';
|
|
logger.error(message, error);
|
|
res.status(500).json({ message });
|
|
}
|
|
});
|
|
|
|
/**
|
|
* Deletes an action for a specific assistant.
|
|
* @route DELETE /actions/:assistant_id/:action_id
|
|
* @param {string} req.params.assistant_id - The ID of the assistant.
|
|
* @param {string} req.params.action_id - The ID of the action to delete.
|
|
* @returns {Object} 200 - success response - application/json
|
|
*/
|
|
router.delete('/:assistant_id/:action_id/:model', async (req, res) => {
|
|
try {
|
|
const { assistant_id, action_id, model } = req.params;
|
|
req.body.model = model;
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
|
|
const initialPromises = [];
|
|
initialPromises.push(getAssistant({ assistant_id }));
|
|
initialPromises.push(openai.beta.assistants.retrieve(assistant_id));
|
|
|
|
/** @type {[AssistantDocument, Assistant]} */
|
|
const [assistant_data, assistant] = await Promise.all(initialPromises);
|
|
|
|
const { actions = [] } = assistant_data ?? {};
|
|
const { tools = [] } = assistant ?? {};
|
|
|
|
let domain = '';
|
|
const updatedActions = actions.filter((action) => {
|
|
if (action.includes(action_id)) {
|
|
[domain] = action.split(actionDelimiter);
|
|
return false;
|
|
}
|
|
return true;
|
|
});
|
|
|
|
domain = await domainParser(domain, true);
|
|
|
|
if (!domain) {
|
|
return res.status(400).json({ message: 'No domain provided' });
|
|
}
|
|
|
|
const updatedTools = tools.filter(
|
|
(tool) => !(tool.function && tool.function.name.includes(domain)),
|
|
);
|
|
|
|
await openai.beta.assistants.update(assistant_id, { tools: updatedTools });
|
|
|
|
const promises = [];
|
|
// Only update user field if assistant document doesn't exist
|
|
const assistantUpdateData = { actions: updatedActions };
|
|
if (!assistant_data) {
|
|
assistantUpdateData.user = req.user.id;
|
|
}
|
|
promises.push(updateAssistantDoc({ assistant_id }, assistantUpdateData));
|
|
promises.push(deleteAction({ action_id }));
|
|
|
|
await Promise.all(promises);
|
|
res.status(200).json({ message: 'Action deleted successfully' });
|
|
} catch (error) {
|
|
const message = 'Trouble deleting the Assistant Action';
|
|
logger.error(message, error);
|
|
res.status(500).json({ message });
|
|
}
|
|
});
|
|
|
|
module.exports = router;
|