mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-09 01:22:36 +01:00
* 🧹 chore: resolve imports due to rebase
* chore: Update model mocks in unit tests for consistency
- Consolidated model mock implementations across various test files to streamline setup and reduce redundancy.
- Removed duplicate mock definitions for `getMultiplier` and `getCacheMultiplier`, ensuring a unified approach in `recordCollectedUsage.spec.js`, `openai.spec.js`, `responses.unit.spec.js`, and `abortMiddleware.spec.js`.
- Enhanced clarity and maintainability of test files by aligning mock structures with the latest model updates.
* fix: Safeguard token credit checks in transaction tests
- Updated assertions in `transaction.spec.ts` to handle potential null values for `updatedBalance` by using optional chaining.
- Enhanced robustness of tests related to token credit calculations, ensuring they correctly account for scenarios where the balance may not be found.
* chore: transaction methods with bulk insert functionality
- Introduced `bulkInsertTransactions` method in `transaction.ts` to facilitate batch insertion of transaction documents.
- Updated test file `transactions.bulk-parity.spec.ts` to utilize new pricing function assignments and handle potential null values in calculations, improving test robustness.
- Refactored pricing function initialization for clarity and consistency.
* refactor: Enhance type definitions and introduce new utility functions for model matching
- Added `findMatchingPattern` and `matchModelName` utility functions to improve model name matching logic in transaction methods.
- Updated type definitions for `findMatchingPattern` to accept a more specific tokensMap structure, enhancing type safety.
- Refactored `dbMethods` initialization in `transactions.bulk-parity.spec.ts` to include the new utility functions, improving test clarity and functionality.
* refactor: Update database method imports and enhance transaction handling
- Refactored `abortMiddleware.js` to utilize centralized database methods for message handling and conversation retrieval, improving code consistency.
- Enhanced `bulkInsertTransactions` in `transaction.ts` to handle empty document arrays gracefully and added error logging for better debugging.
- Updated type definitions in `transactions.ts` to enforce stricter typing for token types, enhancing type safety across transaction methods.
- Improved test setup in `transactions.bulk-parity.spec.ts` by refining pricing function assignments and ensuring robust handling of potential null values.
* refactor: Update database method references and improve transaction multiplier handling
- Refactored `client.js` to update database method references for `bulkInsertTransactions` and `updateBalance`, ensuring consistency in method usage.
- Enhanced transaction multiplier calculations in `transaction.spec.ts` to provide fallback values for write and read multipliers, improving robustness in cost calculations across structured token spending tests.
239 lines
7.5 KiB
JavaScript
239 lines
7.5 KiB
JavaScript
/**
|
|
* Tests for abortMiddleware - spendCollectedUsage function
|
|
*
|
|
* This tests the token spending logic for abort scenarios,
|
|
* particularly for parallel agents (addedConvo) where multiple
|
|
* models need their tokens spent.
|
|
*
|
|
* spendCollectedUsage delegates to recordCollectedUsage from @librechat/api,
|
|
* passing pricing + bulkWriteOps deps, with context: 'abort'.
|
|
* After spending, it clears the collectedUsage array to prevent double-spending
|
|
* from the AgentClient finally block (which shares the same array reference).
|
|
*/
|
|
|
|
const mockSpendTokens = jest.fn().mockResolvedValue();
|
|
const mockSpendStructuredTokens = jest.fn().mockResolvedValue();
|
|
const mockRecordCollectedUsage = jest
|
|
.fn()
|
|
.mockResolvedValue({ input_tokens: 100, output_tokens: 50 });
|
|
|
|
const mockGetMultiplier = jest.fn().mockReturnValue(1);
|
|
const mockGetCacheMultiplier = jest.fn().mockReturnValue(null);
|
|
|
|
jest.mock('@librechat/data-schemas', () => ({
|
|
logger: {
|
|
debug: jest.fn(),
|
|
error: jest.fn(),
|
|
warn: jest.fn(),
|
|
info: jest.fn(),
|
|
},
|
|
}));
|
|
|
|
jest.mock('@librechat/api', () => ({
|
|
countTokens: jest.fn().mockResolvedValue(100),
|
|
isEnabled: jest.fn().mockReturnValue(false),
|
|
sendEvent: jest.fn(),
|
|
GenerationJobManager: {
|
|
abortJob: jest.fn(),
|
|
},
|
|
recordCollectedUsage: mockRecordCollectedUsage,
|
|
sanitizeMessageForTransmit: jest.fn((msg) => msg),
|
|
}));
|
|
|
|
jest.mock('librechat-data-provider', () => ({
|
|
isAssistantsEndpoint: jest.fn().mockReturnValue(false),
|
|
ErrorTypes: { INVALID_REQUEST: 'INVALID_REQUEST', NO_SYSTEM_MESSAGES: 'NO_SYSTEM_MESSAGES' },
|
|
}));
|
|
|
|
jest.mock('~/app/clients/prompts', () => ({
|
|
truncateText: jest.fn((text) => text),
|
|
smartTruncateText: jest.fn((text) => text),
|
|
}));
|
|
|
|
jest.mock('~/cache/clearPendingReq', () => jest.fn().mockResolvedValue());
|
|
|
|
jest.mock('~/server/middleware/error', () => ({
|
|
sendError: jest.fn(),
|
|
}));
|
|
|
|
const mockUpdateBalance = jest.fn().mockResolvedValue({});
|
|
const mockBulkInsertTransactions = jest.fn().mockResolvedValue(undefined);
|
|
jest.mock('~/models', () => ({
|
|
saveMessage: jest.fn().mockResolvedValue(),
|
|
getConvo: jest.fn().mockResolvedValue({ title: 'Test Chat' }),
|
|
updateBalance: mockUpdateBalance,
|
|
bulkInsertTransactions: mockBulkInsertTransactions,
|
|
spendTokens: (...args) => mockSpendTokens(...args),
|
|
spendStructuredTokens: (...args) => mockSpendStructuredTokens(...args),
|
|
getMultiplier: mockGetMultiplier,
|
|
getCacheMultiplier: mockGetCacheMultiplier,
|
|
}));
|
|
|
|
jest.mock('./abortRun', () => ({
|
|
abortRun: jest.fn(),
|
|
}));
|
|
|
|
const { spendCollectedUsage } = require('./abortMiddleware');
|
|
|
|
describe('abortMiddleware - spendCollectedUsage', () => {
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
});
|
|
|
|
describe('spendCollectedUsage delegation', () => {
|
|
it('should return early if collectedUsage is empty', async () => {
|
|
await spendCollectedUsage({
|
|
userId: 'user-123',
|
|
conversationId: 'convo-123',
|
|
collectedUsage: [],
|
|
fallbackModel: 'gpt-4',
|
|
});
|
|
|
|
expect(mockRecordCollectedUsage).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('should return early if collectedUsage is null', async () => {
|
|
await spendCollectedUsage({
|
|
userId: 'user-123',
|
|
conversationId: 'convo-123',
|
|
collectedUsage: null,
|
|
fallbackModel: 'gpt-4',
|
|
});
|
|
|
|
expect(mockRecordCollectedUsage).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('should call recordCollectedUsage with abort context and full deps', async () => {
|
|
const collectedUsage = [{ input_tokens: 100, output_tokens: 50, model: 'gpt-4' }];
|
|
|
|
await spendCollectedUsage({
|
|
userId: 'user-123',
|
|
conversationId: 'convo-123',
|
|
collectedUsage,
|
|
fallbackModel: 'gpt-4',
|
|
messageId: 'msg-123',
|
|
});
|
|
|
|
expect(mockRecordCollectedUsage).toHaveBeenCalledTimes(1);
|
|
expect(mockRecordCollectedUsage).toHaveBeenCalledWith(
|
|
{
|
|
spendTokens: expect.any(Function),
|
|
spendStructuredTokens: expect.any(Function),
|
|
pricing: {
|
|
getMultiplier: mockGetMultiplier,
|
|
getCacheMultiplier: mockGetCacheMultiplier,
|
|
},
|
|
bulkWriteOps: {
|
|
insertMany: mockBulkInsertTransactions,
|
|
updateBalance: mockUpdateBalance,
|
|
},
|
|
},
|
|
{
|
|
user: 'user-123',
|
|
conversationId: 'convo-123',
|
|
collectedUsage,
|
|
context: 'abort',
|
|
messageId: 'msg-123',
|
|
model: 'gpt-4',
|
|
},
|
|
);
|
|
});
|
|
|
|
it('should pass context abort for multiple models (parallel agents)', async () => {
|
|
const collectedUsage = [
|
|
{ input_tokens: 100, output_tokens: 50, model: 'gpt-4' },
|
|
{ input_tokens: 80, output_tokens: 40, model: 'claude-3' },
|
|
{ input_tokens: 120, output_tokens: 60, model: 'gemini-pro' },
|
|
];
|
|
|
|
await spendCollectedUsage({
|
|
userId: 'user-123',
|
|
conversationId: 'convo-123',
|
|
collectedUsage,
|
|
fallbackModel: 'gpt-4',
|
|
});
|
|
|
|
expect(mockRecordCollectedUsage).toHaveBeenCalledTimes(1);
|
|
expect(mockRecordCollectedUsage).toHaveBeenCalledWith(
|
|
expect.any(Object),
|
|
expect.objectContaining({
|
|
context: 'abort',
|
|
collectedUsage,
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should handle real-world parallel agent abort scenario', async () => {
|
|
const collectedUsage = [
|
|
{ input_tokens: 31596, output_tokens: 151, model: 'gemini-3-flash-preview' },
|
|
{ input_tokens: 28000, output_tokens: 120, model: 'gpt-5.2' },
|
|
];
|
|
|
|
await spendCollectedUsage({
|
|
userId: 'user-123',
|
|
conversationId: 'convo-123',
|
|
collectedUsage,
|
|
fallbackModel: 'gemini-3-flash-preview',
|
|
});
|
|
|
|
expect(mockRecordCollectedUsage).toHaveBeenCalledTimes(1);
|
|
expect(mockRecordCollectedUsage).toHaveBeenCalledWith(
|
|
expect.any(Object),
|
|
expect.objectContaining({
|
|
user: 'user-123',
|
|
conversationId: 'convo-123',
|
|
context: 'abort',
|
|
model: 'gemini-3-flash-preview',
|
|
}),
|
|
);
|
|
});
|
|
|
|
/**
|
|
* Race condition prevention: after abort middleware spends tokens,
|
|
* the collectedUsage array is cleared so AgentClient.recordCollectedUsage()
|
|
* (which shares the same array reference) sees an empty array and returns early.
|
|
*/
|
|
it('should clear collectedUsage array after spending to prevent double-spending', async () => {
|
|
const collectedUsage = [
|
|
{ input_tokens: 100, output_tokens: 50, model: 'gpt-4' },
|
|
{ input_tokens: 80, output_tokens: 40, model: 'claude-3' },
|
|
];
|
|
|
|
expect(collectedUsage.length).toBe(2);
|
|
|
|
await spendCollectedUsage({
|
|
userId: 'user-123',
|
|
conversationId: 'convo-123',
|
|
collectedUsage,
|
|
fallbackModel: 'gpt-4',
|
|
});
|
|
|
|
expect(mockRecordCollectedUsage).toHaveBeenCalledTimes(1);
|
|
expect(collectedUsage.length).toBe(0);
|
|
});
|
|
|
|
it('should await recordCollectedUsage before clearing array', async () => {
|
|
let resolved = false;
|
|
mockRecordCollectedUsage.mockImplementation(async () => {
|
|
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
resolved = true;
|
|
return { input_tokens: 100, output_tokens: 50 };
|
|
});
|
|
|
|
const collectedUsage = [
|
|
{ input_tokens: 100, output_tokens: 50, model: 'gpt-4' },
|
|
{ input_tokens: 80, output_tokens: 40, model: 'claude-3' },
|
|
];
|
|
|
|
await spendCollectedUsage({
|
|
userId: 'user-123',
|
|
conversationId: 'convo-123',
|
|
collectedUsage,
|
|
fallbackModel: 'gpt-4',
|
|
});
|
|
|
|
expect(resolved).toBe(true);
|
|
expect(collectedUsage.length).toBe(0);
|
|
});
|
|
});
|
|
});
|