mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-21 21:50:49 +02:00

* refactor(buildEndpointOption): Improve error logging in middleware, consolidate `isAgents` builder logic, remove adding `modelsConfig` to `endpointOption`
* refactor: parameter extraction and organization in agent services, minimize redundancy of shared fields across objects, make clear distinction of parameters processed uniquely by LibreChat vs LLM Provider Configs
* refactor(createPayload): streamline all endpoints to agent route
* fix: add `modelLabel` to response sender options for agent initialization
* chore: correct log message context in EditController abort controller cleanup
* chore: remove unused abortRequest hook
* chore: remove unused addToCache module and its dependencies
* refactor: remove AskController and related routes, update endpoint URLs (now all streamlined to agents route)
* chore: remove unused bedrock route and its related imports
* refactor: simplify response sender logic for Google endpoint
* chore: add `modelDisplayLabel` handling for agents endpoint
* feat: add file search capability to ephemeral agents, update code interpreter selection based of file upload, consolidate main upload menu for all endpoints
* feat: implement useToolToggle hook for managing tool toggle state, refactor CodeInterpreter and WebSearch components to utilize new hook
* feat: add ToolsDropdown component to BadgeRow for enhanced tool options
* feat: introduce BadgeRowContext and BadgeRowProvider for managing conversation state, refactor related components to utilize context
* feat: implement useMCPSelect hook for managing MCP selection state, refactor MCPSelect component to utilize new hook
* feat: enhance BadgeRowContext with MCPSelect and tool toggle functionality, refactor related components to utilize updated context and hooks
* refactor: streamline useToolToggle hook by integrating setEphemeralAgent directly into toggle logic and removing redundant setValue function
* refactor: consolidate codeApiKeyForm and searchApiKeyForm from CodeInterpreter and WebSearch to utilize new context properties
* refactor: update CheckboxButton to support controlled state and enhance ToolsDropdown with permission-based toggles for web search and code interpreter
* refactor: conditionally render CheckboxButton in CodeInterpreter and WebSearch components for improved UI responsiveness
* chore: add jotai dependency to package.json and package-lock.json
* chore: update brace-expansion package to version 2.0.2 in package-lock.json due to CVE-2025-5889
* Revert "chore: add jotai dependency to package.json and package-lock.json"
This reverts commit 69b6997396
.
* refactor: add pinning functionality to CodeInterpreter and WebSearch components, and enhance ToolsDropdown with pin toggle for web search and code interpreter
* chore: move MCPIcon to correct location, remove duplicate
* fix: update MCP import to use type-only import from librechat-data-provider
* feat: implement MCPSubMenu component and integrate pinning functionality into ToolsDropdown
* fix: cycling to submenu by using parent menu context
* feat: add FileSearch component and integrate it into BadgeRow and ToolsDropdown
* chore: import order
* chore: remove agent specific logic that would block functionality for streamlined endpoints
* chore: linting for `createContextHandlers`
* chore: ensure ToolsDropdown doesn't show up for agents
* chore: ensure tool resource is selected when dragged to UI
* chore: update file search behavior to simulate legacy functionality
* feat: ToolDialogs with multiple trigger references, add settings to tool dropdown
* refactor: simplify web search and code interpreter settings checks
* chore: simplify local storage key for pinned state in useToolToggle
* refactor: reinstate agent check in AttachFileChat component, as individual providers will ahve different file configurations
* ci: increase timeout for MongoDB connection in Agent tests
246 lines
6.6 KiB
JavaScript
246 lines
6.6 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('[EditController] 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,
|
|
userMessageId,
|
|
})
|
|
.catch((err) => {
|
|
logger.error('[EditController] Error in `handleAbortError` during catch block', err);
|
|
})
|
|
.finally(() => {
|
|
performCleanup();
|
|
});
|
|
}
|
|
};
|
|
|
|
module.exports = EditController;
|