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
384 lines
12 KiB
JavaScript
384 lines
12 KiB
JavaScript
const fs = require('fs').promises;
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { FileContext } = require('librechat-data-provider');
|
|
const { uploadImageBuffer, filterFile } = require('~/server/services/Files/process');
|
|
const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
|
|
const { getStrategyFunctions } = require('~/server/services/Files/strategies');
|
|
const { deleteAssistantActions } = require('~/server/services/ActionService');
|
|
const { updateAssistantDoc, getAssistants } = require('~/models/Assistant');
|
|
const { getOpenAIClient, fetchAssistants } = require('./helpers');
|
|
const { getCachedTools } = require('~/server/services/Config');
|
|
const { manifestToolMap } = require('~/app/clients/tools');
|
|
const { deleteFileByFilter } = require('~/models/File');
|
|
|
|
/**
|
|
* 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 {
|
|
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 });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Retrieves an assistant.
|
|
* @route GET /assistants/:id
|
|
* @param {string} req.params.id - Assistant identifier.
|
|
* @returns {Assistant} 200 - success response - application/json
|
|
*/
|
|
const retrieveAssistant = async (req, res) => {
|
|
try {
|
|
/* NOTE: not actually being used right now */
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
const assistant_id = req.params.id;
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
res.json(assistant);
|
|
} catch (error) {
|
|
logger.error('[/assistants/:id] Error retrieving assistant', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* 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 });
|
|
await validateAuthor({ req, openai });
|
|
|
|
const assistant_id = req.params.id;
|
|
const {
|
|
endpoint: _e,
|
|
conversation_starters,
|
|
append_current_datetime,
|
|
...updateData
|
|
} = req.body;
|
|
|
|
const toolDefinitions = await getCachedTools({ includeGlobal: true });
|
|
|
|
updateData.tools = (updateData.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();
|
|
|
|
if (openai.locals?.azureOptions && updateData.model) {
|
|
updateData.model = openai.locals.azureOptions.azureOpenAIApiDeploymentName;
|
|
}
|
|
|
|
const updatedAssistant = await openai.beta.assistants.update(assistant_id, updateData);
|
|
|
|
if (conversation_starters !== undefined) {
|
|
const conversationStartersUpdate = await updateAssistantDoc(
|
|
{ assistant_id },
|
|
{ conversation_starters },
|
|
);
|
|
updatedAssistant.conversation_starters = conversationStartersUpdate.conversation_starters;
|
|
}
|
|
|
|
if (append_current_datetime !== undefined) {
|
|
await updateAssistantDoc({ assistant_id }, { append_current_datetime });
|
|
updatedAssistant.append_current_datetime = append_current_datetime;
|
|
}
|
|
|
|
res.json(updatedAssistant);
|
|
} catch (error) {
|
|
logger.error('[/assistants/:id] Error updating assistant', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Deletes an assistant.
|
|
* @route DELETE /assistants/:id
|
|
* @param {object} req - Express Request
|
|
* @param {object} req.params - Request params
|
|
* @param {string} req.params.id - Assistant identifier.
|
|
* @returns {Assistant} 200 - success response - application/json
|
|
*/
|
|
const deleteAssistant = async (req, res) => {
|
|
try {
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
await validateAuthor({ req, openai });
|
|
|
|
const assistant_id = req.params.id;
|
|
const deletionStatus = await openai.beta.assistants.delete(assistant_id);
|
|
if (deletionStatus?.deleted) {
|
|
await deleteAssistantActions({ req, assistant_id });
|
|
}
|
|
res.json(deletionStatus);
|
|
} catch (error) {
|
|
logger.error('[/assistants/:id] Error deleting assistant', error);
|
|
res.status(500).json({ error: 'Error deleting assistant' });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Returns a list of assistants.
|
|
* @route GET /assistants
|
|
* @param {object} req - Express Request
|
|
* @param {AssistantListParams} req.query - The assistant list parameters for pagination and sorting.
|
|
* @returns {AssistantListResponse} 200 - success response - application/json
|
|
*/
|
|
const listAssistants = async (req, res) => {
|
|
try {
|
|
const body = await fetchAssistants({ req, res });
|
|
res.json(body);
|
|
} catch (error) {
|
|
logger.error('[/assistants] Error listing assistants', error);
|
|
res.status(500).json({ message: 'Error listing assistants' });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Filter assistants based on configuration.
|
|
*
|
|
* @param {object} params - The parameters object.
|
|
* @param {string} params.userId - The user ID to filter private assistants.
|
|
* @param {AssistantDocument[]} params.assistants - The list of assistants to filter.
|
|
* @param {Partial<TAssistantEndpoint>} [params.assistantsConfig] - The assistant configuration.
|
|
* @returns {AssistantDocument[]} - The filtered list of assistants.
|
|
*/
|
|
function filterAssistantDocs({ documents, userId, assistantsConfig = {} }) {
|
|
const { supportedIds, excludedIds, privateAssistants } = assistantsConfig;
|
|
const removeUserId = (doc) => {
|
|
const { user: _u, ...document } = doc;
|
|
return document;
|
|
};
|
|
|
|
if (privateAssistants) {
|
|
return documents.filter((doc) => userId === doc.user.toString()).map(removeUserId);
|
|
} else if (supportedIds?.length) {
|
|
return documents.filter((doc) => supportedIds.includes(doc.assistant_id)).map(removeUserId);
|
|
} else if (excludedIds?.length) {
|
|
return documents.filter((doc) => !excludedIds.includes(doc.assistant_id)).map(removeUserId);
|
|
}
|
|
return documents.map(removeUserId);
|
|
}
|
|
|
|
/**
|
|
* Returns a list of the user's assistant documents (metadata saved to database).
|
|
* @route GET /assistants/documents
|
|
* @returns {AssistantDocument[]} 200 - success response - application/json
|
|
*/
|
|
const getAssistantDocuments = async (req, res) => {
|
|
try {
|
|
const appConfig = req.config;
|
|
const endpoint = req.query;
|
|
const assistantsConfig = appConfig.endpoints?.[endpoint];
|
|
const documents = await getAssistants(
|
|
{},
|
|
{
|
|
user: 1,
|
|
assistant_id: 1,
|
|
conversation_starters: 1,
|
|
createdAt: 1,
|
|
updatedAt: 1,
|
|
append_current_datetime: 1,
|
|
},
|
|
);
|
|
|
|
const docs = filterAssistantDocs({
|
|
documents,
|
|
userId: req.user.id,
|
|
assistantsConfig,
|
|
});
|
|
res.json(docs);
|
|
} catch (error) {
|
|
logger.error('[/assistants/documents] Error listing assistant documents', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Uploads and updates an avatar for a specific assistant.
|
|
* @route POST /:assistant_id/avatar
|
|
* @param {object} req - Express Request
|
|
* @param {object} req.params - Request params
|
|
* @param {string} req.params.assistant_id - The ID of the assistant.
|
|
* @param {Express.Multer.File} req.file - The avatar image file.
|
|
* @param {object} req.body - Request body
|
|
* @returns {Object} 200 - success response - application/json
|
|
*/
|
|
const uploadAssistantAvatar = async (req, res) => {
|
|
try {
|
|
const appConfig = req.config;
|
|
filterFile({ req, file: req.file, image: true, isAvatar: true });
|
|
const { assistant_id } = req.params;
|
|
if (!assistant_id) {
|
|
return res.status(400).json({ message: 'Assistant ID is required' });
|
|
}
|
|
|
|
const { openai } = await getOpenAIClient({ req, res });
|
|
await validateAuthor({ req, openai });
|
|
|
|
const buffer = await fs.readFile(req.file.path);
|
|
const image = await uploadImageBuffer({
|
|
req,
|
|
context: FileContext.avatar,
|
|
metadata: { buffer },
|
|
});
|
|
|
|
let _metadata;
|
|
|
|
try {
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
if (assistant) {
|
|
_metadata = assistant.metadata;
|
|
}
|
|
} catch (error) {
|
|
logger.error('[/:assistant_id/avatar] Error fetching assistant', error);
|
|
_metadata = {};
|
|
}
|
|
|
|
if (_metadata.avatar && _metadata.avatar_source) {
|
|
const { deleteFile } = getStrategyFunctions(_metadata.avatar_source);
|
|
try {
|
|
await deleteFile(req, { filepath: _metadata.avatar });
|
|
await deleteFileByFilter({ user: req.user.id, filepath: _metadata.avatar });
|
|
} catch (error) {
|
|
logger.error('[/:assistant_id/avatar] Error deleting old avatar', error);
|
|
}
|
|
}
|
|
|
|
const metadata = {
|
|
..._metadata,
|
|
avatar: image.filepath,
|
|
avatar_source: appConfig.fileStrategy,
|
|
};
|
|
|
|
const promises = [];
|
|
promises.push(
|
|
updateAssistantDoc(
|
|
{ assistant_id },
|
|
{
|
|
avatar: {
|
|
filepath: image.filepath,
|
|
source: appConfig.fileStrategy,
|
|
},
|
|
user: req.user.id,
|
|
},
|
|
),
|
|
);
|
|
promises.push(openai.beta.assistants.update(assistant_id, { metadata }));
|
|
|
|
const resolved = await Promise.all(promises);
|
|
res.status(201).json(resolved[1]);
|
|
} catch (error) {
|
|
const message = 'An error occurred while updating the Assistant Avatar';
|
|
logger.error(message, error);
|
|
res.status(500).json({ message });
|
|
} finally {
|
|
try {
|
|
await fs.unlink(req.file.path);
|
|
logger.debug('[/:agent_id/avatar] Temp. image upload file deleted');
|
|
} catch {
|
|
logger.debug('[/:agent_id/avatar] Temp. image upload file already deleted');
|
|
}
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
createAssistant,
|
|
retrieveAssistant,
|
|
patchAssistant,
|
|
deleteAssistant,
|
|
listAssistants,
|
|
getAssistantDocuments,
|
|
uploadAssistantAvatar,
|
|
};
|