mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
* ✨ feat: improve Nav/Conversations/Convo/NewChat component performance * ✨ feat: implement cursor-based pagination for conversations API * 🔧 refactor: remove createdAt from conversation selection in API and type definitions * 🔧 refactor: include createdAt in conversation selection and update related types * ✨ fix: search functionality and bugs with loadMoreConversations * feat: move ArchivedChats to cursor and DataTable standard * 🔧 refactor: add InfiniteQueryObserverResult type import in Nav component * feat: enhance conversation listing with pagination, sorting, and search capabilities * 🔧 refactor: remove unnecessary comment regarding lodash/debounce in ArchivedChatsTable * 🔧 refactor: remove unused translation keys for archived chats and search results * 🔧 fix: Archived Chats, Delete Convo, Duplicate Convo * 🔧 refactor: improve conversation components with layout adjustments and new translations * 🔧 refactor: simplify archive conversation mutation and improve unarchive handling; fix: update fork mutation * 🔧 refactor: decode search query parameter in conversation route; improve error handling in unarchive mutation; clean up DataTable component styles * 🔧 refactor: remove unused translation key for empty archived chats * 🚀 fix: `archivedConversation` query key not updated correctly while archiving * 🧠 feat: Bedrock Anthropic Reasoning & Update Endpoint Handling (#6163) * feat: Add thinking and thinkingBudget parameters for Bedrock Anthropic models * chore: Update @librechat/agents to version 2.1.8 * refactor: change region order in params * refactor: Add maxTokens parameter to conversation preset schema * refactor: Update agent client to use bedrockInputSchema and improve error handling for model parameters * refactor: streamline/optimize llmConfig initialization and saving for bedrock * fix: ensure config titleModel is used for all endpoints * refactor: enhance OpenAIClient and agent initialization to support endpoint checks for OpenRouter * chore: bump @google/generative-ai * ✨ feat: improve Nav/Conversations/Convo/NewChat component performance * 🔧 refactor: remove unnecessary comment regarding lodash/debounce in ArchivedChatsTable * 🔧 refactor: update translation keys for clarity; simplify conversation query parameters and improve sorting functionality in SharedLinks component * 🔧 refactor: optimize conversation loading logic and improve search handling in Nav component * fix: package-lock * fix: package-lock 2 * fix: package lock 3 * refactor: remove unused utility files and exports to clean up the codebase * refactor: remove i18n and useAuthRedirect modules to streamline codebase * refactor: optimize Conversations component and remove unused ToggleContext * refactor(Convo): add RenameForm and ConvoLink components; enhance Conversations component with responsive design * fix: add missing @azure/storage-blob dependency in package.json * refactor(Search): add error handling with toast notification for search errors * refactor: make createdAt and updatedAt fields of tConvoUpdateSchema less restrictive if timestamps are missing * chore: update @azure/storage-blob dependency to version 12.27.0, ensure package-lock is correct * refactor(Search): improve conversation handling server side * fix: eslint warning and errors * refactor(Search): improved search loading state and overall UX * Refactors conversation cache management Centralizes conversation mutation logic into dedicated utility functions for adding, updating, and removing conversations from query caches. Improves reliability and maintainability by: - Consolidating duplicate cache manipulation code - Adding type safety for infinite query data structures - Implementing consistent cache update patterns across all conversation operations - Removing obsolete conversation helper functions in favor of standardized utilities * fix: conversation handling and SSE event processing - Optimizes conversation state management with useMemo and proper hook ordering - Improves SSE event handler documentation and error handling - Adds reset guard flag for conversation changes - Removes redundant navigation call - Cleans up cursor handling logic and document structure Improves code maintainability and prevents potential race conditions in conversation state updates * refactor: add type for SearchBar `onChange` * fix: type tags * style: rounded to xl all Header buttons * fix: activeConvo in Convo not working * style(Bookmarks): improved UI * a11y(AccountSettings): fixed hover style not visible when using light theme * style(SettingsTabs): improved tab switchers and dropdowns * feat: add translations keys for Speech * chore: fix package-lock * fix(mutations): legacy import after rebase * feat: refactor conversation navigation for accessibility * fix(search): convo and message create/update date not returned * fix(search): show correct iconURL and endpoint for searched messages * fix: small UI improvements * chore: console.log cleanup * chore: fix tests * fix(ChatForm): improve conversation ID handling and clean up useMemo dependencies * chore: improve typing * chore: improve typing * fix(useSSE): clear conversation ID on submission to prevent draft restoration * refactor(OpenAIClient): clean up abort handler * refactor(abortMiddleware): change handleAbort to use function expression * feat: add PENDING_CONVO constant and update conversation ID checks * fix: final event handling on abort * fix: improve title sync and query cache sync on final event * fix: prevent overwriting cached conversation data if it already exists --------- Co-authored-by: Danny Avila <danny@librechat.ai>
396 lines
12 KiB
JavaScript
396 lines
12 KiB
JavaScript
// abortMiddleware.js
|
|
const { isAssistantsEndpoint, ErrorTypes } = require('librechat-data-provider');
|
|
const { sendMessage, sendError, countTokens, isEnabled } = require('~/server/utils');
|
|
const { truncateText, smartTruncateText } = require('~/app/clients/prompts');
|
|
const clearPendingReq = require('~/cache/clearPendingReq');
|
|
const { spendTokens } = require('~/models/spendTokens');
|
|
const abortControllers = require('./abortControllers');
|
|
const { saveMessage, getConvo } = require('~/models');
|
|
const { abortRun } = require('./abortRun');
|
|
const { logger } = require('~/config');
|
|
|
|
const abortDataMap = new WeakMap();
|
|
|
|
function cleanupAbortController(abortKey) {
|
|
if (!abortControllers.has(abortKey)) {
|
|
return false;
|
|
}
|
|
|
|
const { abortController } = abortControllers.get(abortKey);
|
|
|
|
if (!abortController) {
|
|
abortControllers.delete(abortKey);
|
|
return true;
|
|
}
|
|
|
|
// 1. Check if this controller has any composed signals and clean them up
|
|
try {
|
|
// This creates a temporary composed signal to use for cleanup
|
|
const composedSignal = AbortSignal.any([abortController.signal]);
|
|
|
|
// Get all event types - in practice, AbortSignal typically only uses 'abort'
|
|
const eventTypes = ['abort'];
|
|
|
|
// First, execute a dummy listener removal to handle potential composed signals
|
|
for (const eventType of eventTypes) {
|
|
const dummyHandler = () => {};
|
|
composedSignal.addEventListener(eventType, dummyHandler);
|
|
composedSignal.removeEventListener(eventType, dummyHandler);
|
|
|
|
const listeners = composedSignal.listeners?.(eventType) || [];
|
|
for (const listener of listeners) {
|
|
composedSignal.removeEventListener(eventType, listener);
|
|
}
|
|
}
|
|
} catch (e) {
|
|
logger.debug(`Error cleaning up composed signals: ${e}`);
|
|
}
|
|
|
|
// 2. Abort the controller if not already aborted
|
|
if (!abortController.signal.aborted) {
|
|
abortController.abort();
|
|
}
|
|
|
|
// 3. Remove from registry
|
|
abortControllers.delete(abortKey);
|
|
|
|
// 4. Clean up any data stored in the WeakMap
|
|
if (abortDataMap.has(abortController)) {
|
|
abortDataMap.delete(abortController);
|
|
}
|
|
|
|
// 5. Clean up function references on the controller
|
|
if (abortController.getAbortData) {
|
|
abortController.getAbortData = null;
|
|
}
|
|
|
|
if (abortController.abortCompletion) {
|
|
abortController.abortCompletion = null;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
async function abortMessage(req, res) {
|
|
let { abortKey, endpoint } = req.body;
|
|
|
|
if (isAssistantsEndpoint(endpoint)) {
|
|
return await abortRun(req, res);
|
|
}
|
|
|
|
const conversationId = abortKey?.split(':')?.[0] ?? req.user.id;
|
|
|
|
if (!abortControllers.has(abortKey) && abortControllers.has(conversationId)) {
|
|
abortKey = conversationId;
|
|
}
|
|
|
|
if (!abortControllers.has(abortKey) && !res.headersSent) {
|
|
return res.status(204).send({ message: 'Request not found' });
|
|
}
|
|
|
|
const { abortController } = abortControllers.get(abortKey) ?? {};
|
|
if (!abortController) {
|
|
return res.status(204).send({ message: 'Request not found' });
|
|
}
|
|
|
|
const finalEvent = await abortController.abortCompletion?.();
|
|
logger.debug(
|
|
`[abortMessage] ID: ${req.user.id} | ${req.user.email} | Aborted request: ` +
|
|
JSON.stringify({ abortKey }),
|
|
);
|
|
cleanupAbortController(abortKey);
|
|
|
|
if (res.headersSent && finalEvent) {
|
|
return sendMessage(res, finalEvent);
|
|
}
|
|
|
|
res.setHeader('Content-Type', 'application/json');
|
|
res.send(JSON.stringify(finalEvent));
|
|
}
|
|
|
|
const handleAbort = function () {
|
|
return async function (req, res) {
|
|
try {
|
|
if (isEnabled(process.env.LIMIT_CONCURRENT_MESSAGES)) {
|
|
await clearPendingReq({ userId: req.user.id });
|
|
}
|
|
return await abortMessage(req, res);
|
|
} catch (err) {
|
|
logger.error('[abortMessage] handleAbort error', err);
|
|
}
|
|
};
|
|
};
|
|
|
|
const createAbortController = (req, res, getAbortData, getReqData) => {
|
|
const abortController = new AbortController();
|
|
const { endpointOption } = req.body;
|
|
|
|
// Store minimal data in WeakMap to avoid circular references
|
|
abortDataMap.set(abortController, {
|
|
getAbortDataFn: getAbortData,
|
|
userId: req.user.id,
|
|
endpoint: endpointOption.endpoint,
|
|
iconURL: endpointOption.iconURL,
|
|
model: endpointOption.modelOptions?.model || endpointOption.model_parameters?.model,
|
|
});
|
|
|
|
// Replace the direct function reference with a wrapper that uses WeakMap
|
|
abortController.getAbortData = function () {
|
|
const data = abortDataMap.get(this);
|
|
if (!data || typeof data.getAbortDataFn !== 'function') {
|
|
return {};
|
|
}
|
|
|
|
try {
|
|
const result = data.getAbortDataFn();
|
|
|
|
// Create a copy without circular references
|
|
const cleanResult = { ...result };
|
|
|
|
// If userMessagePromise exists, break its reference to client
|
|
if (
|
|
cleanResult.userMessagePromise &&
|
|
typeof cleanResult.userMessagePromise.then === 'function'
|
|
) {
|
|
// Create a new promise that fulfills with the same result but doesn't reference the original
|
|
const originalPromise = cleanResult.userMessagePromise;
|
|
cleanResult.userMessagePromise = new Promise((resolve, reject) => {
|
|
originalPromise.then(
|
|
(result) => resolve({ ...result }),
|
|
(error) => reject(error),
|
|
);
|
|
});
|
|
}
|
|
|
|
return cleanResult;
|
|
} catch (err) {
|
|
logger.error('[abortController.getAbortData] Error:', err);
|
|
return {};
|
|
}
|
|
};
|
|
|
|
/**
|
|
* @param {TMessage} userMessage
|
|
* @param {string} responseMessageId
|
|
*/
|
|
const onStart = (userMessage, responseMessageId) => {
|
|
sendMessage(res, { message: userMessage, created: true });
|
|
|
|
const abortKey = userMessage?.conversationId ?? req.user.id;
|
|
getReqData({ abortKey });
|
|
const prevRequest = abortControllers.get(abortKey);
|
|
const { overrideUserMessageId } = req?.body ?? {};
|
|
|
|
if (overrideUserMessageId != null && prevRequest && prevRequest?.abortController) {
|
|
const data = prevRequest.abortController.getAbortData();
|
|
getReqData({ userMessage: data?.userMessage });
|
|
const addedAbortKey = `${abortKey}:${responseMessageId}`;
|
|
|
|
// Store minimal options
|
|
const minimalOptions = {
|
|
endpoint: endpointOption.endpoint,
|
|
iconURL: endpointOption.iconURL,
|
|
model: endpointOption.modelOptions?.model || endpointOption.model_parameters?.model,
|
|
};
|
|
|
|
abortControllers.set(addedAbortKey, { abortController, ...minimalOptions });
|
|
|
|
// Use a simple function for cleanup to avoid capturing context
|
|
const cleanupHandler = () => {
|
|
try {
|
|
cleanupAbortController(addedAbortKey);
|
|
} catch (e) {
|
|
// Ignore cleanup errors
|
|
}
|
|
};
|
|
|
|
res.on('finish', cleanupHandler);
|
|
return;
|
|
}
|
|
|
|
// Store minimal options
|
|
const minimalOptions = {
|
|
endpoint: endpointOption.endpoint,
|
|
iconURL: endpointOption.iconURL,
|
|
model: endpointOption.modelOptions?.model || endpointOption.model_parameters?.model,
|
|
};
|
|
|
|
abortControllers.set(abortKey, { abortController, ...minimalOptions });
|
|
|
|
// Use a simple function for cleanup to avoid capturing context
|
|
const cleanupHandler = () => {
|
|
try {
|
|
cleanupAbortController(abortKey);
|
|
} catch (e) {
|
|
// Ignore cleanup errors
|
|
}
|
|
};
|
|
|
|
res.on('finish', cleanupHandler);
|
|
};
|
|
|
|
// Define abortCompletion without capturing the entire parent scope
|
|
abortController.abortCompletion = async function () {
|
|
this.abort();
|
|
|
|
// Get data from WeakMap
|
|
const ctrlData = abortDataMap.get(this);
|
|
if (!ctrlData || !ctrlData.getAbortDataFn) {
|
|
return { final: true, conversation: {}, title: 'New Chat' };
|
|
}
|
|
|
|
// Get abort data using stored function
|
|
const { conversationId, userMessage, userMessagePromise, promptTokens, ...responseData } =
|
|
ctrlData.getAbortDataFn();
|
|
|
|
const completionTokens = await countTokens(responseData?.text ?? '');
|
|
const user = ctrlData.userId;
|
|
|
|
const responseMessage = {
|
|
...responseData,
|
|
conversationId,
|
|
finish_reason: 'incomplete',
|
|
endpoint: ctrlData.endpoint,
|
|
iconURL: ctrlData.iconURL,
|
|
model: ctrlData.modelOptions?.model ?? ctrlData.model_parameters?.model,
|
|
unfinished: false,
|
|
error: false,
|
|
isCreatedByUser: false,
|
|
tokenCount: completionTokens,
|
|
};
|
|
|
|
await spendTokens(
|
|
{ ...responseMessage, context: 'incomplete', user },
|
|
{ promptTokens, completionTokens },
|
|
);
|
|
|
|
await saveMessage(
|
|
req,
|
|
{ ...responseMessage, user },
|
|
{ context: 'api/server/middleware/abortMiddleware.js' },
|
|
);
|
|
|
|
let conversation;
|
|
if (userMessagePromise) {
|
|
const resolved = await userMessagePromise;
|
|
conversation = resolved?.conversation;
|
|
// Break reference to promise
|
|
resolved.conversation = null;
|
|
}
|
|
|
|
if (!conversation) {
|
|
conversation = await getConvo(user, conversationId);
|
|
}
|
|
|
|
return {
|
|
title: conversation && !conversation.title ? null : conversation?.title || 'New Chat',
|
|
final: true,
|
|
conversation,
|
|
requestMessage: userMessage,
|
|
responseMessage: responseMessage,
|
|
};
|
|
};
|
|
|
|
return { abortController, onStart };
|
|
};
|
|
|
|
/**
|
|
* @param {ServerResponse} res
|
|
* @param {ServerRequest} req
|
|
* @param {Error | unknown} error
|
|
* @param {Partial<TMessage> & { partialText?: string }} data
|
|
* @returns { Promise<void> }
|
|
*/
|
|
const handleAbortError = async (res, req, error, data) => {
|
|
if (error?.message?.includes('base64')) {
|
|
logger.error('[handleAbortError] Error in base64 encoding', {
|
|
...error,
|
|
stack: smartTruncateText(error?.stack, 1000),
|
|
message: truncateText(error.message, 350),
|
|
});
|
|
} else {
|
|
logger.error('[handleAbortError] AI response error; aborting request:', error);
|
|
}
|
|
const { sender, conversationId, messageId, parentMessageId, partialText } = data;
|
|
|
|
if (error.stack && error.stack.includes('google')) {
|
|
logger.warn(
|
|
`AI Response error for conversation ${conversationId} likely caused by Google censor/filter`,
|
|
);
|
|
}
|
|
|
|
let errorText = error?.message?.includes('"type"')
|
|
? error.message
|
|
: 'An error occurred while processing your request. Please contact the Admin.';
|
|
|
|
if (error?.type === ErrorTypes.INVALID_REQUEST) {
|
|
errorText = `{"type":"${ErrorTypes.INVALID_REQUEST}"}`;
|
|
}
|
|
|
|
if (error?.message?.includes('does not support \'system\'')) {
|
|
errorText = `{"type":"${ErrorTypes.NO_SYSTEM_MESSAGES}"}`;
|
|
}
|
|
|
|
/**
|
|
* @param {string} partialText
|
|
* @returns {Promise<void>}
|
|
*/
|
|
const respondWithError = async (partialText) => {
|
|
const endpointOption = req.body?.endpointOption;
|
|
let options = {
|
|
sender,
|
|
messageId,
|
|
conversationId,
|
|
parentMessageId,
|
|
text: errorText,
|
|
user: req.user.id,
|
|
shouldSaveMessage: true,
|
|
spec: endpointOption?.spec,
|
|
iconURL: endpointOption?.iconURL,
|
|
modelLabel: endpointOption?.modelLabel,
|
|
model: endpointOption?.modelOptions?.model || req.body?.model,
|
|
};
|
|
|
|
if (req.body?.agent_id) {
|
|
options.agent_id = req.body.agent_id;
|
|
}
|
|
|
|
if (partialText) {
|
|
options = {
|
|
...options,
|
|
error: false,
|
|
unfinished: true,
|
|
text: partialText,
|
|
};
|
|
}
|
|
|
|
// Create a simple callback without capturing parent scope
|
|
const callback = async () => {
|
|
try {
|
|
cleanupAbortController(conversationId);
|
|
} catch (e) {
|
|
// Ignore cleanup errors
|
|
}
|
|
};
|
|
|
|
await sendError(req, res, options, callback);
|
|
};
|
|
|
|
if (partialText && partialText.length > 5) {
|
|
try {
|
|
return await abortMessage(req, res);
|
|
} catch (err) {
|
|
logger.error('[handleAbortError] error while trying to abort message', err);
|
|
return respondWithError(partialText);
|
|
}
|
|
} else {
|
|
return respondWithError();
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
handleAbort,
|
|
handleAbortError,
|
|
createAbortController,
|
|
cleanupAbortController,
|
|
};
|