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
297 lines
9 KiB
JavaScript
297 lines
9 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { ToolCallTypes } = require('librechat-data-provider');
|
|
const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
|
|
const { validateAndUpdateTool } = require('~/server/services/ActionService');
|
|
const { getCachedTools } = require('~/server/services/Config');
|
|
const { updateAssistantDoc } = require('~/models/Assistant');
|
|
const { manifestToolMap } = require('~/app/clients/tools');
|
|
const { getOpenAIClient } = require('./helpers');
|
|
|
|
/**
|
|
* 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 {
|
|
/** @type {{ openai: OpenAIClient }} */
|
|
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 });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Modifies an assistant.
|
|
* @param {object} params
|
|
* @param {ServerRequest} params.req
|
|
* @param {OpenAIClient} params.openai
|
|
* @param {string} params.assistant_id
|
|
* @param {AssistantUpdateParams} params.updateData
|
|
* @returns {Promise<Assistant>} The updated assistant.
|
|
*/
|
|
const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
|
|
await validateAuthor({ req, openai });
|
|
const tools = [];
|
|
let conversation_starters = null;
|
|
|
|
if (updateData?.conversation_starters) {
|
|
const conversationStartersUpdate = await updateAssistantDoc(
|
|
{ assistant_id: assistant_id },
|
|
{ conversation_starters: updateData.conversation_starters },
|
|
);
|
|
conversation_starters = conversationStartersUpdate.conversation_starters;
|
|
|
|
delete updateData.conversation_starters;
|
|
}
|
|
|
|
if (updateData?.append_current_datetime !== undefined) {
|
|
await updateAssistantDoc(
|
|
{ assistant_id: assistant_id },
|
|
{ append_current_datetime: updateData.append_current_datetime },
|
|
);
|
|
delete updateData.append_current_datetime;
|
|
}
|
|
|
|
let hasFileSearch = false;
|
|
for (const tool of updateData.tools ?? []) {
|
|
const toolDefinitions = await getCachedTools({ includeGlobal: true });
|
|
let actualTool = typeof tool === 'string' ? toolDefinitions[tool] : tool;
|
|
|
|
if (!actualTool && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
|
|
actualTool = Object.entries(toolDefinitions)
|
|
.filter(([key]) => key.startsWith(`${tool}_`))
|
|
|
|
.map(([_, val]) => val);
|
|
} else if (!actualTool) {
|
|
continue;
|
|
}
|
|
|
|
if (Array.isArray(actualTool)) {
|
|
for (const subTool of actualTool) {
|
|
if (!subTool.function) {
|
|
tools.push(subTool);
|
|
continue;
|
|
}
|
|
|
|
const updatedTool = await validateAndUpdateTool({ req, tool: subTool, assistant_id });
|
|
if (updatedTool) {
|
|
tools.push(updatedTool);
|
|
}
|
|
}
|
|
continue;
|
|
}
|
|
|
|
if (actualTool.type === ToolCallTypes.FILE_SEARCH) {
|
|
hasFileSearch = true;
|
|
}
|
|
|
|
if (!actualTool.function) {
|
|
tools.push(actualTool);
|
|
continue;
|
|
}
|
|
|
|
const updatedTool = await validateAndUpdateTool({ req, tool: actualTool, assistant_id });
|
|
if (updatedTool) {
|
|
tools.push(updatedTool);
|
|
}
|
|
}
|
|
|
|
if (hasFileSearch && !updateData.tool_resources) {
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
updateData.tool_resources = assistant.tool_resources ?? null;
|
|
}
|
|
|
|
if (hasFileSearch && !updateData.tool_resources?.file_search) {
|
|
updateData.tool_resources = {
|
|
...(updateData.tool_resources ?? {}),
|
|
file_search: {
|
|
vector_store_ids: [],
|
|
},
|
|
};
|
|
}
|
|
|
|
updateData.tools = tools;
|
|
|
|
if (openai.locals?.azureOptions && updateData.model) {
|
|
updateData.model = openai.locals.azureOptions.azureOpenAIApiDeploymentName;
|
|
}
|
|
|
|
const assistant = await openai.beta.assistants.update(assistant_id, updateData);
|
|
|
|
if (conversation_starters) {
|
|
assistant.conversation_starters = conversation_starters;
|
|
}
|
|
|
|
return assistant;
|
|
};
|
|
|
|
/**
|
|
* Modifies an assistant with the resource file id.
|
|
* @param {object} params
|
|
* @param {ServerRequest} params.req
|
|
* @param {OpenAIClient} params.openai
|
|
* @param {string} params.assistant_id
|
|
* @param {string} params.tool_resource
|
|
* @param {string} params.file_id
|
|
* @returns {Promise<Assistant>} The updated assistant.
|
|
*/
|
|
const addResourceFileId = async ({ req, openai, assistant_id, tool_resource, file_id }) => {
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
const { tool_resources = {} } = assistant;
|
|
if (tool_resources[tool_resource]) {
|
|
tool_resources[tool_resource].file_ids.push(file_id);
|
|
} else {
|
|
tool_resources[tool_resource] = { file_ids: [file_id] };
|
|
}
|
|
|
|
delete assistant.id;
|
|
return await updateAssistant({
|
|
req,
|
|
openai,
|
|
assistant_id,
|
|
updateData: { tools: assistant.tools, tool_resources },
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Deletes a file ID from an assistant's resource.
|
|
* @param {object} params
|
|
* @param {ServerRequest} params.req
|
|
* @param {OpenAIClient} params.openai
|
|
* @param {string} params.assistant_id
|
|
* @param {string} [params.tool_resource]
|
|
* @param {string} params.file_id
|
|
* @param {AssistantUpdateParams} params.updateData
|
|
* @returns {Promise<Assistant>} The updated assistant.
|
|
*/
|
|
const deleteResourceFileId = async ({ req, openai, assistant_id, tool_resource, file_id }) => {
|
|
const assistant = await openai.beta.assistants.retrieve(assistant_id);
|
|
const { tool_resources = {} } = assistant;
|
|
|
|
if (tool_resource && tool_resources[tool_resource]) {
|
|
const resource = tool_resources[tool_resource];
|
|
const index = resource.file_ids.indexOf(file_id);
|
|
if (index !== -1) {
|
|
resource.file_ids.splice(index, 1);
|
|
}
|
|
} else {
|
|
for (const resourceKey in tool_resources) {
|
|
const resource = tool_resources[resourceKey];
|
|
const index = resource.file_ids.indexOf(file_id);
|
|
if (index !== -1) {
|
|
resource.file_ids.splice(index, 1);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
delete assistant.id;
|
|
return await updateAssistant({
|
|
req,
|
|
openai,
|
|
assistant_id,
|
|
updateData: { tools: assistant.tools, tool_resources },
|
|
});
|
|
};
|
|
|
|
/**
|
|
* 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 });
|
|
const assistant_id = req.params.id;
|
|
const { endpoint: _e, ...updateData } = req.body;
|
|
updateData.tools = updateData.tools ?? [];
|
|
const updatedAssistant = await updateAssistant({ req, openai, assistant_id, updateData });
|
|
res.json(updatedAssistant);
|
|
} catch (error) {
|
|
logger.error('[/assistants/:id] Error updating assistant', error);
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
patchAssistant,
|
|
createAssistant,
|
|
updateAssistant,
|
|
addResourceFileId,
|
|
deleteResourceFileId,
|
|
};
|