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

* 🏗️ refactor: Improve spendTokens logic to handle zero completion tokens and enhance test coverage * 🏗️ test: Add tests to ensure balance does not go below zero when spending tokens * 🏗️ fix: Ensure proper continuation in AgentClient when handling errors * fix: spend token race conditions * 🏗️ test: Add test for handling multiple concurrent transactions with high balance * fix: Handle Omni models prompt prefix handling for user messages with array content in OpenAIClient * refactor: Update checkBalance import paths to use new balanceMethods module * refactor: Update checkBalance imports and implement updateBalance function for atomic balance updates * fix: import from replace method * feat: Add createAutoRefillTransaction method to handle non-balance updating transactions * refactor: Move auto-refill logic to balanceMethods and enhance checkBalance functionality * feat: Implement logging for auto-refill transactions in balance checks * refactor: Remove logRefill calls from multiple client and handler files * refactor: Move balance checking and auto-refill logic to balanceMethods for improved structure * refactor: Simplify balance check calls by removing unnecessary balanceRecord assignments * fix: Prevent negative rawAmount in spendTokens when promptTokens is zero * fix: Update balanceMethods to use Balance model for findOneAndUpdate * chore: import order * refactor: remove unused txMethods file to streamline codebase * feat: enhance updateBalance and createAutoRefillTransaction methods to support additional parameters for improved balance management
140 lines
4.9 KiB
JavaScript
140 lines
4.9 KiB
JavaScript
const { Transaction } = require('./Transaction');
|
|
const { logger } = require('~/config');
|
|
|
|
/**
|
|
* Creates up to two transactions to record the spending of tokens.
|
|
*
|
|
* @function
|
|
* @async
|
|
* @param {Object} txData - Transaction data.
|
|
* @param {mongoose.Schema.Types.ObjectId} txData.user - The user ID.
|
|
* @param {String} txData.conversationId - The ID of the conversation.
|
|
* @param {String} txData.model - The model name.
|
|
* @param {String} txData.context - The context in which the transaction is made.
|
|
* @param {EndpointTokenConfig} [txData.endpointTokenConfig] - The current endpoint token config.
|
|
* @param {String} [txData.valueKey] - The value key (optional).
|
|
* @param {Object} tokenUsage - The number of tokens used.
|
|
* @param {Number} tokenUsage.promptTokens - The number of prompt tokens used.
|
|
* @param {Number} tokenUsage.completionTokens - The number of completion tokens used.
|
|
* @returns {Promise<void>} - Returns nothing.
|
|
* @throws {Error} - Throws an error if there's an issue creating the transactions.
|
|
*/
|
|
const spendTokens = async (txData, tokenUsage) => {
|
|
const { promptTokens, completionTokens } = tokenUsage;
|
|
logger.debug(
|
|
`[spendTokens] conversationId: ${txData.conversationId}${
|
|
txData?.context ? ` | Context: ${txData?.context}` : ''
|
|
} | Token usage: `,
|
|
{
|
|
promptTokens,
|
|
completionTokens,
|
|
},
|
|
);
|
|
let prompt, completion;
|
|
try {
|
|
if (promptTokens !== undefined) {
|
|
prompt = await Transaction.create({
|
|
...txData,
|
|
tokenType: 'prompt',
|
|
rawAmount: promptTokens === 0 ? 0 : -Math.max(promptTokens, 0),
|
|
});
|
|
}
|
|
|
|
if (completionTokens !== undefined) {
|
|
completion = await Transaction.create({
|
|
...txData,
|
|
tokenType: 'completion',
|
|
rawAmount: completionTokens === 0 ? 0 : -Math.max(completionTokens, 0),
|
|
});
|
|
}
|
|
|
|
if (prompt || completion) {
|
|
logger.debug('[spendTokens] Transaction data record against balance:', {
|
|
user: txData.user,
|
|
prompt: prompt?.prompt,
|
|
promptRate: prompt?.rate,
|
|
completion: completion?.completion,
|
|
completionRate: completion?.rate,
|
|
balance: completion?.balance ?? prompt?.balance,
|
|
});
|
|
} else {
|
|
logger.debug('[spendTokens] No transactions incurred against balance');
|
|
}
|
|
} catch (err) {
|
|
logger.error('[spendTokens]', err);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Creates transactions to record the spending of structured tokens.
|
|
*
|
|
* @function
|
|
* @async
|
|
* @param {Object} txData - Transaction data.
|
|
* @param {mongoose.Schema.Types.ObjectId} txData.user - The user ID.
|
|
* @param {String} txData.conversationId - The ID of the conversation.
|
|
* @param {String} txData.model - The model name.
|
|
* @param {String} txData.context - The context in which the transaction is made.
|
|
* @param {EndpointTokenConfig} [txData.endpointTokenConfig] - The current endpoint token config.
|
|
* @param {String} [txData.valueKey] - The value key (optional).
|
|
* @param {Object} tokenUsage - The number of tokens used.
|
|
* @param {Object} tokenUsage.promptTokens - The number of prompt tokens used.
|
|
* @param {Number} tokenUsage.promptTokens.input - The number of input tokens.
|
|
* @param {Number} tokenUsage.promptTokens.write - The number of write tokens.
|
|
* @param {Number} tokenUsage.promptTokens.read - The number of read tokens.
|
|
* @param {Number} tokenUsage.completionTokens - The number of completion tokens used.
|
|
* @returns {Promise<void>} - Returns nothing.
|
|
* @throws {Error} - Throws an error if there's an issue creating the transactions.
|
|
*/
|
|
const spendStructuredTokens = async (txData, tokenUsage) => {
|
|
const { promptTokens, completionTokens } = tokenUsage;
|
|
logger.debug(
|
|
`[spendStructuredTokens] conversationId: ${txData.conversationId}${
|
|
txData?.context ? ` | Context: ${txData?.context}` : ''
|
|
} | Token usage: `,
|
|
{
|
|
promptTokens,
|
|
completionTokens,
|
|
},
|
|
);
|
|
let prompt, completion;
|
|
try {
|
|
if (promptTokens) {
|
|
const { input = 0, write = 0, read = 0 } = promptTokens;
|
|
prompt = await Transaction.createStructured({
|
|
...txData,
|
|
tokenType: 'prompt',
|
|
inputTokens: -input,
|
|
writeTokens: -write,
|
|
readTokens: -read,
|
|
});
|
|
}
|
|
|
|
if (completionTokens) {
|
|
completion = await Transaction.create({
|
|
...txData,
|
|
tokenType: 'completion',
|
|
rawAmount: -completionTokens,
|
|
});
|
|
}
|
|
|
|
if (prompt || completion) {
|
|
logger.debug('[spendStructuredTokens] Transaction data record against balance:', {
|
|
user: txData.user,
|
|
prompt: prompt?.prompt,
|
|
promptRate: prompt?.rate,
|
|
completion: completion?.completion,
|
|
completionRate: completion?.rate,
|
|
balance: completion?.balance ?? prompt?.balance,
|
|
});
|
|
} else {
|
|
logger.debug('[spendStructuredTokens] No transactions incurred against balance');
|
|
}
|
|
} catch (err) {
|
|
logger.error('[spendStructuredTokens]', err);
|
|
}
|
|
|
|
return { prompt, completion };
|
|
};
|
|
|
|
module.exports = { spendTokens, spendStructuredTokens };
|