mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
* chore: remove unused redis file * chore: bump keyv dependencies, and update related imports * refactor: Implement IoRedis client for rate limiting across middleware, as node-redis via keyv not compatible * fix: Set max listeners to expected amount * WIP: memory improvements * refactor: Simplify getAbortData assignment in createAbortController * refactor: Update getAbortData to use WeakRef for content management * WIP: memory improvements in agent chat requests * refactor: Enhance memory management with finalization registry and cleanup functions * refactor: Simplify domainParser calls by removing unnecessary request parameter * refactor: Update parameter types for action tools and agent loading functions to use minimal configs * refactor: Simplify domainParser tests by removing unnecessary request parameter * refactor: Simplify domainParser call by removing unnecessary request parameter * refactor: Enhance client disposal by nullifying additional properties to improve memory management * refactor: Improve title generation by adding abort controller and timeout handling, consolidate request cleanup * refactor: Update checkIdleConnections to skip current user when checking for idle connections if passed * refactor: Update createMCPTool to derive userId from config and handle abort signals * refactor: Introduce createTokenCounter function and update tokenCounter usage; enhance disposeClient to reset Graph values * refactor: Update getMCPManager to accept userId parameter for improved idle connection handling * refactor: Extract logToolError function for improved error handling in AgentClient * refactor: Update disposeClient to clear handlerRegistry and graphRunnable references in client.run * refactor: Extract createHandleNewToken function to streamline token handling in initializeClient * chore: bump @librechat/agents * refactor: Improve timeout handling in addTitle function for better error management * refactor: Introduce createFetch instead of using class method * refactor: Enhance client disposal and request data handling in AskController and EditController * refactor: Update import statements for AnthropicClient and OpenAIClient to use specific paths * refactor: Use WeakRef for response handling in SplitStreamHandler to prevent memory leaks * refactor: Simplify client disposal and rename getReqData to processReqData in AskController and EditController * refactor: Improve logging structure and parameter handling in OpenAIClient * refactor: Remove unused GraphEvents and improve stream event handling in AnthropicClient and OpenAIClient * refactor: Simplify client initialization in AskController and EditController * refactor: Remove unused mock functions and implement in-memory store for KeyvMongo * chore: Update dependencies in package-lock.json to latest versions * refactor: Await token usage recording in OpenAIClient to ensure proper async handling * refactor: Remove handleAbort route from multiple endpoints and enhance client disposal logic * refactor: Enhance abort controller logic by managing abortKey more effectively * refactor: Add newConversation handling in useEventHandlers for improved conversation management * fix: dropparams * refactor: Use optional chaining for safer access to request properties in BaseClient * refactor: Move client disposal and request data processing logic to cleanup module for better organization * refactor: Remove aborted request check from addTitle function for cleaner logic * feat: Add Grok 3 model pricing and update tests for new models * chore: Remove trace warnings and inspect flags from backend start script used for debugging * refactor: Replace user identifier handling with userId for consistency across controllers, use UserId in clientRegistry * refactor: Enhance client disposal logic to prevent memory leaks by clearing additional references * chore: Update @librechat/agents to version 2.4.14 in package.json and package-lock.json
245 lines
6.5 KiB
JavaScript
245 lines
6.5 KiB
JavaScript
const { getResponseSender } = require('librechat-data-provider');
|
|
const {
|
|
handleAbortError,
|
|
createAbortController,
|
|
cleanupAbortController,
|
|
} = require('~/server/middleware');
|
|
const {
|
|
disposeClient,
|
|
processReqData,
|
|
clientRegistry,
|
|
requestDataMap,
|
|
} = require('~/server/cleanup');
|
|
const { sendMessage, createOnProgress } = require('~/server/utils');
|
|
const { saveMessage } = require('~/models');
|
|
const { logger } = require('~/config');
|
|
|
|
const EditController = async (req, res, next, initializeClient) => {
|
|
let {
|
|
text,
|
|
generation,
|
|
endpointOption,
|
|
conversationId,
|
|
modelDisplayLabel,
|
|
responseMessageId,
|
|
isContinued = false,
|
|
parentMessageId = null,
|
|
overrideParentMessageId = null,
|
|
} = req.body;
|
|
|
|
let client = null;
|
|
let abortKey = null;
|
|
let cleanupHandlers = [];
|
|
let clientRef = null; // Declare clientRef here
|
|
|
|
logger.debug('[EditController]', {
|
|
text,
|
|
generation,
|
|
isContinued,
|
|
conversationId,
|
|
...endpointOption,
|
|
modelsConfig: endpointOption.modelsConfig ? 'exists' : '',
|
|
});
|
|
|
|
let userMessage = null;
|
|
let userMessagePromise = null;
|
|
let promptTokens = null;
|
|
let getAbortData = null;
|
|
|
|
const sender = getResponseSender({
|
|
...endpointOption,
|
|
model: endpointOption.modelOptions.model,
|
|
modelDisplayLabel,
|
|
});
|
|
const userMessageId = parentMessageId;
|
|
const userId = req.user.id;
|
|
|
|
let reqDataContext = { userMessage, userMessagePromise, responseMessageId, promptTokens };
|
|
|
|
const updateReqData = (data = {}) => {
|
|
reqDataContext = processReqData(data, reqDataContext);
|
|
abortKey = reqDataContext.abortKey;
|
|
userMessage = reqDataContext.userMessage;
|
|
userMessagePromise = reqDataContext.userMessagePromise;
|
|
responseMessageId = reqDataContext.responseMessageId;
|
|
promptTokens = reqDataContext.promptTokens;
|
|
};
|
|
|
|
let { onProgress: progressCallback, getPartialText } = createOnProgress({
|
|
generation,
|
|
});
|
|
|
|
const performCleanup = () => {
|
|
logger.debug('[EditController] Performing cleanup');
|
|
if (Array.isArray(cleanupHandlers)) {
|
|
for (const handler of cleanupHandlers) {
|
|
try {
|
|
if (typeof handler === 'function') {
|
|
handler();
|
|
}
|
|
} catch (e) {
|
|
// Ignore
|
|
}
|
|
}
|
|
}
|
|
|
|
if (abortKey) {
|
|
logger.debug('[AskController] Cleaning up abort controller');
|
|
cleanupAbortController(abortKey);
|
|
abortKey = null;
|
|
}
|
|
|
|
if (client) {
|
|
disposeClient(client);
|
|
client = null;
|
|
}
|
|
|
|
reqDataContext = null;
|
|
userMessage = null;
|
|
userMessagePromise = null;
|
|
promptTokens = null;
|
|
getAbortData = null;
|
|
progressCallback = null;
|
|
endpointOption = null;
|
|
cleanupHandlers = null;
|
|
|
|
if (requestDataMap.has(req)) {
|
|
requestDataMap.delete(req);
|
|
}
|
|
logger.debug('[EditController] Cleanup completed');
|
|
};
|
|
|
|
try {
|
|
({ client } = await initializeClient({ req, res, endpointOption }));
|
|
|
|
if (clientRegistry && client) {
|
|
clientRegistry.register(client, { userId }, client);
|
|
}
|
|
|
|
if (client) {
|
|
requestDataMap.set(req, { client });
|
|
}
|
|
|
|
clientRef = new WeakRef(client);
|
|
|
|
getAbortData = () => {
|
|
const currentClient = clientRef.deref();
|
|
const currentText =
|
|
currentClient?.getStreamText != null ? currentClient.getStreamText() : getPartialText();
|
|
|
|
return {
|
|
sender,
|
|
conversationId,
|
|
messageId: reqDataContext.responseMessageId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
text: currentText,
|
|
userMessage: userMessage,
|
|
userMessagePromise: userMessagePromise,
|
|
promptTokens: reqDataContext.promptTokens,
|
|
};
|
|
};
|
|
|
|
const { onStart, abortController } = createAbortController(
|
|
req,
|
|
res,
|
|
getAbortData,
|
|
updateReqData,
|
|
);
|
|
|
|
const closeHandler = () => {
|
|
logger.debug('[EditController] Request closed');
|
|
if (!abortController || abortController.signal.aborted || abortController.requestCompleted) {
|
|
return;
|
|
}
|
|
abortController.abort();
|
|
logger.debug('[EditController] Request aborted on close');
|
|
};
|
|
|
|
res.on('close', closeHandler);
|
|
cleanupHandlers.push(() => {
|
|
try {
|
|
res.removeListener('close', closeHandler);
|
|
} catch (e) {
|
|
// Ignore
|
|
}
|
|
});
|
|
|
|
let response = await client.sendMessage(text, {
|
|
user: userId,
|
|
generation,
|
|
isContinued,
|
|
isEdited: true,
|
|
conversationId,
|
|
parentMessageId,
|
|
responseMessageId: reqDataContext.responseMessageId,
|
|
overrideParentMessageId,
|
|
getReqData: updateReqData,
|
|
onStart,
|
|
abortController,
|
|
progressCallback,
|
|
progressOptions: {
|
|
res,
|
|
},
|
|
});
|
|
|
|
const databasePromise = response.databasePromise;
|
|
delete response.databasePromise;
|
|
|
|
const { conversation: convoData = {} } = await databasePromise;
|
|
const conversation = { ...convoData };
|
|
conversation.title =
|
|
conversation && !conversation.title ? null : conversation?.title || 'New Chat';
|
|
|
|
if (client?.options?.attachments && endpointOption?.modelOptions?.model) {
|
|
conversation.model = endpointOption.modelOptions.model;
|
|
}
|
|
|
|
if (!abortController.signal.aborted) {
|
|
const finalUserMessage = reqDataContext.userMessage;
|
|
const finalResponseMessage = { ...response };
|
|
|
|
sendMessage(res, {
|
|
final: true,
|
|
conversation,
|
|
title: conversation.title,
|
|
requestMessage: finalUserMessage,
|
|
responseMessage: finalResponseMessage,
|
|
});
|
|
res.end();
|
|
|
|
await saveMessage(
|
|
req,
|
|
{ ...finalResponseMessage, user: userId },
|
|
{ context: 'api/server/controllers/EditController.js - response end' },
|
|
);
|
|
}
|
|
|
|
performCleanup();
|
|
} catch (error) {
|
|
logger.error('[EditController] Error handling request', error);
|
|
let partialText = '';
|
|
try {
|
|
const currentClient = clientRef.deref();
|
|
partialText =
|
|
currentClient?.getStreamText != null ? currentClient.getStreamText() : getPartialText();
|
|
} catch (getTextError) {
|
|
logger.error('[EditController] Error calling getText() during error handling', getTextError);
|
|
}
|
|
|
|
handleAbortError(res, req, error, {
|
|
sender,
|
|
partialText,
|
|
conversationId,
|
|
messageId: reqDataContext.responseMessageId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId ?? parentMessageId,
|
|
})
|
|
.catch((err) => {
|
|
logger.error('[EditController] Error in `handleAbortError` during catch block', err);
|
|
})
|
|
.finally(() => {
|
|
performCleanup();
|
|
});
|
|
}
|
|
};
|
|
|
|
module.exports = EditController;
|