mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02: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
239 lines
7 KiB
JavaScript
239 lines
7 KiB
JavaScript
const express = require('express');
|
|
const crypto = require('crypto');
|
|
const router = express.Router();
|
|
const { browserClient } = require('../../../app/');
|
|
const { saveMessage, getConvoTitle, saveConvo, getConvo } = require('../../../models');
|
|
const { handleError, sendMessage, createOnProgress, handleText } = require('../../utils');
|
|
const { requireJwtAuth, setHeaders } = require('../../middleware');
|
|
|
|
router.post('/', requireJwtAuth, setHeaders, async (req, res) => {
|
|
const {
|
|
endpoint,
|
|
text,
|
|
overrideParentMessageId = null,
|
|
parentMessageId,
|
|
conversationId: oldConversationId,
|
|
} = req.body;
|
|
if (text.length === 0) {
|
|
return handleError(res, { text: 'Prompt empty or too short' });
|
|
}
|
|
if (endpoint !== 'chatGPTBrowser') {
|
|
return handleError(res, { text: 'Illegal request' });
|
|
}
|
|
|
|
// build user message
|
|
const conversationId = oldConversationId || crypto.randomUUID();
|
|
const isNewConversation = !oldConversationId;
|
|
const userMessageId = crypto.randomUUID();
|
|
const userParentMessageId = parentMessageId || '00000000-0000-0000-0000-000000000000';
|
|
const userMessage = {
|
|
messageId: userMessageId,
|
|
sender: 'User',
|
|
text,
|
|
parentMessageId: userParentMessageId,
|
|
conversationId,
|
|
isCreatedByUser: true,
|
|
};
|
|
|
|
// build endpoint option
|
|
const endpointOption = {
|
|
model: req.body?.model ?? 'text-davinci-002-render-sha',
|
|
key: req.body?.key ?? null,
|
|
};
|
|
|
|
// const availableModels = getChatGPTBrowserModels();
|
|
// if (availableModels.find((model) => model === endpointOption.model) === undefined)
|
|
// return handleError(res, { text: 'Illegal request: model' });
|
|
|
|
console.log('ask log', {
|
|
userMessage,
|
|
endpointOption,
|
|
conversationId,
|
|
});
|
|
|
|
if (!overrideParentMessageId) {
|
|
await saveMessage(userMessage);
|
|
await saveConvo(req.user.id, {
|
|
...userMessage,
|
|
...endpointOption,
|
|
conversationId,
|
|
endpoint,
|
|
});
|
|
}
|
|
|
|
// eslint-disable-next-line no-use-before-define
|
|
return await ask({
|
|
isNewConversation,
|
|
userMessage,
|
|
endpointOption,
|
|
conversationId,
|
|
preSendRequest: true,
|
|
overrideParentMessageId,
|
|
req,
|
|
res,
|
|
});
|
|
});
|
|
|
|
const ask = async ({
|
|
isNewConversation,
|
|
userMessage,
|
|
endpointOption,
|
|
conversationId,
|
|
overrideParentMessageId = null,
|
|
req,
|
|
res,
|
|
}) => {
|
|
let { text, parentMessageId: userParentMessageId, messageId: userMessageId } = userMessage;
|
|
const userId = req.user.id;
|
|
let responseMessageId = crypto.randomUUID();
|
|
let getPartialMessage = null;
|
|
try {
|
|
let lastSavedTimestamp = 0;
|
|
const { onProgress: progressCallback, getPartialText } = createOnProgress({
|
|
onProgress: ({ text }) => {
|
|
const currentTimestamp = Date.now();
|
|
if (currentTimestamp - lastSavedTimestamp > 500) {
|
|
lastSavedTimestamp = currentTimestamp;
|
|
saveMessage({
|
|
messageId: responseMessageId,
|
|
sender: endpointOption?.jailbreak ? 'Sydney' : 'BingAI',
|
|
conversationId,
|
|
parentMessageId: overrideParentMessageId || userMessageId,
|
|
text: text,
|
|
unfinished: true,
|
|
cancelled: false,
|
|
error: false,
|
|
isCreatedByUser: false,
|
|
});
|
|
}
|
|
},
|
|
});
|
|
|
|
getPartialMessage = getPartialText;
|
|
const abortController = new AbortController();
|
|
let i = 0;
|
|
let response = await browserClient({
|
|
text,
|
|
parentMessageId: userParentMessageId,
|
|
conversationId,
|
|
...endpointOption,
|
|
abortController,
|
|
userId,
|
|
onProgress: progressCallback.call(null, { res, text }),
|
|
onEventMessage: (eventMessage) => {
|
|
let data = null;
|
|
try {
|
|
data = JSON.parse(eventMessage.data);
|
|
} catch (e) {
|
|
return;
|
|
}
|
|
|
|
sendMessage(res, {
|
|
message: { ...userMessage, conversationId: data.conversation_id },
|
|
created: i === 0,
|
|
});
|
|
|
|
if (i === 0) {
|
|
i++;
|
|
}
|
|
},
|
|
});
|
|
|
|
console.log('CLIENT RESPONSE', response);
|
|
|
|
const newConversationId = response.conversationId || conversationId;
|
|
const newUserMassageId = response.parentMessageId || userMessageId;
|
|
const newResponseMessageId = response.messageId;
|
|
|
|
// STEP1 generate response message
|
|
response.text = response.response || '**ChatGPT refused to answer.**';
|
|
|
|
let responseMessage = {
|
|
conversationId: newConversationId,
|
|
messageId: responseMessageId,
|
|
newMessageId: newResponseMessageId,
|
|
parentMessageId: overrideParentMessageId || newUserMassageId,
|
|
text: await handleText(response),
|
|
sender: endpointOption?.chatGptLabel || 'ChatGPT',
|
|
unfinished: false,
|
|
cancelled: false,
|
|
error: false,
|
|
isCreatedByUser: false,
|
|
};
|
|
|
|
await saveMessage(responseMessage);
|
|
responseMessage.messageId = newResponseMessageId;
|
|
|
|
// STEP2 update the conversation
|
|
|
|
// First update conversationId if needed
|
|
let conversationUpdate = { conversationId: newConversationId, endpoint: 'chatGPTBrowser' };
|
|
if (conversationId != newConversationId) {
|
|
if (isNewConversation) {
|
|
// change the conversationId to new one
|
|
conversationUpdate = {
|
|
...conversationUpdate,
|
|
conversationId: conversationId,
|
|
newConversationId: newConversationId,
|
|
};
|
|
} else {
|
|
// create new conversation
|
|
conversationUpdate = {
|
|
...conversationUpdate,
|
|
...endpointOption,
|
|
};
|
|
}
|
|
}
|
|
|
|
await saveConvo(req.user.id, conversationUpdate);
|
|
conversationId = newConversationId;
|
|
|
|
// STEP3 update the user message
|
|
userMessage.conversationId = newConversationId;
|
|
userMessage.messageId = newUserMassageId;
|
|
|
|
// If response has parentMessageId, the fake userMessage.messageId should be updated to the real one.
|
|
if (!overrideParentMessageId) {
|
|
await saveMessage({
|
|
...userMessage,
|
|
messageId: userMessageId,
|
|
newMessageId: newUserMassageId,
|
|
});
|
|
}
|
|
userMessageId = newUserMassageId;
|
|
|
|
sendMessage(res, {
|
|
title: await getConvoTitle(req.user.id, conversationId),
|
|
final: true,
|
|
conversation: await getConvo(req.user.id, conversationId),
|
|
requestMessage: userMessage,
|
|
responseMessage: responseMessage,
|
|
});
|
|
res.end();
|
|
|
|
if (userParentMessageId == '00000000-0000-0000-0000-000000000000') {
|
|
// const title = await titleConvo({ endpoint: endpointOption?.endpoint, text, response: responseMessage });
|
|
const title = await response.details.title;
|
|
await saveConvo(req.user.id, {
|
|
conversationId: conversationId,
|
|
title,
|
|
});
|
|
}
|
|
} catch (error) {
|
|
const errorMessage = {
|
|
messageId: responseMessageId,
|
|
sender: 'ChatGPT',
|
|
conversationId,
|
|
parentMessageId: overrideParentMessageId || userMessageId,
|
|
unfinished: false,
|
|
cancelled: false,
|
|
error: true,
|
|
isCreatedByUser: false,
|
|
text: `${getPartialMessage() ?? ''}\n\nError message: "${error.message}"`,
|
|
};
|
|
await saveMessage(errorMessage);
|
|
handleError(res, errorMessage);
|
|
}
|
|
};
|
|
|
|
module.exports = router;
|