mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +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
382 lines
11 KiB
JavaScript
382 lines
11 KiB
JavaScript
const mongoose = require('mongoose');
|
|
const { MongoMemoryServer } = require('mongodb-memory-server');
|
|
const { spendTokens, spendStructuredTokens } = require('./spendTokens');
|
|
|
|
const { getMultiplier, getCacheMultiplier } = require('./tx');
|
|
const { createTransaction } = require('./Transaction');
|
|
const { Balance } = require('~/db/models');
|
|
|
|
let mongoServer;
|
|
beforeAll(async () => {
|
|
mongoServer = await MongoMemoryServer.create();
|
|
const mongoUri = mongoServer.getUri();
|
|
await mongoose.connect(mongoUri);
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await mongoose.disconnect();
|
|
await mongoServer.stop();
|
|
});
|
|
|
|
beforeEach(async () => {
|
|
await mongoose.connection.dropDatabase();
|
|
});
|
|
|
|
describe('Regular Token Spending Tests', () => {
|
|
test('Balance should decrease when spending tokens with spendTokens', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 10000000; // $10.00
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'gpt-3.5-turbo';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-conversation-id',
|
|
model,
|
|
context: 'test',
|
|
endpointTokenConfig: null,
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = {
|
|
promptTokens: 100,
|
|
completionTokens: 50,
|
|
};
|
|
|
|
// Act
|
|
await spendTokens(txData, tokenUsage);
|
|
|
|
// Assert
|
|
const updatedBalance = await Balance.findOne({ user: userId });
|
|
const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
|
|
const completionMultiplier = getMultiplier({ model, tokenType: 'completion' });
|
|
const expectedTotalCost = 100 * promptMultiplier + 50 * completionMultiplier;
|
|
const expectedBalance = initialBalance - expectedTotalCost;
|
|
|
|
expect(updatedBalance.tokenCredits).toBeCloseTo(expectedBalance, 0);
|
|
});
|
|
|
|
test('spendTokens should handle zero completion tokens', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 10000000;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'gpt-3.5-turbo';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-conversation-id',
|
|
model,
|
|
context: 'test',
|
|
endpointTokenConfig: null,
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = {
|
|
promptTokens: 100,
|
|
completionTokens: 0,
|
|
};
|
|
|
|
// Act
|
|
await spendTokens(txData, tokenUsage);
|
|
|
|
// Assert
|
|
const updatedBalance = await Balance.findOne({ user: userId });
|
|
const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
|
|
const expectedCost = 100 * promptMultiplier;
|
|
expect(updatedBalance.tokenCredits).toBeCloseTo(initialBalance - expectedCost, 0);
|
|
});
|
|
|
|
test('spendTokens should handle undefined token counts', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 10000000;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'gpt-3.5-turbo';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-conversation-id',
|
|
model,
|
|
context: 'test',
|
|
endpointTokenConfig: null,
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = {};
|
|
|
|
// Act
|
|
const result = await spendTokens(txData, tokenUsage);
|
|
|
|
// Assert: No transaction should be created
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
test('spendTokens should handle only prompt tokens', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 10000000;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'gpt-3.5-turbo';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-conversation-id',
|
|
model,
|
|
context: 'test',
|
|
endpointTokenConfig: null,
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = { promptTokens: 100 };
|
|
|
|
// Act
|
|
await spendTokens(txData, tokenUsage);
|
|
|
|
// Assert
|
|
const updatedBalance = await Balance.findOne({ user: userId });
|
|
const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
|
|
const expectedCost = 100 * promptMultiplier;
|
|
expect(updatedBalance.tokenCredits).toBeCloseTo(initialBalance - expectedCost, 0);
|
|
});
|
|
|
|
test('spendTokens should not update balance when balance feature is disabled', async () => {
|
|
// Arrange: Balance config is now passed directly in txData
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 10000000;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'gpt-3.5-turbo';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-conversation-id',
|
|
model,
|
|
context: 'test',
|
|
endpointTokenConfig: null,
|
|
balance: { enabled: false },
|
|
};
|
|
|
|
const tokenUsage = {
|
|
promptTokens: 100,
|
|
completionTokens: 50,
|
|
};
|
|
|
|
// Act
|
|
await spendTokens(txData, tokenUsage);
|
|
|
|
// Assert: Balance should remain unchanged.
|
|
const updatedBalance = await Balance.findOne({ user: userId });
|
|
expect(updatedBalance.tokenCredits).toBe(initialBalance);
|
|
});
|
|
});
|
|
|
|
describe('Structured Token Spending Tests', () => {
|
|
test('Balance should decrease and rawAmount should be set when spending a large number of structured tokens', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 17613154.55; // $17.61
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'claude-3-5-sonnet';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'c23a18da-706c-470a-ac28-ec87ed065199',
|
|
model,
|
|
context: 'message',
|
|
endpointTokenConfig: null,
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = {
|
|
promptTokens: {
|
|
input: 11,
|
|
write: 140522,
|
|
read: 0,
|
|
},
|
|
completionTokens: 5,
|
|
};
|
|
|
|
const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
|
|
const completionMultiplier = getMultiplier({ model, tokenType: 'completion' });
|
|
const writeMultiplier = getCacheMultiplier({ model, cacheType: 'write' });
|
|
const readMultiplier = getCacheMultiplier({ model, cacheType: 'read' });
|
|
|
|
// Act
|
|
const result = await spendStructuredTokens(txData, tokenUsage);
|
|
|
|
// Calculate expected costs.
|
|
const expectedPromptCost =
|
|
tokenUsage.promptTokens.input * promptMultiplier +
|
|
tokenUsage.promptTokens.write * writeMultiplier +
|
|
tokenUsage.promptTokens.read * readMultiplier;
|
|
const expectedCompletionCost = tokenUsage.completionTokens * completionMultiplier;
|
|
const expectedTotalCost = expectedPromptCost + expectedCompletionCost;
|
|
const expectedBalance = initialBalance - expectedTotalCost;
|
|
|
|
// Assert
|
|
expect(result.completion.balance).toBeLessThan(initialBalance);
|
|
const allowedDifference = 100;
|
|
expect(Math.abs(result.completion.balance - expectedBalance)).toBeLessThan(allowedDifference);
|
|
const balanceDecrease = initialBalance - result.completion.balance;
|
|
expect(balanceDecrease).toBeCloseTo(expectedTotalCost, 0);
|
|
|
|
const expectedPromptTokenValue = -expectedPromptCost;
|
|
const expectedCompletionTokenValue = -expectedCompletionCost;
|
|
expect(result.prompt.prompt).toBeCloseTo(expectedPromptTokenValue, 1);
|
|
expect(result.completion.completion).toBe(expectedCompletionTokenValue);
|
|
});
|
|
|
|
test('should handle zero completion tokens in structured spending', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 17613154.55;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'claude-3-5-sonnet';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-convo',
|
|
model,
|
|
context: 'message',
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = {
|
|
promptTokens: {
|
|
input: 10,
|
|
write: 100,
|
|
read: 5,
|
|
},
|
|
completionTokens: 0,
|
|
};
|
|
|
|
// Act
|
|
const result = await spendStructuredTokens(txData, tokenUsage);
|
|
|
|
// Assert
|
|
expect(result.prompt).toBeDefined();
|
|
expect(result.completion).toBeUndefined();
|
|
expect(result.prompt.prompt).toBeLessThan(0);
|
|
});
|
|
|
|
test('should handle only prompt tokens in structured spending', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 17613154.55;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'claude-3-5-sonnet';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-convo',
|
|
model,
|
|
context: 'message',
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = {
|
|
promptTokens: {
|
|
input: 10,
|
|
write: 100,
|
|
read: 5,
|
|
},
|
|
};
|
|
|
|
// Act
|
|
const result = await spendStructuredTokens(txData, tokenUsage);
|
|
|
|
// Assert
|
|
expect(result.prompt).toBeDefined();
|
|
expect(result.completion).toBeUndefined();
|
|
expect(result.prompt.prompt).toBeLessThan(0);
|
|
});
|
|
|
|
test('should handle undefined token counts in structured spending', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 17613154.55;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'claude-3-5-sonnet';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-convo',
|
|
model,
|
|
context: 'message',
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = {};
|
|
|
|
// Act
|
|
const result = await spendStructuredTokens(txData, tokenUsage);
|
|
|
|
// Assert
|
|
expect(result).toEqual({
|
|
prompt: undefined,
|
|
completion: undefined,
|
|
});
|
|
});
|
|
|
|
test('should handle incomplete context for completion tokens', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 17613154.55;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'claude-3-5-sonnet';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-convo',
|
|
model,
|
|
context: 'incomplete',
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
const tokenUsage = {
|
|
promptTokens: {
|
|
input: 10,
|
|
write: 100,
|
|
read: 5,
|
|
},
|
|
completionTokens: 50,
|
|
};
|
|
|
|
// Act
|
|
const result = await spendStructuredTokens(txData, tokenUsage);
|
|
|
|
// Assert:
|
|
// (Assuming a multiplier for completion of 15 and a cancel rate of 1.15 as noted in the original test.)
|
|
expect(result.completion.completion).toBeCloseTo(-50 * 15 * 1.15, 0);
|
|
});
|
|
});
|
|
|
|
describe('NaN Handling Tests', () => {
|
|
test('should skip transaction creation when rawAmount is NaN', async () => {
|
|
// Arrange
|
|
const userId = new mongoose.Types.ObjectId();
|
|
const initialBalance = 10000000;
|
|
await Balance.create({ user: userId, tokenCredits: initialBalance });
|
|
|
|
const model = 'gpt-3.5-turbo';
|
|
const txData = {
|
|
user: userId,
|
|
conversationId: 'test-conversation-id',
|
|
model,
|
|
context: 'test',
|
|
endpointTokenConfig: null,
|
|
rawAmount: NaN,
|
|
tokenType: 'prompt',
|
|
balance: { enabled: true },
|
|
};
|
|
|
|
// Act
|
|
const result = await createTransaction(txData);
|
|
|
|
// Assert: No transaction should be created and balance remains unchanged.
|
|
expect(result).toBeUndefined();
|
|
const balance = await Balance.findOne({ user: userId });
|
|
expect(balance.tokenCredits).toBe(initialBalance);
|
|
});
|
|
});
|