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
156 lines
4.8 KiB
JavaScript
156 lines
4.8 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { ViolationTypes } = require('librechat-data-provider');
|
|
const { createAutoRefillTransaction } = require('./Transaction');
|
|
const { logViolation } = require('~/cache');
|
|
const { getMultiplier } = require('./tx');
|
|
const { Balance } = require('~/db/models');
|
|
|
|
function isInvalidDate(date) {
|
|
return isNaN(date);
|
|
}
|
|
|
|
/**
|
|
* Simple check method that calculates token cost and returns balance info.
|
|
* The auto-refill logic has been moved to balanceMethods.js to prevent circular dependencies.
|
|
*/
|
|
const checkBalanceRecord = async function ({
|
|
user,
|
|
model,
|
|
endpoint,
|
|
valueKey,
|
|
tokenType,
|
|
amount,
|
|
endpointTokenConfig,
|
|
}) {
|
|
const multiplier = getMultiplier({ valueKey, tokenType, model, endpoint, endpointTokenConfig });
|
|
const tokenCost = amount * multiplier;
|
|
|
|
// Retrieve the balance record
|
|
let record = await Balance.findOne({ user }).lean();
|
|
if (!record) {
|
|
logger.debug('[Balance.check] No balance record found for user', { user });
|
|
return {
|
|
canSpend: false,
|
|
balance: 0,
|
|
tokenCost,
|
|
};
|
|
}
|
|
let balance = record.tokenCredits;
|
|
|
|
logger.debug('[Balance.check] Initial state', {
|
|
user,
|
|
model,
|
|
endpoint,
|
|
valueKey,
|
|
tokenType,
|
|
amount,
|
|
balance,
|
|
multiplier,
|
|
endpointTokenConfig: !!endpointTokenConfig,
|
|
});
|
|
|
|
// Only perform auto-refill if spending would bring the balance to 0 or below
|
|
if (balance - tokenCost <= 0 && record.autoRefillEnabled && record.refillAmount > 0) {
|
|
const lastRefillDate = new Date(record.lastRefill);
|
|
const now = new Date();
|
|
if (
|
|
isInvalidDate(lastRefillDate) ||
|
|
now >=
|
|
addIntervalToDate(lastRefillDate, record.refillIntervalValue, record.refillIntervalUnit)
|
|
) {
|
|
try {
|
|
/** @type {{ rate: number, user: string, balance: number, transaction: import('@librechat/data-schemas').ITransaction}} */
|
|
const result = await createAutoRefillTransaction({
|
|
user: user,
|
|
tokenType: 'credits',
|
|
context: 'autoRefill',
|
|
rawAmount: record.refillAmount,
|
|
});
|
|
balance = result.balance;
|
|
} catch (error) {
|
|
logger.error('[Balance.check] Failed to record transaction for auto-refill', error);
|
|
}
|
|
}
|
|
}
|
|
|
|
logger.debug('[Balance.check] Token cost', { tokenCost });
|
|
return { canSpend: balance >= tokenCost, balance, tokenCost };
|
|
};
|
|
|
|
/**
|
|
* Adds a time interval to a given date.
|
|
* @param {Date} date - The starting date.
|
|
* @param {number} value - The numeric value of the interval.
|
|
* @param {'seconds'|'minutes'|'hours'|'days'|'weeks'|'months'} unit - The unit of time.
|
|
* @returns {Date} A new Date representing the starting date plus the interval.
|
|
*/
|
|
const addIntervalToDate = (date, value, unit) => {
|
|
const result = new Date(date);
|
|
switch (unit) {
|
|
case 'seconds':
|
|
result.setSeconds(result.getSeconds() + value);
|
|
break;
|
|
case 'minutes':
|
|
result.setMinutes(result.getMinutes() + value);
|
|
break;
|
|
case 'hours':
|
|
result.setHours(result.getHours() + value);
|
|
break;
|
|
case 'days':
|
|
result.setDate(result.getDate() + value);
|
|
break;
|
|
case 'weeks':
|
|
result.setDate(result.getDate() + value * 7);
|
|
break;
|
|
case 'months':
|
|
result.setMonth(result.getMonth() + value);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return result;
|
|
};
|
|
|
|
/**
|
|
* Checks the balance for a user and determines if they can spend a certain amount.
|
|
* If the user cannot spend the amount, it logs a violation and denies the request.
|
|
*
|
|
* @async
|
|
* @function
|
|
* @param {Object} params - The function parameters.
|
|
* @param {ServerRequest} params.req - The Express request object.
|
|
* @param {Express.Response} params.res - The Express response object.
|
|
* @param {Object} params.txData - The transaction data.
|
|
* @param {string} params.txData.user - The user ID or identifier.
|
|
* @param {('prompt' | 'completion')} params.txData.tokenType - The type of token.
|
|
* @param {number} params.txData.amount - The amount of tokens.
|
|
* @param {string} params.txData.model - The model name or identifier.
|
|
* @param {string} [params.txData.endpointTokenConfig] - The token configuration for the endpoint.
|
|
* @returns {Promise<boolean>} Throws error if the user cannot spend the amount.
|
|
* @throws {Error} Throws an error if there's an issue with the balance check.
|
|
*/
|
|
const checkBalance = async ({ req, res, txData }) => {
|
|
const { canSpend, balance, tokenCost } = await checkBalanceRecord(txData);
|
|
if (canSpend) {
|
|
return true;
|
|
}
|
|
|
|
const type = ViolationTypes.TOKEN_BALANCE;
|
|
const errorMessage = {
|
|
type,
|
|
balance,
|
|
tokenCost,
|
|
promptTokens: txData.amount,
|
|
};
|
|
|
|
if (txData.generations && txData.generations.length > 0) {
|
|
errorMessage.generations = txData.generations;
|
|
}
|
|
|
|
await logViolation(req, res, type, errorMessage, 0);
|
|
throw new Error(JSON.stringify(errorMessage));
|
|
};
|
|
|
|
module.exports = {
|
|
checkBalance,
|
|
};
|