mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-21 21:50:49 +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
338 lines
12 KiB
JavaScript
338 lines
12 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { getMultiplier, getCacheMultiplier } = require('./tx');
|
|
const { Transaction, Balance } = require('~/db/models');
|
|
|
|
const cancelRate = 1.15;
|
|
|
|
/**
|
|
* Updates a user's token balance based on a transaction using optimistic concurrency control
|
|
* without schema changes. Compatible with DocumentDB.
|
|
* @async
|
|
* @function
|
|
* @param {Object} params - The function parameters.
|
|
* @param {string|mongoose.Types.ObjectId} params.user - The user ID.
|
|
* @param {number} params.incrementValue - The value to increment the balance by (can be negative).
|
|
* @param {import('mongoose').UpdateQuery<import('@librechat/data-schemas').IBalance>['$set']} [params.setValues] - Optional additional fields to set.
|
|
* @returns {Promise<Object>} Returns the updated balance document (lean).
|
|
* @throws {Error} Throws an error if the update fails after multiple retries.
|
|
*/
|
|
const updateBalance = async ({ user, incrementValue, setValues }) => {
|
|
let maxRetries = 10; // Number of times to retry on conflict
|
|
let delay = 50; // Initial retry delay in ms
|
|
let lastError = null;
|
|
|
|
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
|
let currentBalanceDoc;
|
|
try {
|
|
// 1. Read the current document state
|
|
currentBalanceDoc = await Balance.findOne({ user }).lean();
|
|
const currentCredits = currentBalanceDoc ? currentBalanceDoc.tokenCredits : 0;
|
|
|
|
// 2. Calculate the desired new state
|
|
const potentialNewCredits = currentCredits + incrementValue;
|
|
const newCredits = Math.max(0, potentialNewCredits); // Ensure balance doesn't go below zero
|
|
|
|
// 3. Prepare the update payload
|
|
const updatePayload = {
|
|
$set: {
|
|
tokenCredits: newCredits,
|
|
...(setValues || {}), // Merge other values to set
|
|
},
|
|
};
|
|
|
|
// 4. Attempt the conditional update or upsert
|
|
let updatedBalance = null;
|
|
if (currentBalanceDoc) {
|
|
// --- Document Exists: Perform Conditional Update ---
|
|
// Try to update only if the tokenCredits match the value we read (currentCredits)
|
|
updatedBalance = await Balance.findOneAndUpdate(
|
|
{
|
|
user: user,
|
|
tokenCredits: currentCredits, // Optimistic lock: condition based on the read value
|
|
},
|
|
updatePayload,
|
|
{
|
|
new: true, // Return the modified document
|
|
// lean: true, // .lean() is applied after query execution in Mongoose >= 6
|
|
},
|
|
).lean(); // Use lean() for plain JS object
|
|
|
|
if (updatedBalance) {
|
|
// Success! The update was applied based on the expected current state.
|
|
return updatedBalance;
|
|
}
|
|
// If updatedBalance is null, it means tokenCredits changed between read and write (conflict).
|
|
lastError = new Error(`Concurrency conflict for user ${user} on attempt ${attempt}.`);
|
|
// Proceed to retry logic below.
|
|
} else {
|
|
// --- Document Does Not Exist: Perform Conditional Upsert ---
|
|
// Try to insert the document, but only if it still doesn't exist.
|
|
// Using tokenCredits: {$exists: false} helps prevent race conditions where
|
|
// another process creates the doc between our findOne and findOneAndUpdate.
|
|
try {
|
|
updatedBalance = await Balance.findOneAndUpdate(
|
|
{
|
|
user: user,
|
|
// Attempt to match only if the document doesn't exist OR was just created
|
|
// without tokenCredits (less likely but possible). A simple { user } filter
|
|
// might also work, relying on the retry for conflicts.
|
|
// Let's use a simpler filter and rely on retry for races.
|
|
// tokenCredits: { $exists: false } // This condition might be too strict if doc exists with 0 credits
|
|
},
|
|
updatePayload,
|
|
{
|
|
upsert: true, // Create if doesn't exist
|
|
new: true, // Return the created/updated document
|
|
// setDefaultsOnInsert: true, // Ensure schema defaults are applied on insert
|
|
// lean: true,
|
|
},
|
|
).lean();
|
|
|
|
if (updatedBalance) {
|
|
// Upsert succeeded (likely created the document)
|
|
return updatedBalance;
|
|
}
|
|
// If null, potentially a rare race condition during upsert. Retry should handle it.
|
|
lastError = new Error(
|
|
`Upsert race condition suspected for user ${user} on attempt ${attempt}.`,
|
|
);
|
|
} catch (error) {
|
|
if (error.code === 11000) {
|
|
// E11000 duplicate key error on index
|
|
// This means another process created the document *just* before our upsert.
|
|
// It's a concurrency conflict during creation. We should retry.
|
|
lastError = error; // Store the error
|
|
// Proceed to retry logic below.
|
|
} else {
|
|
// Different error, rethrow
|
|
throw error;
|
|
}
|
|
}
|
|
} // End if/else (document exists?)
|
|
} catch (error) {
|
|
// Catch errors from findOne or unexpected findOneAndUpdate errors
|
|
logger.error(`[updateBalance] Error during attempt ${attempt} for user ${user}:`, error);
|
|
lastError = error; // Store the error
|
|
// Consider stopping retries for non-transient errors, but for now, we retry.
|
|
}
|
|
|
|
// If we reached here, it means the update failed (conflict or error), wait and retry
|
|
if (attempt < maxRetries) {
|
|
const jitter = Math.random() * delay * 0.5; // Add jitter to delay
|
|
await new Promise((resolve) => setTimeout(resolve, delay + jitter));
|
|
delay = Math.min(delay * 2, 2000); // Exponential backoff with cap
|
|
}
|
|
} // End for loop (retries)
|
|
|
|
// If loop finishes without success, throw the last encountered error or a generic one
|
|
logger.error(
|
|
`[updateBalance] Failed to update balance for user ${user} after ${maxRetries} attempts.`,
|
|
);
|
|
throw (
|
|
lastError ||
|
|
new Error(
|
|
`Failed to update balance for user ${user} after maximum retries due to persistent conflicts.`,
|
|
)
|
|
);
|
|
};
|
|
|
|
/** Method to calculate and set the tokenValue for a transaction */
|
|
function calculateTokenValue(txn) {
|
|
if (!txn.valueKey || !txn.tokenType) {
|
|
txn.tokenValue = txn.rawAmount;
|
|
}
|
|
const { valueKey, tokenType, model, endpointTokenConfig } = txn;
|
|
const multiplier = Math.abs(getMultiplier({ valueKey, tokenType, model, endpointTokenConfig }));
|
|
txn.rate = multiplier;
|
|
txn.tokenValue = txn.rawAmount * multiplier;
|
|
if (txn.context && txn.tokenType === 'completion' && txn.context === 'incomplete') {
|
|
txn.tokenValue = Math.ceil(txn.tokenValue * cancelRate);
|
|
txn.rate *= cancelRate;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* New static method to create an auto-refill transaction that does NOT trigger a balance update.
|
|
* @param {object} txData - Transaction data.
|
|
* @param {string} txData.user - The user ID.
|
|
* @param {string} txData.tokenType - The type of token.
|
|
* @param {string} txData.context - The context of the transaction.
|
|
* @param {number} txData.rawAmount - The raw amount of tokens.
|
|
* @returns {Promise<object>} - The created transaction.
|
|
*/
|
|
async function createAutoRefillTransaction(txData) {
|
|
if (txData.rawAmount != null && isNaN(txData.rawAmount)) {
|
|
return;
|
|
}
|
|
const transaction = new Transaction(txData);
|
|
transaction.endpointTokenConfig = txData.endpointTokenConfig;
|
|
calculateTokenValue(transaction);
|
|
await transaction.save();
|
|
|
|
const balanceResponse = await updateBalance({
|
|
user: transaction.user,
|
|
incrementValue: txData.rawAmount,
|
|
setValues: { lastRefill: new Date() },
|
|
});
|
|
const result = {
|
|
rate: transaction.rate,
|
|
user: transaction.user.toString(),
|
|
balance: balanceResponse.tokenCredits,
|
|
};
|
|
logger.debug('[Balance.check] Auto-refill performed', result);
|
|
result.transaction = transaction;
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Static method to create a transaction and update the balance
|
|
* @param {txData} _txData - Transaction data.
|
|
*/
|
|
async function createTransaction(_txData) {
|
|
const { balance, ...txData } = _txData;
|
|
if (txData.rawAmount != null && isNaN(txData.rawAmount)) {
|
|
return;
|
|
}
|
|
|
|
const transaction = new Transaction(txData);
|
|
transaction.endpointTokenConfig = txData.endpointTokenConfig;
|
|
calculateTokenValue(transaction);
|
|
|
|
await transaction.save();
|
|
if (!balance?.enabled) {
|
|
return;
|
|
}
|
|
|
|
let incrementValue = transaction.tokenValue;
|
|
const balanceResponse = await updateBalance({
|
|
user: transaction.user,
|
|
incrementValue,
|
|
});
|
|
|
|
return {
|
|
rate: transaction.rate,
|
|
user: transaction.user.toString(),
|
|
balance: balanceResponse.tokenCredits,
|
|
[transaction.tokenType]: incrementValue,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Static method to create a structured transaction and update the balance
|
|
* @param {txData} _txData - Transaction data.
|
|
*/
|
|
async function createStructuredTransaction(_txData) {
|
|
const { balance, ...txData } = _txData;
|
|
const transaction = new Transaction({
|
|
...txData,
|
|
endpointTokenConfig: txData.endpointTokenConfig,
|
|
});
|
|
|
|
calculateStructuredTokenValue(transaction);
|
|
|
|
await transaction.save();
|
|
|
|
if (!balance?.enabled) {
|
|
return;
|
|
}
|
|
|
|
let incrementValue = transaction.tokenValue;
|
|
|
|
const balanceResponse = await updateBalance({
|
|
user: transaction.user,
|
|
incrementValue,
|
|
});
|
|
|
|
return {
|
|
rate: transaction.rate,
|
|
user: transaction.user.toString(),
|
|
balance: balanceResponse.tokenCredits,
|
|
[transaction.tokenType]: incrementValue,
|
|
};
|
|
}
|
|
|
|
/** Method to calculate token value for structured tokens */
|
|
function calculateStructuredTokenValue(txn) {
|
|
if (!txn.tokenType) {
|
|
txn.tokenValue = txn.rawAmount;
|
|
return;
|
|
}
|
|
|
|
const { model, endpointTokenConfig } = txn;
|
|
|
|
if (txn.tokenType === 'prompt') {
|
|
const inputMultiplier = getMultiplier({ tokenType: 'prompt', model, endpointTokenConfig });
|
|
const writeMultiplier =
|
|
getCacheMultiplier({ cacheType: 'write', model, endpointTokenConfig }) ?? inputMultiplier;
|
|
const readMultiplier =
|
|
getCacheMultiplier({ cacheType: 'read', model, endpointTokenConfig }) ?? inputMultiplier;
|
|
|
|
txn.rateDetail = {
|
|
input: inputMultiplier,
|
|
write: writeMultiplier,
|
|
read: readMultiplier,
|
|
};
|
|
|
|
const totalPromptTokens =
|
|
Math.abs(txn.inputTokens || 0) +
|
|
Math.abs(txn.writeTokens || 0) +
|
|
Math.abs(txn.readTokens || 0);
|
|
|
|
if (totalPromptTokens > 0) {
|
|
txn.rate =
|
|
(Math.abs(inputMultiplier * (txn.inputTokens || 0)) +
|
|
Math.abs(writeMultiplier * (txn.writeTokens || 0)) +
|
|
Math.abs(readMultiplier * (txn.readTokens || 0))) /
|
|
totalPromptTokens;
|
|
} else {
|
|
txn.rate = Math.abs(inputMultiplier); // Default to input rate if no tokens
|
|
}
|
|
|
|
txn.tokenValue = -(
|
|
Math.abs(txn.inputTokens || 0) * inputMultiplier +
|
|
Math.abs(txn.writeTokens || 0) * writeMultiplier +
|
|
Math.abs(txn.readTokens || 0) * readMultiplier
|
|
);
|
|
|
|
txn.rawAmount = -totalPromptTokens;
|
|
} else if (txn.tokenType === 'completion') {
|
|
const multiplier = getMultiplier({ tokenType: txn.tokenType, model, endpointTokenConfig });
|
|
txn.rate = Math.abs(multiplier);
|
|
txn.tokenValue = -Math.abs(txn.rawAmount) * multiplier;
|
|
txn.rawAmount = -Math.abs(txn.rawAmount);
|
|
}
|
|
|
|
if (txn.context && txn.tokenType === 'completion' && txn.context === 'incomplete') {
|
|
txn.tokenValue = Math.ceil(txn.tokenValue * cancelRate);
|
|
txn.rate *= cancelRate;
|
|
if (txn.rateDetail) {
|
|
txn.rateDetail = Object.fromEntries(
|
|
Object.entries(txn.rateDetail).map(([k, v]) => [k, v * cancelRate]),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Queries and retrieves transactions based on a given filter.
|
|
* @async
|
|
* @function getTransactions
|
|
* @param {Object} filter - MongoDB filter object to apply when querying transactions.
|
|
* @returns {Promise<Array>} A promise that resolves to an array of matched transactions.
|
|
* @throws {Error} Throws an error if querying the database fails.
|
|
*/
|
|
async function getTransactions(filter) {
|
|
try {
|
|
return await Transaction.find(filter).lean();
|
|
} catch (error) {
|
|
logger.error('Error querying transactions:', error);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
module.exports = {
|
|
getTransactions,
|
|
createTransaction,
|
|
createAutoRefillTransaction,
|
|
createStructuredTransaction,
|
|
};
|