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

* chore: bump anthropic SDK * chore: update anthropic config settings (fileSupport, default models) * feat: anthropic multi modal formatting * refactor: update vision models and use endpoint specific max long side resizing * feat(anthropic): multimodal messages, retry logic, and messages payload * chore: add more safety to trimming content due to whitespace error for assistant messages * feat(anthropic): token accounting and resending multiple images in progress * chore: bump data-provider * feat(anthropic): resendImages feature * chore: optimize Edit/Ask controllers, switch model back to req model * fix: false positive of invalid model * refactor(validateVisionModel): use object as arg, pass in additional/available models * refactor(validateModel): use helper function, `getModelsConfig` * feat: add modelsConfig to endpointOption so it gets passed to all clients, use for properly validating vision models * refactor: initialize default vision model and make sure it's available before assigning it * refactor(useSSE): avoid resetting model if user selected a new model between request and response * feat: show rate in transaction logging * fix: return tokenCountMap regardless of payload shape
166 lines
4.2 KiB
JavaScript
166 lines
4.2 KiB
JavaScript
const { getResponseSender } = 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 EditController = async (req, res, next, initializeClient) => {
|
|
let {
|
|
text,
|
|
generation,
|
|
endpointOption,
|
|
conversationId,
|
|
modelDisplayLabel,
|
|
responseMessageId,
|
|
isContinued = false,
|
|
parentMessageId = null,
|
|
overrideParentMessageId = null,
|
|
} = req.body;
|
|
|
|
logger.debug('[EditController]', {
|
|
text,
|
|
generation,
|
|
isContinued,
|
|
conversationId,
|
|
...endpointOption,
|
|
});
|
|
|
|
let metadata;
|
|
let userMessage;
|
|
let promptTokens;
|
|
let lastSavedTimestamp = 0;
|
|
let saveDelay = 100;
|
|
const sender = getResponseSender({
|
|
...endpointOption,
|
|
model: endpointOption.modelOptions.model,
|
|
modelDisplayLabel,
|
|
});
|
|
const userMessageId = parentMessageId;
|
|
const user = req.user.id;
|
|
|
|
const addMetadata = (data) => (metadata = data);
|
|
const getReqData = (data = {}) => {
|
|
for (let key in data) {
|
|
if (key === 'userMessage') {
|
|
userMessage = data[key];
|
|
} else if (key === 'responseMessageId') {
|
|
responseMessageId = data[key];
|
|
} else if (key === 'promptTokens') {
|
|
promptTokens = data[key];
|
|
}
|
|
}
|
|
};
|
|
|
|
const { onProgress: progressCallback, getPartialText } = createOnProgress({
|
|
generation,
|
|
onProgress: ({ text: partialText }) => {
|
|
const currentTimestamp = Date.now();
|
|
|
|
if (currentTimestamp - lastSavedTimestamp > saveDelay) {
|
|
lastSavedTimestamp = currentTimestamp;
|
|
saveMessage({
|
|
messageId: responseMessageId,
|
|
sender,
|
|
conversationId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
text: partialText,
|
|
model: endpointOption.modelOptions.model,
|
|
unfinished: true,
|
|
isEdited: true,
|
|
error: false,
|
|
user,
|
|
});
|
|
}
|
|
|
|
if (saveDelay < 500) {
|
|
saveDelay = 500;
|
|
}
|
|
},
|
|
});
|
|
|
|
const getAbortData = () => ({
|
|
conversationId,
|
|
messageId: responseMessageId,
|
|
sender,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
text: getPartialText(),
|
|
userMessage,
|
|
promptTokens,
|
|
});
|
|
|
|
const { abortController, onStart } = createAbortController(req, res, getAbortData);
|
|
|
|
res.on('close', () => {
|
|
logger.debug('[EditController] Request closed');
|
|
if (!abortController) {
|
|
return;
|
|
} else if (abortController.signal.aborted) {
|
|
return;
|
|
} else if (abortController.requestCompleted) {
|
|
return;
|
|
}
|
|
|
|
abortController.abort();
|
|
logger.debug('[EditController] Request aborted on close');
|
|
});
|
|
|
|
try {
|
|
const { client } = await initializeClient({ req, res, endpointOption });
|
|
|
|
let response = await client.sendMessage(text, {
|
|
user,
|
|
generation,
|
|
isContinued,
|
|
isEdited: true,
|
|
conversationId,
|
|
parentMessageId,
|
|
responseMessageId,
|
|
overrideParentMessageId,
|
|
getReqData,
|
|
onStart,
|
|
addMetadata,
|
|
abortController,
|
|
onProgress: progressCallback.call(null, {
|
|
res,
|
|
text,
|
|
parentMessageId: overrideParentMessageId || userMessageId,
|
|
}),
|
|
});
|
|
|
|
if (metadata) {
|
|
response = { ...response, ...metadata };
|
|
}
|
|
|
|
const conversation = await getConvo(user, conversationId);
|
|
conversation.title =
|
|
conversation && !conversation.title ? null : conversation?.title || 'New Chat';
|
|
|
|
if (client.options.attachments) {
|
|
conversation.model = endpointOption.modelOptions.model;
|
|
}
|
|
|
|
if (!abortController.signal.aborted) {
|
|
sendMessage(res, {
|
|
final: true,
|
|
conversation,
|
|
title: conversation.title,
|
|
requestMessage: userMessage,
|
|
responseMessage: response,
|
|
});
|
|
res.end();
|
|
|
|
await saveMessage({ ...response, user });
|
|
}
|
|
} catch (error) {
|
|
const partialText = getPartialText();
|
|
handleAbortError(res, req, error, {
|
|
partialText,
|
|
conversationId,
|
|
sender,
|
|
messageId: responseMessageId,
|
|
parentMessageId: userMessageId ?? parentMessageId,
|
|
});
|
|
}
|
|
};
|
|
|
|
module.exports = EditController;
|