mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02: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
165 lines
4.6 KiB
JavaScript
165 lines
4.6 KiB
JavaScript
const partialRight = require('lodash/partialRight');
|
|
const { getCitations, citeText } = require('./citations');
|
|
const { sendMessage } = require('./streamResponse');
|
|
const cursor = '<span className="result-streaming">█</span>';
|
|
const citationRegex = /\[\^\d+?\^]/g;
|
|
|
|
const addSpaceIfNeeded = (text) => (text.length > 0 && !text.endsWith(' ') ? text + ' ' : text);
|
|
|
|
const createOnProgress = ({ generation = '', onProgress: _onProgress }) => {
|
|
let i = 0;
|
|
let code = '';
|
|
let precode = '';
|
|
let codeBlock = false;
|
|
let tokens = addSpaceIfNeeded(generation);
|
|
|
|
const progressCallback = async (partial, { res, text, bing = false, ...rest }) => {
|
|
let chunk = partial === text ? '' : partial;
|
|
tokens += chunk;
|
|
precode += chunk;
|
|
tokens = tokens.replaceAll('[DONE]', '');
|
|
|
|
if (codeBlock) {
|
|
code += chunk;
|
|
}
|
|
|
|
if (precode.includes('```') && codeBlock) {
|
|
codeBlock = false;
|
|
precode = precode.replace(/```/g, '');
|
|
code = '';
|
|
}
|
|
|
|
if (precode.includes('```') && code === '') {
|
|
precode = precode.replace(/```/g, '');
|
|
codeBlock = true;
|
|
}
|
|
|
|
if (tokens.match(/^\n(?!:::plugins:::)/)) {
|
|
tokens = tokens.replace(/^\n/, '');
|
|
}
|
|
|
|
if (bing) {
|
|
tokens = citeText(tokens, true);
|
|
}
|
|
|
|
const payload = { text: tokens, message: true, initial: i === 0, ...rest };
|
|
sendMessage(res, { ...payload, text: tokens });
|
|
_onProgress && _onProgress(payload);
|
|
i++;
|
|
};
|
|
|
|
const sendIntermediateMessage = (res, payload, extraTokens = '') => {
|
|
tokens += extraTokens;
|
|
sendMessage(res, {
|
|
text: tokens?.length === 0 ? cursor : tokens,
|
|
message: true,
|
|
initial: i === 0,
|
|
...payload,
|
|
});
|
|
i++;
|
|
};
|
|
|
|
const onProgress = (opts) => {
|
|
return partialRight(progressCallback, opts);
|
|
};
|
|
|
|
const getPartialText = () => {
|
|
return tokens;
|
|
};
|
|
|
|
return { onProgress, getPartialText, sendIntermediateMessage };
|
|
};
|
|
|
|
const handleText = async (response, bing = false) => {
|
|
let { text } = response;
|
|
response.text = text;
|
|
|
|
if (bing) {
|
|
const links = getCitations(response);
|
|
if (response.text.match(citationRegex)?.length > 0) {
|
|
text = citeText(response);
|
|
}
|
|
text += links?.length > 0 ? `\n- ${links}` : '';
|
|
}
|
|
|
|
return text;
|
|
};
|
|
|
|
const isObject = (item) => item && typeof item === 'object' && !Array.isArray(item);
|
|
const getString = (input) => (isObject(input) ? JSON.stringify(input) : input);
|
|
|
|
function formatSteps(steps) {
|
|
let output = '';
|
|
|
|
for (let i = 0; i < steps.length; i++) {
|
|
const step = steps[i];
|
|
const actionInput = getString(step.action.toolInput);
|
|
const observation = step.observation;
|
|
|
|
if (actionInput === 'N/A' || observation?.trim()?.length === 0) {
|
|
continue;
|
|
}
|
|
|
|
output += `Input: ${actionInput}\nOutput: ${getString(observation)}`;
|
|
|
|
if (steps.length > 1 && i !== steps.length - 1) {
|
|
output += '\n---\n';
|
|
}
|
|
}
|
|
|
|
return output;
|
|
}
|
|
|
|
function formatAction(action) {
|
|
const formattedAction = {
|
|
plugin: action.tool,
|
|
input: getString(action.toolInput),
|
|
thought: action.log.includes('Thought: ')
|
|
? action.log.split('\n')[0].replace('Thought: ', '')
|
|
: action.log.split('\n')[0],
|
|
};
|
|
|
|
formattedAction.thought = getString(formattedAction.thought);
|
|
|
|
if (action.tool.toLowerCase() === 'self-reflection' || formattedAction.plugin === 'N/A') {
|
|
formattedAction.inputStr = `{\n\tthought: ${formattedAction.input}${
|
|
!formattedAction.thought.includes(formattedAction.input)
|
|
? ' - ' + formattedAction.thought
|
|
: ''
|
|
}\n}`;
|
|
formattedAction.inputStr = formattedAction.inputStr.replace('N/A - ', '');
|
|
} else {
|
|
const hasThought = formattedAction.thought.length > 0;
|
|
const thought = hasThought ? `\n\tthought: ${formattedAction.thought}` : '';
|
|
formattedAction.inputStr = `{\n\tplugin: ${formattedAction.plugin}\n\tinput: ${formattedAction.input}\n${thought}}`;
|
|
}
|
|
|
|
return formattedAction;
|
|
}
|
|
|
|
/**
|
|
* Checks if the given string value is truthy by comparing it to the string 'true' (case-insensitive).
|
|
*
|
|
* @function
|
|
* @param {string|null|undefined} value - The string value to check.
|
|
* @returns {boolean} Returns `true` if the value is a case-insensitive match for the string 'true', otherwise returns `false`.
|
|
* @example
|
|
*
|
|
* isEnabled("True"); // returns true
|
|
* isEnabled("TRUE"); // returns true
|
|
* isEnabled("false"); // returns false
|
|
* isEnabled(null); // returns false
|
|
* isEnabled(); // returns false
|
|
*/
|
|
function isEnabled(value) {
|
|
return value?.toLowerCase()?.trim() === 'true';
|
|
}
|
|
|
|
module.exports = {
|
|
createOnProgress,
|
|
isEnabled,
|
|
handleText,
|
|
formatSteps,
|
|
formatAction,
|
|
addSpaceIfNeeded,
|
|
};
|