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

* feat: add GOOGLE_MODELS env var * feat: add gemini vision support * refactor(GoogleClient): adjust clientOptions handling depending on model * fix(logger): fix redact logic and redact errors only * fix(GoogleClient): do not allow non-multiModal messages when gemini-pro-vision is selected * refactor(OpenAIClient): use `isVisionModel` client property to avoid calling validateVisionModel multiple times * refactor: better debug logging by correctly traversing, redacting sensitive info, and logging condensed versions of long values * refactor(GoogleClient): allow response errors to be thrown/caught above client handling so user receives meaningful error message debug orderedMessages, parentMessageId, and buildMessages result * refactor(AskController): use model from client.modelOptions.model when saving intermediate messages, which requires for the progress callback to be initialized after the client is initialized * feat(useSSE): revert to previous model if the model was auto-switched by backend due to message attachments * docs: update with google updates, notes about Gemini Pro Vision * fix: redis should not be initialized without USE_REDIS and increase max listeners to 20
127 lines
3.8 KiB
JavaScript
127 lines
3.8 KiB
JavaScript
const { sendMessage, sendError, countTokens, isEnabled } = require('~/server/utils');
|
|
const { saveMessage, getConvo, getConvoTitle } = require('~/models');
|
|
const clearPendingReq = require('~/cache/clearPendingReq');
|
|
const abortControllers = require('./abortControllers');
|
|
const { redactMessage } = require('~/config/parsers');
|
|
const spendTokens = require('~/models/spendTokens');
|
|
const { logger } = require('~/config');
|
|
|
|
async function abortMessage(req, res) {
|
|
const { abortKey } = req.body;
|
|
|
|
if (!abortControllers.has(abortKey) && !res.headersSent) {
|
|
return res.status(404).send({ message: 'Request not found' });
|
|
}
|
|
|
|
const { abortController } = abortControllers.get(abortKey);
|
|
const ret = await abortController.abortCompletion();
|
|
logger.debug('[abortMessage] Aborted request', { abortKey });
|
|
abortControllers.delete(abortKey);
|
|
res.send(JSON.stringify(ret));
|
|
}
|
|
|
|
const handleAbort = () => {
|
|
return async (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) => {
|
|
const abortController = new AbortController();
|
|
const { endpointOption } = req.body;
|
|
const onStart = (userMessage) => {
|
|
sendMessage(res, { message: userMessage, created: true });
|
|
const abortKey = userMessage?.conversationId ?? req.user.id;
|
|
abortControllers.set(abortKey, { abortController, ...endpointOption });
|
|
|
|
res.on('finish', function () {
|
|
abortControllers.delete(abortKey);
|
|
});
|
|
};
|
|
|
|
abortController.abortCompletion = async function () {
|
|
abortController.abort();
|
|
const { conversationId, userMessage, promptTokens, ...responseData } = getAbortData();
|
|
const completionTokens = await countTokens(responseData?.text ?? '');
|
|
const user = req.user.id;
|
|
|
|
const responseMessage = {
|
|
...responseData,
|
|
conversationId,
|
|
finish_reason: 'incomplete',
|
|
model: endpointOption.modelOptions.model,
|
|
unfinished: false,
|
|
cancelled: true,
|
|
error: false,
|
|
isCreatedByUser: false,
|
|
tokenCount: completionTokens,
|
|
};
|
|
|
|
await spendTokens(
|
|
{ ...responseMessage, context: 'incomplete', user },
|
|
{ promptTokens, completionTokens },
|
|
);
|
|
|
|
saveMessage({ ...responseMessage, user });
|
|
|
|
return {
|
|
title: await getConvoTitle(user, conversationId),
|
|
final: true,
|
|
conversation: await getConvo(user, conversationId),
|
|
requestMessage: userMessage,
|
|
responseMessage: responseMessage,
|
|
};
|
|
};
|
|
|
|
return { abortController, onStart };
|
|
};
|
|
|
|
const handleAbortError = async (res, req, error, data) => {
|
|
logger.error('[handleAbortError] response error and aborting request', error);
|
|
const { sender, conversationId, messageId, parentMessageId, partialText } = data;
|
|
|
|
const respondWithError = async () => {
|
|
const options = {
|
|
sender,
|
|
messageId,
|
|
conversationId,
|
|
parentMessageId,
|
|
text: redactMessage(error.message),
|
|
shouldSaveMessage: true,
|
|
user: req.user.id,
|
|
};
|
|
const callback = async () => {
|
|
if (abortControllers.has(conversationId)) {
|
|
const { abortController } = abortControllers.get(conversationId);
|
|
abortController.abort();
|
|
abortControllers.delete(conversationId);
|
|
}
|
|
};
|
|
|
|
await sendError(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();
|
|
}
|
|
} else {
|
|
return respondWithError();
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
handleAbort,
|
|
createAbortController,
|
|
handleAbortError,
|
|
};
|