mirror of
https://github.com/jlengrand/Maestro.git
synced 2026-03-10 08:31:19 +00:00
resolved merge conflicts
This commit is contained in:
@@ -2,11 +2,11 @@
|
||||
* Tests for context usage estimation utilities
|
||||
*/
|
||||
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import {
|
||||
estimateContextUsage,
|
||||
calculateContextTokens,
|
||||
estimateAccumulatedGrowth,
|
||||
estimateAccumulatedGrowth,
|
||||
DEFAULT_CONTEXT_WINDOWS,
|
||||
} from '../../../renderer/utils/contextUsage';
|
||||
import type { UsageStats } from '../../../shared/types';
|
||||
|
||||
@@ -69,9 +69,6 @@ export function calculateContextTokens(
|
||||
return (
|
||||
(stats.inputTokens || 0) + (stats.cacheCreationInputTokens || 0) + (stats.outputTokens || 0)
|
||||
);
|
||||
return (
|
||||
(stats.inputTokens || 0) + (stats.cacheCreationInputTokens || 0) + (stats.outputTokens || 0)
|
||||
);
|
||||
}
|
||||
|
||||
// Claude models: total input = uncached + cache-hit + newly-cached
|
||||
@@ -79,8 +76,6 @@ export function calculateContextTokens(
|
||||
return (
|
||||
(stats.inputTokens || 0) +
|
||||
(stats.cacheReadInputTokens || 0) +
|
||||
(stats.cacheCreationInputTokens || 0)(stats.inputTokens || 0) +
|
||||
(stats.cacheReadInputTokens || 0) +
|
||||
(stats.cacheCreationInputTokens || 0)
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user