mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 08:50:15 +01:00
* 📦 chore: Update @librechat/agents to version 2.0.5 * fix: Update error handling in AskController and EditController to include overrideParentMessageId when catching errors * fix: Update parentMessageId assignment in AgentController to prioritize overrideParentMessageId * 🌍 i18n: Update translation.json with latest translations --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
152 lines
4.3 KiB
JavaScript
152 lines
4.3 KiB
JavaScript
const { Constants } = require('librechat-data-provider');
|
|
const { createAbortController, handleAbortError } = require('~/server/middleware');
|
|
const { sendMessage } = require('~/server/utils');
|
|
const { saveMessage } = require('~/models');
|
|
const { logger } = require('~/config');
|
|
|
|
const AgentController = async (req, res, next, initializeClient, addTitle) => {
|
|
let {
|
|
text,
|
|
endpointOption,
|
|
conversationId,
|
|
parentMessageId = null,
|
|
overrideParentMessageId = null,
|
|
} = req.body;
|
|
|
|
let sender;
|
|
let userMessage;
|
|
let promptTokens;
|
|
let userMessageId;
|
|
let responseMessageId;
|
|
let userMessagePromise;
|
|
|
|
const newConvo = !conversationId;
|
|
const user = req.user.id;
|
|
|
|
const getReqData = (data = {}) => {
|
|
for (let key in data) {
|
|
if (key === 'userMessage') {
|
|
userMessage = data[key];
|
|
userMessageId = data[key].messageId;
|
|
} else if (key === 'userMessagePromise') {
|
|
userMessagePromise = data[key];
|
|
} else if (key === 'responseMessageId') {
|
|
responseMessageId = data[key];
|
|
} else if (key === 'promptTokens') {
|
|
promptTokens = data[key];
|
|
} else if (key === 'sender') {
|
|
sender = data[key];
|
|
} else if (!conversationId && key === 'conversationId') {
|
|
conversationId = data[key];
|
|
}
|
|
}
|
|
};
|
|
|
|
try {
|
|
/** @type {{ client: TAgentClient }} */
|
|
const { client } = await initializeClient({ req, res, endpointOption });
|
|
|
|
const getAbortData = () => ({
|
|
sender,
|
|
userMessage,
|
|
promptTokens,
|
|
conversationId,
|
|
userMessagePromise,
|
|
messageId: responseMessageId,
|
|
content: client.getContentParts(),
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
});
|
|
|
|
const { abortController, onStart } = createAbortController(req, res, getAbortData, getReqData);
|
|
|
|
res.on('close', () => {
|
|
logger.debug('[AgentController] Request closed');
|
|
if (!abortController) {
|
|
return;
|
|
} else if (abortController.signal.aborted) {
|
|
return;
|
|
} else if (abortController.requestCompleted) {
|
|
return;
|
|
}
|
|
|
|
abortController.abort();
|
|
logger.debug('[AgentController] Request aborted on close');
|
|
});
|
|
|
|
const messageOptions = {
|
|
user,
|
|
onStart,
|
|
getReqData,
|
|
conversationId,
|
|
parentMessageId,
|
|
abortController,
|
|
overrideParentMessageId,
|
|
progressOptions: {
|
|
res,
|
|
// parentMessageId: overrideParentMessageId || userMessageId,
|
|
},
|
|
};
|
|
|
|
let response = await client.sendMessage(text, messageOptions);
|
|
response.endpoint = endpointOption.endpoint;
|
|
|
|
const { conversation = {} } = await client.responsePromise;
|
|
conversation.title =
|
|
conversation && !conversation.title ? null : conversation?.title || 'New Chat';
|
|
|
|
if (req.body.files && client.options.attachments) {
|
|
userMessage.files = [];
|
|
const messageFiles = new Set(req.body.files.map((file) => file.file_id));
|
|
for (let attachment of client.options.attachments) {
|
|
if (messageFiles.has(attachment.file_id)) {
|
|
userMessage.files.push(attachment);
|
|
}
|
|
}
|
|
delete userMessage.image_urls;
|
|
}
|
|
|
|
if (!abortController.signal.aborted) {
|
|
sendMessage(res, {
|
|
final: true,
|
|
conversation,
|
|
title: conversation.title,
|
|
requestMessage: userMessage,
|
|
responseMessage: response,
|
|
});
|
|
res.end();
|
|
|
|
if (!client.savedMessageIds.has(response.messageId)) {
|
|
await saveMessage(
|
|
req,
|
|
{ ...response, user },
|
|
{ context: 'api/server/controllers/agents/request.js - response end' },
|
|
);
|
|
}
|
|
}
|
|
|
|
if (!client.skipSaveUserMessage) {
|
|
await saveMessage(req, userMessage, {
|
|
context: 'api/server/controllers/agents/request.js - don\'t skip saving user message',
|
|
});
|
|
}
|
|
|
|
if (addTitle && parentMessageId === Constants.NO_PARENT && newConvo) {
|
|
addTitle(req, {
|
|
text,
|
|
response,
|
|
client,
|
|
});
|
|
}
|
|
} catch (error) {
|
|
handleAbortError(res, req, error, {
|
|
conversationId,
|
|
sender,
|
|
messageId: responseMessageId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId ?? parentMessageId,
|
|
}).catch((err) => {
|
|
logger.error('[api/server/controllers/agents/request] Error in `handleAbortError`', err);
|
|
});
|
|
}
|
|
};
|
|
|
|
module.exports = AgentController;
|