mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-02-19 08:58:09 +01:00
* chore: move database model methods to /packages/data-schemas * chore: add TypeScript ESLint rule to warn on unused variables * refactor: model imports to streamline access - Consolidated model imports across various files to improve code organization and reduce redundancy. - Updated imports for models such as Assistant, Message, Conversation, and others to a unified import path. - Adjusted middleware and service files to reflect the new import structure, ensuring functionality remains intact. - Enhanced test files to align with the new import paths, maintaining test coverage and integrity. * chore: migrate database models to packages/data-schemas and refactor all direct Mongoose Model usage outside of data-schemas * test: update agent model mocks in unit tests - Added `getAgent` mock to `client.test.js` to enhance test coverage for agent-related functionality. - Removed redundant `getAgent` and `getAgents` mocks from `openai.spec.js` and `responses.unit.spec.js` to streamline test setup and reduce duplication. - Ensured consistency in agent mock implementations across test files. * fix: update types in data-schemas * refactor: enhance type definitions in transaction and spending methods - Updated type definitions in `checkBalance.ts` to use specific request and response types. - Refined `spendTokens.ts` to utilize a new `SpendTxData` interface for better clarity and type safety. - Improved transaction handling in `transaction.ts` by introducing `TransactionResult` and `TxData` interfaces, ensuring consistent data structures across methods. - Adjusted unit tests in `transaction.spec.ts` to accommodate new type definitions and enhance robustness. * refactor: streamline model imports and enhance code organization - Consolidated model imports across various controllers and services to a unified import path, improving code clarity and reducing redundancy. - Updated multiple files to reflect the new import structure, ensuring all functionalities remain intact. - Enhanced overall code organization by removing duplicate import statements and optimizing the usage of model methods. * feat: implement loadAddedAgent and refactor agent loading logic - Introduced `loadAddedAgent` function to handle loading agents from added conversations, supporting multi-convo parallel execution. - Created a new `load.ts` file to encapsulate agent loading functionalities, including `loadEphemeralAgent` and `loadAgent`. - Updated the `index.ts` file to export the new `load` module instead of the deprecated `loadAgent`. - Enhanced type definitions and improved error handling in the agent loading process. - Adjusted unit tests to reflect changes in the agent loading structure and ensure comprehensive coverage. * refactor: enhance balance handling with new update interface - Introduced `IBalanceUpdate` interface to streamline balance update operations across the codebase. - Updated `upsertBalanceFields` method signatures in `balance.ts`, `transaction.ts`, and related tests to utilize the new interface for improved type safety. - Adjusted type imports in `balance.spec.ts` to include `IBalanceUpdate`, ensuring consistency in balance management functionalities. - Enhanced overall code clarity and maintainability by refining type definitions related to balance operations. * feat: add unit tests for loadAgent functionality and enhance agent loading logic - Introduced comprehensive unit tests for the `loadAgent` function, covering various scenarios including null and empty agent IDs, loading of ephemeral agents, and permission checks. - Enhanced the `initializeClient` function by moving `getConvoFiles` to the correct position in the database method exports, ensuring proper functionality. - Improved test coverage for agent loading, including handling of non-existent agents and user permissions. * chore: reorder memory method exports for consistency - Moved `deleteAllUserMemories` to the correct position in the exported memory methods, ensuring a consistent and logical order of method exports in `memory.ts`.
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 { manifestToolMap } = require('~/app/clients/tools');
|
|
const { updateAssistantDoc } = require('~/models');
|
|
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()) ?? {};
|
|
|
|
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()) ?? {};
|
|
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,
|
|
};
|