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

* chore: comment back handlePlusCommand * chore: ignore .git dir * refactor: pass newConversation to `useSelectMention` refactor: pass newConversation to Mention component refactor: useChatFunctions for modular use of `ask` and `regenerate` refactor: set latest message only for the first index in useChatFunctions refactor: pass setLatestMessage to useChatFunctions refactor: Pass setSubmission to useChatFunctions for submission handling refactor: consolidate event handlers to separate hook from useSSE WIP: additional response handlers feat: responsive added convo, clears on new chat/navigating to chat, assistants excluded feat: Add conversationByKeySelector to select any conversation by index WIP: handle second submission with messages paired to root * style: surface-primary-contrast * refactor: remove unnecessary console.log statement in useChatFunctions * refactor: Consolidate imports in ChatForm and Input hooks * refactor: compositional usage of useSSE for multiple streams * WIP: set latest 'multi' message * WIP: first pass, added response streaming * pass: performant multi-message stream * fix: styling and message render * second pass: modular, performant multi-stream * fix: align parentMessageId of multiMessage * refactor: move resetting latestMultiMessage * chore: update footer text in Chat component * fix: stop button styling * fix: handle abortMessage request for multi-response * clear messages but bug with latest message reset present * fix: add delay for additional message generation * fix: access LAST_CONVO_SETUP by index * style: add div to prevent layout shift before hover buttons render * chore: Update Message component styling for card messages * chore: move hook use order * fix: abort middleware using unsent field from req.body * feat: support multi-response stream from initial message * refactor: buildTree function to improve readability and remove unused code * feat: add logger for frontend dev * refactor: use depth to track if message is really last in its branch * fix(buildTree): default export * fix: share parent message Id and avoid duplication error for multi-response streams * fix: prevent addedConvo reset to response convo * feat: allow setting multi message as latest message to control which to respond to * chore: wrap setSiblingIdxRev with useCallback * chore: styling and allow editing messages * style: styling fixes * feat: Add "AddMultiConvo" component to Chat Header * feat: prevent clearing added convos on endpoint, preset, mention, or modelSpec switch * fix: message styling fixes, mainly related to code blocks * fix: stop button visibility logic * fix: Handle edge case in abortMiddleware for non-existant `abortControllers` * refactor: optimize/memoize icons * chore(GoogleClient): change info to debug logs * style: active message styling * style: prevent layout shift due to placeholder row * chore: remove unused code * fix: Update BaseClient to handle optional request body properties * fix(ci): `onStart` now accepts 2 args, the 2nd being responseMessageId * chore: bump data-provider
170 lines
4.6 KiB
JavaScript
170 lines
4.6 KiB
JavaScript
const throttle = require('lodash/throttle');
|
|
const { getResponseSender, Constants, EModelEndpoint } = require('librechat-data-provider');
|
|
const { createAbortController, handleAbortError } = require('~/server/middleware');
|
|
const { sendMessage, createOnProgress } = require('~/server/utils');
|
|
const { saveMessage, getConvo } = require('~/models');
|
|
const { logger } = require('~/config');
|
|
|
|
const AskController = async (req, res, next, initializeClient, addTitle) => {
|
|
let {
|
|
text,
|
|
endpointOption,
|
|
conversationId,
|
|
modelDisplayLabel,
|
|
parentMessageId = null,
|
|
overrideParentMessageId = null,
|
|
} = req.body;
|
|
|
|
logger.debug('[AskController]', { text, conversationId, ...endpointOption });
|
|
|
|
let userMessage;
|
|
let promptTokens;
|
|
let userMessageId;
|
|
let responseMessageId;
|
|
const sender = getResponseSender({
|
|
...endpointOption,
|
|
model: endpointOption.modelOptions.model,
|
|
modelDisplayLabel,
|
|
});
|
|
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 === '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 unfinished = endpointOption.endpoint === EModelEndpoint.google ? false : true;
|
|
const { onProgress: progressCallback, getPartialText } = createOnProgress({
|
|
onProgress: throttle(
|
|
({ text: partialText }) => {
|
|
saveMessage({
|
|
messageId: responseMessageId,
|
|
sender,
|
|
conversationId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
text: partialText,
|
|
model: client.modelOptions.model,
|
|
unfinished,
|
|
error: false,
|
|
user,
|
|
});
|
|
},
|
|
3000,
|
|
{ trailing: false },
|
|
),
|
|
});
|
|
|
|
getText = getPartialText;
|
|
|
|
const getAbortData = () => ({
|
|
sender,
|
|
conversationId,
|
|
messageId: responseMessageId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
text: getPartialText(),
|
|
userMessage,
|
|
promptTokens,
|
|
});
|
|
|
|
const { abortController, onStart } = createAbortController(req, res, getAbortData, getReqData);
|
|
|
|
res.on('close', () => {
|
|
logger.debug('[AskController] Request closed');
|
|
if (!abortController) {
|
|
return;
|
|
} else if (abortController.signal.aborted) {
|
|
return;
|
|
} else if (abortController.requestCompleted) {
|
|
return;
|
|
}
|
|
|
|
abortController.abort();
|
|
logger.debug('[AskController] Request aborted on close');
|
|
});
|
|
|
|
const messageOptions = {
|
|
user,
|
|
parentMessageId,
|
|
conversationId,
|
|
overrideParentMessageId,
|
|
getReqData,
|
|
onStart,
|
|
abortController,
|
|
progressCallback,
|
|
progressOptions: {
|
|
res,
|
|
text,
|
|
// parentMessageId: overrideParentMessageId || userMessageId,
|
|
},
|
|
};
|
|
|
|
let response = await client.sendMessage(text, messageOptions);
|
|
|
|
if (overrideParentMessageId) {
|
|
response.parentMessageId = overrideParentMessageId;
|
|
}
|
|
|
|
response.endpoint = endpointOption.endpoint;
|
|
|
|
const conversation = await getConvo(user, conversationId);
|
|
conversation.title =
|
|
conversation && !conversation.title ? null : conversation?.title || 'New Chat';
|
|
|
|
if (client.options.attachments) {
|
|
userMessage.files = client.options.attachments;
|
|
conversation.model = endpointOption.modelOptions.model;
|
|
delete userMessage.image_urls;
|
|
}
|
|
|
|
if (!abortController.signal.aborted) {
|
|
sendMessage(res, {
|
|
final: true,
|
|
conversation,
|
|
title: conversation.title,
|
|
requestMessage: userMessage,
|
|
responseMessage: response,
|
|
});
|
|
res.end();
|
|
|
|
await saveMessage({ ...response, user });
|
|
}
|
|
|
|
if (!client.skipSaveUserMessage) {
|
|
await saveMessage(userMessage);
|
|
}
|
|
|
|
if (addTitle && parentMessageId === Constants.NO_PARENT && 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;
|