mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-19 18:00:15 +01:00
* docs: make_your_own.md formatting fix for mkdocs * feat: add express-mongo-sanitize feat: add login/registration rate limiting * chore: remove unnecessary console log * wip: remove token handling from localStorage to encrypted DB solution * refactor: minor change to UserService * fix mongo query and add keys route to server * fix backend controllers and simplify schema/crud * refactor: rename token to key to separate from access/refresh tokens, setTokenDialog -> setKeyDialog * refactor(schemas): TEndpointOption token -> key * refactor(api): use new encrypted key retrieval system * fix(SetKeyDialog): fix key prop error * fix(abortMiddleware): pass random UUID if messageId is not generated yet for proper error display on frontend * fix(getUserKey): wrong prop passed in arg, adds error handling * fix: prevent message without conversationId from saving to DB, prevents branching on the frontend to a new top-level branch * refactor: change wording of multiple display messages * refactor(checkExpiry -> checkUserKeyExpiry): move to UserService file * fix: type imports from common * refactor(SubmitButton): convert to TS * refactor(key.ts): change localStorage map key name * refactor: add new custom tailwind classes to better match openAI colors * chore: remove unnecessary warning and catch ScreenShot error * refactor: move userKey frontend logic to hooks and remove use of localStorage and instead query the DB * refactor: invalidate correct query key, memoize userKey hook, conditionally render SetKeyDialog to avoid unnecessary calls, refactor SubmitButton props and useEffect for showing 'provide key first' * fix(SetKeyDialog): use enum-like object for expiry values feat(Dropdown): add optionsClassName to dynamically change dropdown options container classes * fix: handle edge case where user had provided a key but the server changes to env variable for keys * refactor(OpenAI/titleConvo): move titling to client to retain authorized credentials in message lifecycle for titling * fix(azure): handle user_provided keys correctly for azure * feat: send user Id to OpenAI to differentiate users in completion requests * refactor(OpenAI/titleConvo): adding tokens helps minimize LLM from using the language in title response * feat: add delete endpoint for keys * chore: remove throttling of title * feat: add 'Data controls' to Settings, add 'Revoke' keys feature in Key Dialog and Data controls * refactor: reorganize PluginsClient files in langchain format * feat: use langchain for titling convos * chore: cleanup titling convo, with fallback to original method, escape braces, use only snippet for language detection * refactor: move helper functions to appropriate langchain folders for reusability * fix: userProvidesKey handling for gptPlugins * fix: frontend handling of plugins key * chore: cleanup logging and ts-ignore SSE * fix: forwardRef misuse in DangerButton * fix(GoogleConfig/FileUpload): localize errors and simplify validation with zod * fix: cleanup google logging and fix user provided key handling * chore: remove titling from google * chore: removing logging from browser endpoint * wip: fix menu flicker * feat: useLocalStorage hook * feat: add Tooltip for UI * refactor(EndpointMenu): utilize Tooltip and useLocalStorage, remove old 'New Chat' slide-over * fix(e2e): use testId for endpoint menu trigger * chore: final touches to EndpointMenu before future refactor to declutter component * refactor(localization): change select endpoint to open menu and add translations * chore: add final prop to error message response * ci: minor edits to facilitate testing * ci: new e2e test which tests for new key setting/revoking features
112 lines
3 KiB
JavaScript
112 lines
3 KiB
JavaScript
const crypto = require('crypto');
|
|
const { saveMessage, getConvo, getConvoTitle } = require('../../models');
|
|
const { sendMessage, handleError } = require('../utils');
|
|
const abortControllers = require('./abortControllers');
|
|
|
|
async function abortMessage(req, res) {
|
|
const { abortKey } = req.body;
|
|
|
|
if (!abortControllers.has(abortKey) && !res.headersSent) {
|
|
return res.status(404).send('Request not found');
|
|
}
|
|
|
|
const { abortController } = abortControllers.get(abortKey);
|
|
const ret = await abortController.abortCompletion();
|
|
console.log('Aborted request', abortKey);
|
|
abortControllers.delete(abortKey);
|
|
res.send(JSON.stringify(ret));
|
|
}
|
|
|
|
const handleAbort = () => {
|
|
return async (req, res) => {
|
|
try {
|
|
return await abortMessage(req, res);
|
|
} catch (err) {
|
|
console.error(err);
|
|
}
|
|
};
|
|
};
|
|
|
|
const createAbortController = (res, req, endpointOption, getAbortData) => {
|
|
const abortController = new AbortController();
|
|
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, ...responseData } = getAbortData();
|
|
|
|
const responseMessage = {
|
|
...responseData,
|
|
finish_reason: 'incomplete',
|
|
model: endpointOption.modelOptions.model,
|
|
unfinished: false,
|
|
cancelled: true,
|
|
error: false,
|
|
isCreatedByUser: false,
|
|
};
|
|
|
|
saveMessage(responseMessage);
|
|
|
|
return {
|
|
title: await getConvoTitle(req.user.id, conversationId),
|
|
final: true,
|
|
conversation: await getConvo(req.user.id, conversationId),
|
|
requestMessage: userMessage,
|
|
responseMessage: responseMessage,
|
|
};
|
|
};
|
|
|
|
return { abortController, onStart };
|
|
};
|
|
|
|
const handleAbortError = async (res, req, error, data) => {
|
|
console.error(error);
|
|
const { sender, conversationId, messageId, parentMessageId, partialText } = data;
|
|
|
|
const respondWithError = async () => {
|
|
const errorMessage = {
|
|
sender,
|
|
messageId: messageId ?? crypto.randomUUID(),
|
|
conversationId,
|
|
parentMessageId,
|
|
unfinished: false,
|
|
cancelled: false,
|
|
error: true,
|
|
final: true,
|
|
text: error.message,
|
|
isCreatedByUser: false,
|
|
};
|
|
if (abortControllers.has(conversationId)) {
|
|
const { abortController } = abortControllers.get(conversationId);
|
|
abortController.abort();
|
|
abortControllers.delete(conversationId);
|
|
}
|
|
await saveMessage(errorMessage);
|
|
handleError(res, errorMessage);
|
|
};
|
|
|
|
if (partialText && partialText.length > 5) {
|
|
try {
|
|
return await abortMessage(req, res);
|
|
} catch (err) {
|
|
console.error(err);
|
|
return respondWithError();
|
|
}
|
|
} else {
|
|
return respondWithError();
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
handleAbort,
|
|
createAbortController,
|
|
handleAbortError,
|
|
};
|