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

* wip: Add Instructions component for agent configuration
* ✨ feat: Implement DropdownPopup for variable insertion in instructions
* refactor: Enhance variable handling by exporting specialVariables and updating Markdown components
* feat: Add special variable support for current date and user in Instructions component
* refactor: Update handleAddVariable to include localized label
* feat: replace special variables in instructions presets
* chore: update parameter type for user in getListAgents function
* refactor: integrate dayjs for date handling and move replaceSpecialVars function to data-provider
* feat: enhance replaceSpecialVars to include day number in current date format
* feat: integrate replaceSpecialVars for processing agent instructions
* feat: add support for current date & time in replaceSpecialVars function
* feat: add iso_datetime support in replaceSpecialVars function
* fix: enforce text parameter to be a required field in replaceSpecialVars function
* feat: add ISO datetime support in translation file
* fix: disable eslint warning for autoFocus in TextareaAutosize component
* feat: add VariablesDropdown component and integrate it into CreatePromptForm and PromptEditor; update translation for special variables
* fix: CategorySelector and related localizations
* fix: add z-index class to LanguageSTTDropdown for proper stacking context
* fix: add max-height and overflow styles to OGDialogContent in VariableDialog and PreviewPrompt components
* fix: update variable detection logic to exclude special variables and improve regex matching
* fix: improve accessibility text for actions menu in ChatGroupItem component
* fix: adjust max-width and height styles for dialog components and improve markdown rendering for light vs. dark, height/widths, etc.
* fix: remove commented-out code for better readability in PromptVariableGfm component
* fix: handle undefined input parameter in setParams function call
* fix: update variable label types to use TSpecialVarLabel for consistency
* fix: remove outdated information from special variables description in translation file
* fix: enhance unused i18next keys detection for special variable keys
* fix: update color classes for consistency/a11y in category and prompt variable components
* fix: update PromptVariableGfm component and special variable styles for consistency
* fix: improve variable highlighting logic in VariableForm component
* fix: update background color classes for consistency in VariableForm component
* fix: add missing ref parameter to Dialog component in OriginalDialog
* refactor: move navigate call for new conversation to after setConversation update
* refactor: move message query hook to client workspace; fix: handle edge case for navigation from finalHandler creating race condition for response message DB save
* chore: bump librechat-data-provider to 0.7.793
* ci: add unit tests for replaceSpecialVars function
* fix: implement getToolkitKey function for image_gen_oai toolkit filtering/including
* ci: enhance dayjs mock for consistent date/time values in tests
* fix: MCP stdio server fail to start when passing env property
* fix: use optional chaining for clientRef dereferencing in AskController and EditController
feat: add context to saveMessage call in streamResponse utility
* fix: only save error messages if the userMessageId was initialized
* refactor: add isNotAppendable check to disable inputs in ChatForm and useTextarea
* feat: enhance error handling in useEventHandlers and update conversation state in useNewConvo
* refactor: prepend underscore to conversationId in newConversation template
* feat: log aborted conversations with minimal messages and use consistent conversationId generation
---------
Co-authored-by: Olivier Schiavo <olivier.schiavo@wengo.com>
Co-authored-by: aka012 <aka012@neowiz.com>
Co-authored-by: jiasheng <jiashengguo@outlook.com>
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('[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,
|
|
userMessageId,
|
|
})
|
|
.catch((err) => {
|
|
logger.error('[EditController] Error in `handleAbortError` during catch block', err);
|
|
})
|
|
.finally(() => {
|
|
performCleanup();
|
|
});
|
|
}
|
|
};
|
|
|
|
module.exports = EditController;
|