mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +02:00

* agents - phase 1 (#30) * chore: copy assistant files * feat: frontend and data-provider * feat: backend get endpoint test * fix(MessageEndpointIcon): switched to AgentName and AgentAvatar * fix: small fixes * fix: agent endpoint config * fix: show Agent Builder * chore: install agentus * chore: initial scaffolding for agents * fix: updated Assistant logic to Agent Logic for some Agent components * WIP first pass, demo of agent package * WIP: initial backend infra for agents * fix: agent list error * wip: agents routing * chore: Refactor useSSE hook to handle different data events * wip: correctly emit events * chore: Update @librechat/agentus npm dependency to version 1.0.9 * remove comment * first pass: streaming agent text * chore: Remove @librechat/agentus root-level workspace npm dependency * feat: Agent Schema and Model * fix: content handling fixes * fix: content message save * WIP: new content data * fix: run step issue with tool calls * chore: Update @librechat/agentus npm dependency to version 1.1.5 * feat: update controller and agent routes * wip: initial backend tool and tool error handling support * wip: tool chunks * chore: Update @librechat/agentus npm dependency to version 1.1.7 * chore: update tool_call typing, add test conditions and logs * fix: create agent * fix: create agent * first pass: render completed content parts * fix: remove logging, fix step handler typing * chore: Update @librechat/agentus npm dependency to version 1.1.9 * refactor: cleanup maps on unmount * chore: Update BaseClient.js to safely count tokens for string, number, and boolean values * fix: support subsequent messages with tool_calls * chore: export order * fix: select agent * fix: tool call types and handling * chore: switch to anthropic for testing * fix: AgentSelect * refactor: experimental: OpenAIClient to use array for intermediateReply * fix(useSSE): revert old condition for streaming legacy client tokens * fix: lint * revert `agent_id` to `id` * chore: update localization keys for agent-related components * feat: zod schema handling for actions * refactor(actions): if no params, no zodSchema * chore: Update @librechat/agentus npm dependency to version 1.2.1 * feat: first pass, actions * refactor: empty schema for actions without params * feat: Update createRun function to accept additional options * fix: message payload formatting; feat: add more client options * fix: ToolCall component rendering when action has no args but has output * refactor(ToolCall): allow non-stringy args * WIP: first pass, correctly formatted tool_calls between providers * refactor: Remove duplicate import of 'roles' module * refactor: Exclude 'vite.config.ts' from TypeScript compilation * refactor: fix agent related types > - no need to use endpoint/model fields for identifying agent metadata > - add `provider` distinction for agent-configured 'endpoint' - no need for agent-endpoint map - reduce complexity of tools as functions into tools as string[] - fix types related to above changes - reduce unnecessary variables for queries/mutations and corresponding react-query keys * refactor: Add tools and tool_kwargs fields to agent schema * refactor: Remove unused code and update dependencies * refactor: Update updateAgentHandler to use req.body directly * refactor: Update AgentSelect component to use localized hooks * refactor: Update agent schema to include tools and provider fields * refactor(AgentPanel): add scrollbar gutter, add provider field to form, fix agent schema required values * refactor: Update AgentSwitcher component to use selectedAgentId instead of selectedAgent * refactor: Update AgentPanel component to include alternateName import and defaultAgentFormValues * refactor(SelectDropDown): allow setting value as option while still supporting legacy usage (string values only) * refactor: SelectDropdown changes - Only necessary when the available values are objects with label/value fields and the selected value is expected to be a string. * refactor: TypeError issues and handle provider as option * feat: Add placeholder for provider selection in AgentPanel component * refactor: Update agent schema to include author and provider fields * fix: show expected 'create agent' placeholder when creating agent * chore: fix localization strings, hide capabilities form for now * chore: typing * refactor: import order and use compact agents schema for now * chore: typing * refactor: Update AgentForm type to use AgentCapabilities * fix agent form agent selection issues * feat: responsive agent selection * fix: Handle cancelled fetch in useSelectAgent hook * fix: reset agent form on accordion close/open * feat: Add agent_id to default conversation for agents endpoint * feat: agents endpoint request handling * refactor: reset conversation model on agent select * refactor: add `additional_instructions` to conversation schema, organize other fields * chore: casing * chore: types * refactor(loadAgentTools): explicitly pass agent_id, do not pass `model` to loadAgentTools for now, load action sets by agent_id * WIP: initial draft of real agent client initialization * WIP: first pass, anthropic agent requests * feat: remember last selected agent * feat: openai and azure connected * fix: prioritize agent model for runs unless an explicit override model is passed from client * feat: Agent Actions * fix: save agent id to convo * feat: model panel (#29) * feat: model panel * bring back comments * fix: method still null * fix: AgentPanel FormContext * feat: add more parameters * fix: style issues; refactor: Agent Controller * fix: cherry-pick * fix: Update AgentAvatar component to use AssistantIcon instead of BrainCircuit * feat: OGDialog for delete agent; feat(assistant): update Agent types, introduced `model_parameters` * feat: icon and general `model_parameters` update * feat: use react-hook-form better * fix: agent builder form reset issue when switching panels * refactor: modularize agent builder form --------- Co-authored-by: Danny Avila <danny@librechat.ai> * fix: AgentPanel and ModelPanel type issues and use `useFormContext` and `watch` instead of `methods` directly and `useWatch`. * fix: tool call issues due to invalid input (anthropic) of empty string * fix: handle empty text in Part component --------- Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com> * refactor: remove form ModelPanel and fixed nested ternary expressions in AgentConfig * fix: Model Parameters not saved correctly * refactor: remove console log * feat: avatar upload and get for Agents (#36) Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com> * chore: update to public package * fix: typing, optional chaining * fix: cursor not showing for content parts * chore: conditionally enable agents * ci: fix azure test * ci: fix frontend tests, fix eslint api * refactor: Remove unused errorContentPart variable * continue of the agent message PR (#40) * last fixes * fix: agentMap * pr merge test (#41) * fix: model icon not fetching correctly * remove console logs * feat: agent name * refactor: pass documentsMap as a prop to allow re-render of assistant form * refactor: pass documentsMap as a prop to allow re-render of assistant form * chore: Bump version to 0.7.419 * fix: TypeError: Cannot read properties of undefined (reading 'id') * refactor: update AgentSwitcher component to use ControlCombobox instead of Combobox --------- Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com>
153 lines
5.2 KiB
JavaScript
153 lines
5.2 KiB
JavaScript
// errorHandler.js
|
|
const { logger } = require('~/config');
|
|
const getLogStores = require('~/cache/getLogStores');
|
|
const { CacheKeys, ViolationTypes } = require('librechat-data-provider');
|
|
const { recordUsage } = require('~/server/services/Threads');
|
|
const { getConvo } = require('~/models/Conversation');
|
|
const { sendResponse } = require('~/server/utils');
|
|
|
|
/**
|
|
* @typedef {Object} ErrorHandlerContext
|
|
* @property {OpenAIClient} openai - The OpenAI client
|
|
* @property {string} run_id - The run ID
|
|
* @property {boolean} completedRun - Whether the run has completed
|
|
* @property {string} assistant_id - The assistant ID
|
|
* @property {string} conversationId - The conversation ID
|
|
* @property {string} parentMessageId - The parent message ID
|
|
* @property {string} responseMessageId - The response message ID
|
|
* @property {string} endpoint - The endpoint being used
|
|
* @property {string} cacheKey - The cache key for the current request
|
|
*/
|
|
|
|
/**
|
|
* @typedef {Object} ErrorHandlerDependencies
|
|
* @property {Express.Request} req - The Express request object
|
|
* @property {Express.Response} res - The Express response object
|
|
* @property {() => ErrorHandlerContext} getContext - Function to get the current context
|
|
* @property {string} [originPath] - The origin path for the error handler
|
|
*/
|
|
|
|
/**
|
|
* Creates an error handler function with the given dependencies
|
|
* @param {ErrorHandlerDependencies} dependencies - The dependencies for the error handler
|
|
* @returns {(error: Error) => Promise<void>} The error handler function
|
|
*/
|
|
const createErrorHandler = ({ req, res, getContext, originPath = '/assistants/chat/' }) => {
|
|
const cache = getLogStores(CacheKeys.ABORT_KEYS);
|
|
|
|
/**
|
|
* Handles errors that occur during the chat process
|
|
* @param {Error} error - The error that occurred
|
|
* @returns {Promise<void>}
|
|
*/
|
|
return async (error) => {
|
|
const {
|
|
openai,
|
|
run_id,
|
|
endpoint,
|
|
cacheKey,
|
|
completedRun,
|
|
assistant_id,
|
|
conversationId,
|
|
parentMessageId,
|
|
responseMessageId,
|
|
} = getContext();
|
|
|
|
const defaultErrorMessage =
|
|
'The Assistant run failed to initialize. Try sending a message in a new conversation.';
|
|
const messageData = {
|
|
assistant_id,
|
|
conversationId,
|
|
parentMessageId,
|
|
sender: 'System',
|
|
user: req.user.id,
|
|
shouldSaveMessage: false,
|
|
messageId: responseMessageId,
|
|
endpoint,
|
|
};
|
|
|
|
if (error.message === 'Run cancelled') {
|
|
return res.end();
|
|
} else if (error.message === 'Request closed' && completedRun) {
|
|
return;
|
|
} else if (error.message === 'Request closed') {
|
|
logger.debug(`[${originPath}] Request aborted on close`);
|
|
} else if (/Files.*are invalid/.test(error.message)) {
|
|
const errorMessage = `Files are invalid, or may not have uploaded yet.${
|
|
endpoint === 'azureAssistants'
|
|
? ' If using Azure OpenAI, files are only available in the region of the assistant\'s model at the time of upload.'
|
|
: ''
|
|
}`;
|
|
return sendResponse(req, res, messageData, errorMessage);
|
|
} else if (error?.message?.includes('string too long')) {
|
|
return sendResponse(
|
|
req,
|
|
res,
|
|
messageData,
|
|
'Message too long. The Assistants API has a limit of 32,768 characters per message. Please shorten it and try again.',
|
|
);
|
|
} else if (error?.message?.includes(ViolationTypes.TOKEN_BALANCE)) {
|
|
return sendResponse(req, res, messageData, error.message);
|
|
} else {
|
|
logger.error(`[${originPath}]`, error);
|
|
}
|
|
|
|
if (!openai || !run_id) {
|
|
return sendResponse(req, res, messageData, defaultErrorMessage);
|
|
}
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 2000));
|
|
|
|
try {
|
|
const status = await cache.get(cacheKey);
|
|
if (status === 'cancelled') {
|
|
logger.debug(`[${originPath}] Run already cancelled`);
|
|
return res.end();
|
|
}
|
|
await cache.delete(cacheKey);
|
|
// const cancelledRun = await openai.beta.threads.runs.cancel(thread_id, run_id);
|
|
// logger.debug(`[${originPath}] Cancelled run:`, cancelledRun);
|
|
} catch (error) {
|
|
logger.error(`[${originPath}] Error cancelling run`, error);
|
|
}
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 2000));
|
|
|
|
let run;
|
|
try {
|
|
// run = await openai.beta.threads.runs.retrieve(thread_id, run_id);
|
|
await recordUsage({
|
|
...run.usage,
|
|
model: run.model,
|
|
user: req.user.id,
|
|
conversationId,
|
|
});
|
|
} catch (error) {
|
|
logger.error(`[${originPath}] Error fetching or processing run`, error);
|
|
}
|
|
|
|
let finalEvent;
|
|
try {
|
|
// const errorContentPart = {
|
|
// text: {
|
|
// value:
|
|
// error?.message ?? 'There was an error processing your request. Please try again later.',
|
|
// },
|
|
// type: ContentTypes.ERROR,
|
|
// };
|
|
|
|
finalEvent = {
|
|
final: true,
|
|
conversation: await getConvo(req.user.id, conversationId),
|
|
// runMessages,
|
|
};
|
|
} catch (error) {
|
|
logger.error(`[${originPath}] Error finalizing error process`, error);
|
|
return sendResponse(req, res, messageData, 'The Assistant run failed');
|
|
}
|
|
|
|
return sendResponse(req, res, finalEvent);
|
|
};
|
|
};
|
|
|
|
module.exports = { createErrorHandler };
|