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

* fix(Message): avoid overwriting unprovided properties * fix(OpenAIClient): return intermediateReply on user abort * fix(AskController): do not send/save final message if abort was triggered * fix(countTokens): avoid fetching remote registry and exclusively use cl100k_base or p50k_base weights for token counting * refactor(Message/messageSchema): rely on messageSchema for default values when saving messages * fix(EditController): do not send/save final message if abort was triggered * fix(config/helpers): fix module resolution error
155 lines
4.2 KiB
JavaScript
155 lines
4.2 KiB
JavaScript
const { getResponseSender } = require('librechat-data-provider');
|
|
const { sendMessage, createOnProgress } = require('~/server/utils');
|
|
const { saveMessage, getConvoTitle, getConvo } = require('~/models');
|
|
const { createAbortController, handleAbortError } = require('~/server/middleware');
|
|
const { logger } = require('~/config');
|
|
|
|
const AskController = async (req, res, next, initializeClient, addTitle) => {
|
|
let {
|
|
text,
|
|
endpointOption,
|
|
conversationId,
|
|
parentMessageId = null,
|
|
overrideParentMessageId = null,
|
|
} = req.body;
|
|
|
|
logger.debug('[AskController]', { text, conversationId, ...endpointOption });
|
|
|
|
let metadata;
|
|
let userMessage;
|
|
let promptTokens;
|
|
let userMessageId;
|
|
let responseMessageId;
|
|
let lastSavedTimestamp = 0;
|
|
let saveDelay = 100;
|
|
const sender = getResponseSender({ ...endpointOption, model: endpointOption.modelOptions.model });
|
|
const newConvo = !conversationId;
|
|
const user = req.user.id;
|
|
|
|
const addMetadata = (data) => (metadata = data);
|
|
|
|
const getReqData = (data = {}) => {
|
|
for (let key in data) {
|
|
if (key === 'userMessage') {
|
|
userMessage = data[key];
|
|
userMessageId = data[key].messageId;
|
|
} else if (key === 'responseMessageId') {
|
|
responseMessageId = data[key];
|
|
} else if (key === 'promptTokens') {
|
|
promptTokens = data[key];
|
|
} else if (!conversationId && key === 'conversationId') {
|
|
conversationId = data[key];
|
|
}
|
|
}
|
|
};
|
|
|
|
let getText;
|
|
|
|
try {
|
|
const { client } = await initializeClient({ req, res, endpointOption });
|
|
|
|
const { onProgress: progressCallback, getPartialText } = createOnProgress({
|
|
onProgress: ({ text: partialText }) => {
|
|
const currentTimestamp = Date.now();
|
|
|
|
if (currentTimestamp - lastSavedTimestamp > saveDelay) {
|
|
lastSavedTimestamp = currentTimestamp;
|
|
saveMessage({
|
|
messageId: responseMessageId,
|
|
sender,
|
|
conversationId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
text: partialText,
|
|
model: client.modelOptions.model,
|
|
unfinished: true,
|
|
error: false,
|
|
user,
|
|
});
|
|
}
|
|
|
|
if (saveDelay < 500) {
|
|
saveDelay = 500;
|
|
}
|
|
},
|
|
});
|
|
|
|
getText = getPartialText;
|
|
|
|
const getAbortData = () => ({
|
|
sender,
|
|
conversationId,
|
|
messageId: responseMessageId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
text: getPartialText(),
|
|
userMessage,
|
|
promptTokens,
|
|
});
|
|
|
|
const { abortController, onStart } = createAbortController(req, res, getAbortData);
|
|
|
|
const messageOptions = {
|
|
user,
|
|
parentMessageId,
|
|
conversationId,
|
|
overrideParentMessageId,
|
|
getReqData,
|
|
onStart,
|
|
addMetadata,
|
|
abortController,
|
|
onProgress: progressCallback.call(null, {
|
|
res,
|
|
text,
|
|
parentMessageId: overrideParentMessageId || userMessageId,
|
|
}),
|
|
};
|
|
|
|
let response = await client.sendMessage(text, messageOptions);
|
|
|
|
if (overrideParentMessageId) {
|
|
response.parentMessageId = overrideParentMessageId;
|
|
}
|
|
|
|
if (metadata) {
|
|
response = { ...response, ...metadata };
|
|
}
|
|
|
|
if (client.options.attachments) {
|
|
userMessage.files = client.options.attachments;
|
|
delete userMessage.image_urls;
|
|
}
|
|
|
|
if (!abortController.signal.aborted) {
|
|
sendMessage(res, {
|
|
title: await getConvoTitle(user, conversationId),
|
|
final: true,
|
|
conversation: await getConvo(user, conversationId),
|
|
requestMessage: userMessage,
|
|
responseMessage: response,
|
|
});
|
|
res.end();
|
|
|
|
await saveMessage({ ...response, user });
|
|
}
|
|
|
|
await saveMessage(userMessage);
|
|
|
|
if (addTitle && parentMessageId === '00000000-0000-0000-0000-000000000000' && newConvo) {
|
|
addTitle(req, {
|
|
text,
|
|
response,
|
|
client,
|
|
});
|
|
}
|
|
} catch (error) {
|
|
const partialText = getText && getText();
|
|
handleAbortError(res, req, error, {
|
|
partialText,
|
|
conversationId,
|
|
sender,
|
|
messageId: responseMessageId,
|
|
parentMessageId: userMessageId ?? parentMessageId,
|
|
});
|
|
}
|
|
};
|
|
|
|
module.exports = AskController;
|