mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
* refactor: require Auth middleware in route index files * feat: concurrent message limiter * feat: complete concurrent message limiter with caching * refactor: SSE response methods separated from handleText * fix(abortMiddleware): fix req and res order to standard, use endpointOption in req.body * chore: minor name changes * refactor: add isUUID condition to saveMessage * fix(concurrentLimiter): logic correctly handles the max number of concurrent messages and res closing/finalization * chore: bump keyv and remove console.log from Message * fix(concurrentLimiter): ensure messages are only saved in later message children * refactor(concurrentLimiter): use KeyvFile instead, could make other stores configurable in the future * feat: add denyRequest function for error responses * feat(utils): add isStringTruthy function Introduce the isStringTruthy function to the utilities module to check if a string value is a case-insensitive match for 'true' * feat: add optional message rate limiters by IP and userId * feat: add optional message rate limiters by IP and userId to edit route * refactor: rename isStringTruthy to isTrue for brevity * refactor(getError): use map to make code cleaner * refactor: use memory for concurrent rate limiter to prevent clearing on startup/exit, add multiple log files, fix error message for concurrent violation * feat: check if errorMessage is object, stringify if so * chore: send object to denyRequest which will stringify it * feat: log excessive requests * fix(getError): correctly pluralize messages * refactor(limiters): make type consistent between logs and errorMessage * refactor(cache): move files out of lib/db into separate cache dir >> feat: add getLogStores function so Keyv instance is not redundantly created on every violation feat: separate violation logging to own function with logViolation * fix: cache/index.js export, properly record userViolations * refactor(messageLimiters): use new logging method, add logging to registrations * refactor(logViolation): make userLogs an array of logs per user * feat: add logging to login limiter * refactor: pass req as first param to logViolation and record offending IP * refactor: rename isTrue helper fn to isEnabled * feat: add simple non_browser check and log violation * fix: open handles in unit tests, remove KeyvMongo as not used and properly mock global fetch * chore: adjust nodemon ignore paths to properly ignore logs * feat: add math helper function for safe use of eval * refactor(api/convos): use middleware at top of file to avoid redundancy * feat: add delete all static method for Sessions * fix: redirect to login on refresh if user is not found, or the session is not found but hasn't expired (ban case) * refactor(getLogStores): adjust return type * feat: add ban violation and check ban logic refactor(logViolation): pass both req and res objects * feat: add removePorts helper function * refactor: rename getError to getMessageError and add getLoginError for displaying different login errors * fix(AuthContext): fix type issue and remove unused code * refactor(bans): ban by ip and user id, send response based on origin * chore: add frontend ban messages * refactor(routes/oauth): add ban check to handler, also consolidate logic to avoid redundancy * feat: add ban check to AI messaging routes * feat: add ban check to login/registration * fix(ci/api): mock KeyvMongo to avoid tests hanging * docs: update .env.example > refactor(banViolation): calculate interval rate crossover, early return if duration is invalid ci(banViolation): add tests to ensure users are only banned when expected * docs: improve wording for mod system * feat: add configurable env variables for violation scores * chore: add jsdoc for uaParser.js * chore: improve ban text log * chore: update bun test scripts * refactor(math.js): add fallback values * fix(KeyvMongo/banLogs): refactor keyv instances to top of files to avoid memory leaks, refactor ban logic to use getLogStores instead refactor(getLogStores): get a single log store by type * fix(ci): refactor tests due to banLogs changes, also make sure to clear and revoke sessions even if ban duration is 0 * fix(banViolation.js): getLogStores import * feat: handle 500 code error at login * fix(middleware): handle case where user.id is _id and not just id * ci: add ban secrets for backend unit tests * refactor: logout user upon ban * chore: log session delete message only if deletedCount > 0 * refactor: change default ban duration (2h) and make logic more clear in JSDOC * fix: login and registration limiters will now return rate limiting error * fix: userId not parsable as non ObjectId string * feat: add useTimeout hook to properly clear timeouts when invoking functions within them refactor(AuthContext): cleanup code by using new hook and defining types in ~/common * fix: login error message for rate limits * docs: add info for automated mod system and rate limiters, update other docs accordingly * chore: bump data-provider version
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 { setHeaders } = require('../../middleware');
|
|
|
|
router.post('/', 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;
|