mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +02:00

* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
219 lines
6 KiB
JavaScript
219 lines
6 KiB
JavaScript
const {
|
|
Capabilities,
|
|
EModelEndpoint,
|
|
isAgentsEndpoint,
|
|
isAssistantsEndpoint,
|
|
defaultRetrievalModels,
|
|
defaultAssistantsVersion,
|
|
defaultAgentCapabilities,
|
|
} = require('librechat-data-provider');
|
|
const { sendEvent } = require('@librechat/api');
|
|
const partialRight = require('lodash/partialRight');
|
|
|
|
/** Helper function to escape special characters in regex
|
|
* @param {string} string - The string to escape.
|
|
* @returns {string} The escaped string.
|
|
*/
|
|
function escapeRegExp(string) {
|
|
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
}
|
|
|
|
const addSpaceIfNeeded = (text) => (text.length > 0 && !text.endsWith(' ') ? text + ' ' : text);
|
|
|
|
const base = { message: true, initial: true };
|
|
const createOnProgress = (
|
|
{ generation = '', onProgress: _onProgress } = {
|
|
generation: '',
|
|
onProgress: null,
|
|
},
|
|
) => {
|
|
let i = 0;
|
|
let tokens = addSpaceIfNeeded(generation);
|
|
|
|
const basePayload = Object.assign({}, base, { text: tokens || '' });
|
|
|
|
const progressCallback = (chunk, { res, ...rest }) => {
|
|
basePayload.text = basePayload.text + chunk;
|
|
|
|
const payload = Object.assign({}, basePayload, rest);
|
|
sendEvent(res, payload);
|
|
if (_onProgress) {
|
|
_onProgress(payload);
|
|
}
|
|
if (i === 0) {
|
|
basePayload.initial = false;
|
|
}
|
|
i++;
|
|
};
|
|
|
|
const sendIntermediateMessage = (res, payload, extraTokens = '') => {
|
|
basePayload.text = basePayload.text + extraTokens;
|
|
const message = Object.assign({}, basePayload, payload);
|
|
sendEvent(res, message);
|
|
if (i === 0) {
|
|
basePayload.initial = false;
|
|
}
|
|
i++;
|
|
};
|
|
|
|
const onProgress = (opts) => {
|
|
return partialRight(progressCallback, opts);
|
|
};
|
|
|
|
const getPartialText = () => {
|
|
return basePayload.text;
|
|
};
|
|
|
|
return { onProgress, getPartialText, sendIntermediateMessage };
|
|
};
|
|
|
|
const handleText = async (response) => {
|
|
let { text } = response;
|
|
response.text = text;
|
|
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 value is truthy by being either the boolean `true` or a string
|
|
* that case-insensitively matches 'true'.
|
|
*
|
|
* @function
|
|
* @param {string|boolean|null|undefined} value - The value to check.
|
|
* @returns {boolean} Returns `true` if the value is the boolean `true` or a case-insensitive
|
|
* match for the string 'true', otherwise returns `false`.
|
|
* @example
|
|
*
|
|
* isEnabled("True"); // returns true
|
|
* isEnabled("TRUE"); // returns true
|
|
* isEnabled(true); // returns true
|
|
* isEnabled("false"); // returns false
|
|
* isEnabled(false); // returns false
|
|
* isEnabled(null); // returns false
|
|
* isEnabled(); // returns false
|
|
*/
|
|
function isEnabled(value) {
|
|
if (typeof value === 'boolean') {
|
|
return value;
|
|
}
|
|
if (typeof value === 'string') {
|
|
return value.toLowerCase().trim() === 'true';
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Checks if the provided value is 'user_provided'.
|
|
*
|
|
* @param {string} value - The value to check.
|
|
* @returns {boolean} - Returns true if the value is 'user_provided', otherwise false.
|
|
*/
|
|
const isUserProvided = (value) => value === 'user_provided';
|
|
|
|
/**
|
|
* Generate the configuration for a given key and base URL.
|
|
* @param {string} key
|
|
* @param {string} [baseURL]
|
|
* @param {string} [endpoint]
|
|
* @returns {boolean | { userProvide: boolean, userProvideURL?: boolean }}
|
|
*/
|
|
function generateConfig(key, baseURL, endpoint) {
|
|
if (!key) {
|
|
return false;
|
|
}
|
|
|
|
/** @type {{ userProvide: boolean, userProvideURL?: boolean }} */
|
|
const config = { userProvide: isUserProvided(key) };
|
|
|
|
if (baseURL) {
|
|
config.userProvideURL = isUserProvided(baseURL);
|
|
}
|
|
|
|
const assistants = isAssistantsEndpoint(endpoint);
|
|
const agents = isAgentsEndpoint(endpoint);
|
|
if (assistants) {
|
|
config.retrievalModels = defaultRetrievalModels;
|
|
config.capabilities = [
|
|
Capabilities.code_interpreter,
|
|
Capabilities.image_vision,
|
|
Capabilities.retrieval,
|
|
Capabilities.actions,
|
|
Capabilities.tools,
|
|
];
|
|
}
|
|
|
|
if (agents) {
|
|
config.capabilities = defaultAgentCapabilities;
|
|
}
|
|
|
|
if (assistants && endpoint === EModelEndpoint.azureAssistants) {
|
|
config.version = defaultAssistantsVersion.azureAssistants;
|
|
} else if (assistants) {
|
|
config.version = defaultAssistantsVersion.assistants;
|
|
}
|
|
|
|
return config;
|
|
}
|
|
|
|
module.exports = {
|
|
isEnabled,
|
|
handleText,
|
|
formatSteps,
|
|
escapeRegExp,
|
|
formatAction,
|
|
isUserProvided,
|
|
generateConfig,
|
|
addSpaceIfNeeded,
|
|
createOnProgress,
|
|
};
|