mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17: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
172 lines
5.2 KiB
JavaScript
172 lines
5.2 KiB
JavaScript
const express = require('express');
|
|
const router = express.Router();
|
|
const crypto = require('crypto');
|
|
const { GoogleClient } = require('../../../app');
|
|
const { saveMessage, getConvoTitle, saveConvo, getConvo } = require('../../../models');
|
|
const { handleError, sendMessage, createOnProgress } = require('../../utils');
|
|
const { getUserKey, checkUserKeyExpiry } = require('../../services/UserService');
|
|
const { requireJwtAuth, setHeaders } = require('../../middleware');
|
|
|
|
router.post('/', requireJwtAuth, setHeaders, async (req, res) => {
|
|
const { endpoint, text, parentMessageId, conversationId: oldConversationId } = req.body;
|
|
if (text.length === 0) {
|
|
return handleError(res, { text: 'Prompt empty or too short' });
|
|
}
|
|
if (endpoint !== 'google') {
|
|
return handleError(res, { text: 'Illegal request' });
|
|
}
|
|
|
|
// build endpoint option
|
|
const endpointOption = {
|
|
examples: req.body?.examples ?? [{ input: { content: '' }, output: { content: '' } }],
|
|
promptPrefix: req.body?.promptPrefix ?? null,
|
|
key: req.body?.key ?? null,
|
|
modelOptions: {
|
|
model: req.body?.model ?? 'chat-bison',
|
|
modelLabel: req.body?.modelLabel ?? null,
|
|
temperature: req.body?.temperature ?? 0.2,
|
|
maxOutputTokens: req.body?.maxOutputTokens ?? 1024,
|
|
topP: req.body?.topP ?? 0.95,
|
|
topK: req.body?.topK ?? 40,
|
|
},
|
|
};
|
|
|
|
const availableModels = ['chat-bison', 'text-bison', 'codechat-bison'];
|
|
if (availableModels.find((model) => model === endpointOption.modelOptions.model) === undefined) {
|
|
return handleError(res, { text: 'Illegal request: model' });
|
|
}
|
|
|
|
const conversationId = oldConversationId || crypto.randomUUID();
|
|
|
|
// eslint-disable-next-line no-use-before-define
|
|
return await ask({
|
|
text,
|
|
endpointOption,
|
|
conversationId,
|
|
parentMessageId,
|
|
req,
|
|
res,
|
|
});
|
|
});
|
|
|
|
const ask = async ({ text, endpointOption, parentMessageId = null, conversationId, req, res }) => {
|
|
let userMessage;
|
|
let userMessageId;
|
|
let responseMessageId;
|
|
let lastSavedTimestamp = 0;
|
|
const { overrideParentMessageId = null } = req.body;
|
|
|
|
try {
|
|
const getIds = (data) => {
|
|
userMessage = data.userMessage;
|
|
userMessageId = userMessage.messageId;
|
|
responseMessageId = data.responseMessageId;
|
|
if (!conversationId) {
|
|
conversationId = data.conversationId;
|
|
}
|
|
|
|
sendMessage(res, { message: userMessage, created: true });
|
|
};
|
|
|
|
const { onProgress: progressCallback } = createOnProgress({
|
|
onProgress: ({ text: partialText }) => {
|
|
const currentTimestamp = Date.now();
|
|
if (currentTimestamp - lastSavedTimestamp > 500) {
|
|
lastSavedTimestamp = currentTimestamp;
|
|
saveMessage({
|
|
messageId: responseMessageId,
|
|
sender: 'PaLM2',
|
|
conversationId,
|
|
parentMessageId: overrideParentMessageId || userMessageId,
|
|
text: partialText,
|
|
unfinished: true,
|
|
cancelled: false,
|
|
error: false,
|
|
});
|
|
}
|
|
},
|
|
});
|
|
|
|
const abortController = new AbortController();
|
|
|
|
const isUserProvided = process.env.PALM_KEY === 'user_provided';
|
|
|
|
let key;
|
|
if (endpointOption.key && isUserProvided) {
|
|
checkUserKeyExpiry(
|
|
endpointOption.key,
|
|
'Your GOOGLE_TOKEN has expired. Please provide your token again.',
|
|
);
|
|
key = await getUserKey({ userId: req.user.id, name: 'google' });
|
|
key = JSON.parse(key);
|
|
delete endpointOption.key;
|
|
console.log('Using service account key provided by User for PaLM models');
|
|
}
|
|
|
|
try {
|
|
key = require('../../../data/auth.json');
|
|
} catch (e) {
|
|
console.log('No \'auth.json\' file (service account key) found in /api/data/ for PaLM models');
|
|
}
|
|
|
|
const clientOptions = {
|
|
// debug: true, // for testing
|
|
reverseProxyUrl: process.env.GOOGLE_REVERSE_PROXY || null,
|
|
proxy: process.env.PROXY || null,
|
|
...endpointOption,
|
|
};
|
|
|
|
const client = new GoogleClient(key, clientOptions);
|
|
|
|
let response = await client.sendMessage(text, {
|
|
getIds,
|
|
user: req.user.id,
|
|
conversationId,
|
|
parentMessageId,
|
|
overrideParentMessageId,
|
|
onProgress: progressCallback.call(null, {
|
|
res,
|
|
text,
|
|
parentMessageId: overrideParentMessageId || userMessageId,
|
|
}),
|
|
abortController,
|
|
});
|
|
|
|
if (overrideParentMessageId) {
|
|
response.parentMessageId = overrideParentMessageId;
|
|
}
|
|
|
|
await saveConvo(req.user.id, {
|
|
...endpointOption,
|
|
...endpointOption.modelOptions,
|
|
conversationId,
|
|
endpoint: 'google',
|
|
});
|
|
|
|
await saveMessage(response);
|
|
sendMessage(res, {
|
|
title: await getConvoTitle(req.user.id, conversationId),
|
|
final: true,
|
|
conversation: await getConvo(req.user.id, conversationId),
|
|
requestMessage: userMessage,
|
|
responseMessage: response,
|
|
});
|
|
res.end();
|
|
} catch (error) {
|
|
console.error(error);
|
|
const errorMessage = {
|
|
messageId: responseMessageId,
|
|
sender: 'PaLM2',
|
|
conversationId,
|
|
parentMessageId,
|
|
unfinished: false,
|
|
cancelled: false,
|
|
error: true,
|
|
text: error.message,
|
|
};
|
|
await saveMessage(errorMessage);
|
|
handleError(res, errorMessage);
|
|
}
|
|
};
|
|
|
|
module.exports = router;
|