mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-31 07:38:52 +01:00
* chore: bump openai to 4.29.0 and npm audit fix * chore: remove unnecessary stream field from ContentData * feat: new enum and types for AssistantStreamEvent * refactor(AssistantService): remove stream field and add conversationId to text ContentData > - return `finalMessage` and `text` on run completion > - move `processMessages` to services/Threads to avoid circular dependencies with new stream handling > - refactor(processMessages/retrieveAndProcessFile): add new `client` field to differentiate new RunClient type * WIP: new assistants stream handling * chore: stores messages to StreamRunManager * chore: add additional typedefs * fix: pass req and openai to StreamRunManager * fix(AssistantService): pass openai as client to `retrieveAndProcessFile` * WIP: streaming tool i/o, handle in_progress and completed run steps * feat(assistants): process required actions with streaming enabled * chore: condense early return check for useSSE useEffect * chore: remove unnecessary comments and only handle completed tool calls when not function * feat: add TTL for assistants run abort cacheKey * feat: abort stream runs * fix(assistants): render streaming cursor * fix(assistants): hide edit icon as functionality is not supported * fix(textArea): handle pasting edge cases; first, when onChange events wouldn't fire; second, when textarea wouldn't resize * chore: memoize Conversations * chore(useTextarea): reverse args order * fix: load default capabilities when an azure is configured to support assistants, but `assistants` endpoint is not configured * fix(AssistantSelect): update form assistant model on assistant form select * fix(actions): handle azure strict validation for function names to fix crud for actions * chore: remove content data debug log as it fires in rapid succession * feat: improve UX for assistant errors mid-request * feat: add tool call localizations and replace any domain separators from azure action names * refactor(chat): error out tool calls without outputs during handleError * fix(ToolService): handle domain separators allowing Azure use of actions * refactor(StreamRunManager): types and throw Error if tool submission fails
202 lines
6.4 KiB
JavaScript
202 lines
6.4 KiB
JavaScript
const { v4 } = require('uuid');
|
|
const express = require('express');
|
|
const { actionDelimiter } = require('librechat-data-provider');
|
|
const { initializeClient } = require('~/server/services/Endpoints/assistants');
|
|
const { encryptMetadata, domainParser } = require('~/server/services/ActionService');
|
|
const { updateAction, getActions, deleteAction } = require('~/models/Action');
|
|
const { updateAssistant, getAssistant } = require('~/models/Assistant');
|
|
const { logger } = require('~/config');
|
|
|
|
const router = express.Router();
|
|
|
|
/**
|
|
* Retrieves all user's actions
|
|
* @route GET /actions/
|
|
* @param {string} req.params.id - Assistant identifier.
|
|
* @returns {Action[]} 200 - success response - application/json
|
|
*/
|
|
router.get('/', async (req, res) => {
|
|
try {
|
|
res.json(await getActions());
|
|
} catch (error) {
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
});
|
|
|
|
/**
|
|
* 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 { 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 = encryptMetadata(_metadata);
|
|
|
|
let { domain } = metadata;
|
|
/* Azure doesn't support periods in function names */
|
|
domain = domainParser(req, domain, true);
|
|
|
|
if (!domain) {
|
|
return res.status(400).json({ message: 'No domain provided' });
|
|
}
|
|
|
|
const action_id = _action_id ?? v4();
|
|
const initialPromises = [];
|
|
|
|
/** @type {{ openai: OpenAI }} */
|
|
const { openai } = await initializeClient({ 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 = [] } = 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}`,
|
|
},
|
|
})),
|
|
);
|
|
|
|
const promises = [];
|
|
promises.push(
|
|
updateAssistant(
|
|
{ assistant_id },
|
|
{
|
|
actions,
|
|
user: req.user.id,
|
|
},
|
|
),
|
|
);
|
|
promises.push(openai.beta.assistants.update(assistant_id, { tools }));
|
|
promises.push(updateAction({ action_id }, { metadata, assistant_id, user: req.user.id }));
|
|
|
|
/** @type {[AssistantDocument, Assistant, Action]} */
|
|
const resolved = await Promise.all(promises);
|
|
const sensitiveFields = ['api_key', 'oauth_client_id', 'oauth_client_secret'];
|
|
for (let field of sensitiveFields) {
|
|
if (resolved[2].metadata[field]) {
|
|
delete resolved[2].metadata[field];
|
|
}
|
|
}
|
|
res.json(resolved);
|
|
} 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;
|
|
|
|
/** @type {{ openai: OpenAI }} */
|
|
const { openai } = await initializeClient({ 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 = domainParser(req, domain, true);
|
|
|
|
const updatedTools = tools.filter(
|
|
(tool) => !(tool.function && tool.function.name.includes(domain)),
|
|
);
|
|
|
|
const promises = [];
|
|
promises.push(
|
|
updateAssistant(
|
|
{ assistant_id },
|
|
{
|
|
actions: updatedActions,
|
|
user: req.user.id,
|
|
},
|
|
),
|
|
);
|
|
promises.push(openai.beta.assistants.update(assistant_id, { tools: updatedTools }));
|
|
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;
|