diff --git a/apps/sim/providers/azure-openai/index.test.ts b/apps/sim/providers/azure-openai/index.test.ts index 252adef6e3e..591f46a561c 100644 --- a/apps/sim/providers/azure-openai/index.test.ts +++ b/apps/sim/providers/azure-openai/index.test.ts @@ -256,7 +256,12 @@ describe('azureOpenAIProvider — SSRF pinning', () => { expect('stream' in result).toBe(true) if (!('stream' in result)) throw new Error('Expected streaming execution') expect(result.execution.output.content).toBe('done') - expect(result.execution.output.tokens).toEqual({ input: 6, output: 3, total: 9 }) + expect(result.execution.output.tokens).toEqual({ + input: 6, + output: 3, + cacheRead: 0, + total: 9, + }) expect(result.execution.output.providerTiming?.iterations).toBe(2) expect( result.execution.output.providerTiming?.timeSegments?.filter( diff --git a/apps/sim/providers/azure-openai/index.ts b/apps/sim/providers/azure-openai/index.ts index 307accdd16c..618a4a3b811 100644 --- a/apps/sim/providers/azure-openai/index.ts +++ b/apps/sim/providers/azure-openai/index.ts @@ -41,6 +41,7 @@ import { getProviderDefaultModel, getProviderModels } from '@/providers/models' import { executeResponsesProviderRequest } from '@/providers/openai/core' import { getChatCompletionConversationUsage } from '@/providers/openai-compat/conversation-usage' import { createOpenAICompatibleAgentEventStream } from '@/providers/openai-compat/stream-events' +import { createChatCompletionUsageMeter } from '@/providers/openai-compat/usage-meter' import { buildJsonSchemaResponseFormat } from '@/providers/response-format' import { executeProviderTool } from '@/providers/runtime-context' import { createSettledAgentEventStream } from '@/providers/stream-events' @@ -62,7 +63,6 @@ import type { } from '@/providers/types' import { ProviderError } from '@/providers/types' import { - calculateCost, checkForForcedToolUsageOpenAI, isFunctionToolCall, prepareToolExecution, @@ -244,22 +244,10 @@ async function executeChatCompletionsRequest( request, onComplete: ({ content, usage }) => { output.content = content - output.tokens = { - input: usage.prompt_tokens, - output: usage.completion_tokens, - total: usage.total_tokens, - } - - const costResult = calculateCost( - request.model, - usage.prompt_tokens, - usage.completion_tokens - ) - output.cost = { - input: costResult.input, - output: costResult.output, - total: costResult.total, - } + const streamUsage = createChatCompletionUsageMeter(request.model) + streamUsage.record(usage) + output.tokens = { ...streamUsage.tokens } + output.cost = streamUsage.cost() finalizeTiming() }, @@ -289,11 +277,8 @@ async function executeChatCompletionsRequest( const firstResponseTime = Date.now() - initialCallTime let content = currentResponse.choices[0]?.message?.content || '' - const tokens = { - input: currentResponse.usage?.prompt_tokens || 0, - output: currentResponse.usage?.completion_tokens || 0, - total: currentResponse.usage?.total_tokens || 0, - } + const usageMeter = createChatCompletionUsageMeter(request.model) + usageMeter.record(currentResponse.usage) const toolCalls: FunctionCallResponse[] = [] const toolResults: Record[] = [] const currentMessages = [...allMessages] @@ -577,11 +562,7 @@ async function executeChatCompletionsRequest( content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) iterationCount++ } @@ -623,11 +604,7 @@ async function executeChatCompletionsRequest( modelTime += synthesisEndTime - synthesisStartTime content = synthesisResponse.choices[0]?.message?.content || content - if (synthesisResponse.usage) { - tokens.input += synthesisResponse.usage.prompt_tokens || 0 - tokens.output += synthesisResponse.usage.completion_tokens || 0 - tokens.total += synthesisResponse.usage.total_tokens || 0 - } + usageMeter.record(synthesisResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -640,8 +617,7 @@ async function executeChatCompletionsRequest( if (request.stream) { logger.info('Projecting settled response after tool processing') - const accumulatedCost = calculateCost(request.model, tokens.input, tokens.output) - const toolCost = sumToolCosts(toolResults) + const accumulatedCost = usageMeter.cost(sumToolCosts(toolResults)) return createStreamingExecution({ model: request.model, @@ -655,17 +631,8 @@ async function executeChatCompletionsRequest( iterations: timeSegments.filter((segment) => segment.type === 'model').length, timeSegments, }, - initialTokens: { - input: tokens.input, - output: tokens.output, - total: tokens.total, - }, - initialCost: { - input: accumulatedCost.input, - output: accumulatedCost.output, - toolCost: toolCost || undefined, - total: accumulatedCost.total + toolCost, - }, + initialTokens: { ...usageMeter.tokens }, + initialCost: accumulatedCost, toolCalls: toolCalls.length > 0 ? { @@ -689,7 +656,8 @@ async function executeChatCompletionsRequest( return { content, model: request.model, - tokens, + tokens: { ...usageMeter.tokens }, + cost: usageMeter.cost(), toolCalls: toolCalls.length > 0 ? toolCalls : undefined, toolResults: toolResults.length > 0 ? toolResults : undefined, timing: { diff --git a/apps/sim/providers/cerebras/index.ts b/apps/sim/providers/cerebras/index.ts index efb04cb21c1..d24a0e6e726 100644 --- a/apps/sim/providers/cerebras/index.ts +++ b/apps/sim/providers/cerebras/index.ts @@ -18,6 +18,7 @@ import { getProviderDefaultModel, getProviderModels } from '@/providers/models' import { createOpenAICompatAssistantHistory } from '@/providers/openai-compat/assistant-history' import { getChatCompletionConversationUsage } from '@/providers/openai-compat/conversation-usage' import { createOpenAICompatibleAgentEventStream } from '@/providers/openai-compat/stream-events' +import { createChatCompletionUsageMeter } from '@/providers/openai-compat/usage-meter' import { buildJsonSchemaResponseFormat } from '@/providers/response-format' import { executeProviderTool } from '@/providers/runtime-context' import { createSettledAgentEventStream } from '@/providers/stream-events' @@ -38,7 +39,6 @@ import type { } from '@/providers/types' import { ProviderError } from '@/providers/types' import { - calculateCost, isFunctionToolCall, prepareToolExecution, prepareToolsWithUsageControl, @@ -160,22 +160,10 @@ export const cerebrasProvider: ProviderConfig = { request, onComplete: ({ content, usage }) => { output.content = content - output.tokens = { - input: usage.prompt_tokens, - output: usage.completion_tokens, - total: usage.total_tokens, - } - - const costResult = calculateCost( - request.model, - usage.prompt_tokens, - usage.completion_tokens - ) - output.cost = { - input: costResult.input, - output: costResult.output, - total: costResult.total, - } + const streamUsage = createChatCompletionUsageMeter(request.model) + streamUsage.record(usage) + output.tokens = { ...streamUsage.tokens } + output.cost = streamUsage.cost() }, }), }) @@ -199,11 +187,8 @@ export const cerebrasProvider: ProviderConfig = { const firstResponseTime = Date.now() - initialCallTime let content = currentResponse.choices[0]?.message?.content || '' - const tokens = { - input: currentResponse.usage?.prompt_tokens || 0, - output: currentResponse.usage?.completion_tokens || 0, - total: currentResponse.usage?.total_tokens || 0, - } + const usageMeter = createChatCompletionUsageMeter(request.model) + usageMeter.record(currentResponse.usage) const toolCalls = [] const toolResults: Record[] = [] const currentMessages = [...formattedMessages] @@ -476,11 +461,7 @@ export const cerebrasProvider: ProviderConfig = { if (currentResponse.choices[0]?.message?.content) { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -525,11 +506,7 @@ export const cerebrasProvider: ProviderConfig = { }) modelTime += thisModelTime - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) iterationCount++ } @@ -577,11 +554,7 @@ export const cerebrasProvider: ProviderConfig = { if (currentResponse.choices[0]?.message?.content) { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -604,8 +577,7 @@ export const cerebrasProvider: ProviderConfig = { const totalDuration = providerEndTime - providerStartTime if (request.stream) { - const accumulatedCost = calculateCost(request.model, tokens.input, tokens.output) - const toolCost = sumToolCosts(toolResults) + const accumulatedCost = usageMeter.cost(sumToolCosts(toolResults)) const streamingResult = createStreamingExecution({ model: request.model, @@ -619,17 +591,8 @@ export const cerebrasProvider: ProviderConfig = { iterations: iterationCount + 1, timeSegments, }, - initialTokens: { - input: tokens.input, - output: tokens.output, - total: tokens.total, - }, - initialCost: { - input: accumulatedCost.input, - output: accumulatedCost.output, - toolCost: toolCost || undefined, - total: accumulatedCost.total + toolCost, - }, + initialTokens: { ...usageMeter.tokens }, + initialCost: accumulatedCost, toolCalls: toolCalls.length > 0 ? { @@ -652,7 +615,8 @@ export const cerebrasProvider: ProviderConfig = { return { content, model: request.model, - tokens, + tokens: { ...usageMeter.tokens }, + cost: usageMeter.cost(), toolCalls: toolCalls.length > 0 ? toolCalls : undefined, toolResults: toolResults.length > 0 ? toolResults : undefined, timing: { diff --git a/apps/sim/providers/litellm/index.test.ts b/apps/sim/providers/litellm/index.test.ts index 0010e092216..13f8d6280df 100644 --- a/apps/sim/providers/litellm/index.test.ts +++ b/apps/sim/providers/litellm/index.test.ts @@ -140,7 +140,7 @@ describe('litellmProvider.executeRequest', () => { expect(payload.temperature).toBe(0.5) expect(payload.max_completion_tokens).toBe(256) expect(result.content).toBe('hello') - expect(result.tokens).toEqual({ input: 5, output: 3, total: 8 }) + expect(result.tokens).toEqual({ input: 5, output: 3, cacheRead: 0, total: 8 }) }) it('forwards reasoning_effort only when set to a non-default value', async () => { @@ -243,7 +243,12 @@ describe('litellmProvider.executeRequest', () => { expect(mockCreate).toHaveBeenCalledTimes(2) expect(result.execution.output.content).toBe('done') - expect(result.execution.output.tokens).toEqual({ input: 10, output: 6, total: 16 }) + expect(result.execution.output.tokens).toEqual({ + input: 10, + output: 6, + cacheRead: 0, + total: 16, + }) expect(result.execution.output.providerTiming?.iterations).toBe(2) expect( result.execution.output.providerTiming?.timeSegments?.filter( diff --git a/apps/sim/providers/meta/index.ts b/apps/sim/providers/meta/index.ts index d29213658f3..10838b69948 100644 --- a/apps/sim/providers/meta/index.ts +++ b/apps/sim/providers/meta/index.ts @@ -18,6 +18,7 @@ import { import { getProviderDefaultModel, getProviderModels } from '@/providers/models' import { getChatCompletionConversationUsage } from '@/providers/openai-compat/conversation-usage' import { createOpenAICompatibleAgentEventStream } from '@/providers/openai-compat/stream-events' +import { createChatCompletionUsageMeter } from '@/providers/openai-compat/usage-meter' import { buildJsonSchemaResponseFormat } from '@/providers/response-format' import { executeProviderTool } from '@/providers/runtime-context' import { createSettledAgentEventStream } from '@/providers/stream-events' @@ -38,7 +39,6 @@ import type { } from '@/providers/types' import { ProviderError } from '@/providers/types' import { - calculateCost, isFunctionToolCall, prepareToolExecution, prepareToolsWithUsageControl, @@ -198,22 +198,10 @@ export const metaProvider: ProviderConfig = { request, onComplete: ({ content, usage }) => { output.content = content - output.tokens = { - input: usage.prompt_tokens, - output: usage.completion_tokens, - total: usage.total_tokens, - } - - const costResult = calculateCost( - request.model, - usage.prompt_tokens, - usage.completion_tokens - ) - output.cost = { - input: costResult.input, - output: costResult.output, - total: costResult.total, - } + const streamUsage = createChatCompletionUsageMeter(request.model) + streamUsage.record(usage) + output.tokens = { ...streamUsage.tokens } + output.cost = streamUsage.cost() }, } ), @@ -240,11 +228,8 @@ export const metaProvider: ProviderConfig = { let content = currentResponse.choices[0]?.message?.content || '' - const tokens = { - input: currentResponse.usage?.prompt_tokens || 0, - output: currentResponse.usage?.completion_tokens || 0, - total: currentResponse.usage?.total_tokens || 0, - } + const usageMeter = createChatCompletionUsageMeter(request.model) + usageMeter.record(currentResponse.usage) const toolCalls = [] const toolResults: Record[] = [] const currentMessages = [...formattedMessages] @@ -485,11 +470,7 @@ export const metaProvider: ProviderConfig = { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) iterationCount++ } @@ -540,11 +521,7 @@ export const metaProvider: ProviderConfig = { if (currentResponse.choices[0]?.message?.content) { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -604,11 +581,7 @@ export const metaProvider: ProviderConfig = { content = formattedContent } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -619,8 +592,7 @@ export const metaProvider: ProviderConfig = { } if (request.stream) { - const accumulatedCost = calculateCost(request.model, tokens.input, tokens.output) - const toolCost = sumToolCosts(toolResults) + const accumulatedCost = usageMeter.cost(sumToolCosts(toolResults)) const streamingResult = createStreamingExecution({ model: request.model, @@ -634,17 +606,8 @@ export const metaProvider: ProviderConfig = { iterations: timeSegments.filter((segment) => segment.type === 'model').length, timeSegments, }, - initialTokens: { - input: tokens.input, - output: tokens.output, - total: tokens.total, - }, - initialCost: { - input: accumulatedCost.input, - output: accumulatedCost.output, - toolCost: toolCost || undefined, - total: accumulatedCost.total + toolCost, - }, + initialTokens: { ...usageMeter.tokens }, + initialCost: accumulatedCost, toolCalls: toolCalls.length > 0 ? { @@ -671,7 +634,8 @@ export const metaProvider: ProviderConfig = { return { content, model: request.model, - tokens, + tokens: { ...usageMeter.tokens }, + cost: usageMeter.cost(), toolCalls: toolCalls.length > 0 ? toolCalls : undefined, toolResults: toolResults.length > 0 ? toolResults : undefined, timing: { diff --git a/apps/sim/providers/mistral/index.test.ts b/apps/sim/providers/mistral/index.test.ts index 2906f331096..31c00071010 100644 --- a/apps/sim/providers/mistral/index.test.ts +++ b/apps/sim/providers/mistral/index.test.ts @@ -261,7 +261,7 @@ describe('mistralProvider.executeRequest', () => { expect('stream' in result).toBe(true) if (!('stream' in result)) throw new Error('Expected streaming execution') expect(result.execution.output.content).toBe('done') - expect(result.execution.output.tokens).toEqual({ input: 6, output: 3, total: 9 }) + expect(result.execution.output.tokens).toEqual({ input: 6, output: 3, cacheRead: 0, total: 9 }) expect(result.execution.output.providerTiming?.iterations).toBe(2) expect( result.execution.output.providerTiming?.timeSegments?.filter( diff --git a/apps/sim/providers/mistral/index.ts b/apps/sim/providers/mistral/index.ts index a9657bb262c..8bc43fa51a7 100644 --- a/apps/sim/providers/mistral/index.ts +++ b/apps/sim/providers/mistral/index.ts @@ -19,6 +19,7 @@ import { getProviderDefaultModel, getProviderModels } from '@/providers/models' import { extractChatCompletionText } from '@/providers/openai-compat/content' import { getChatCompletionConversationUsage } from '@/providers/openai-compat/conversation-usage' import { createOpenAICompatibleAgentEventStream } from '@/providers/openai-compat/stream-events' +import { createChatCompletionUsageMeter } from '@/providers/openai-compat/usage-meter' import { buildJsonSchemaResponseFormat } from '@/providers/response-format' import { executeProviderTool } from '@/providers/runtime-context' import { createSettledAgentEventStream } from '@/providers/stream-events' @@ -39,7 +40,6 @@ import type { } from '@/providers/types' import { ProviderError } from '@/providers/types' import { - calculateCost, isFunctionToolCall, prepareToolExecution, prepareToolsWithUsageControl, @@ -184,22 +184,10 @@ export const mistralProvider: ProviderConfig = { extractContent: extractChatCompletionText, onComplete: ({ content, usage }) => { output.content = content - output.tokens = { - input: usage.prompt_tokens, - output: usage.completion_tokens, - total: usage.total_tokens, - } - - const costResult = calculateCost( - request.model, - usage.prompt_tokens, - usage.completion_tokens - ) - output.cost = { - input: costResult.input, - output: costResult.output, - total: costResult.total, - } + const streamUsage = createChatCompletionUsageMeter(request.model) + streamUsage.record(usage) + output.tokens = { ...streamUsage.tokens } + output.cost = streamUsage.cost() finalizeTiming() }, @@ -253,11 +241,8 @@ export const mistralProvider: ProviderConfig = { const firstResponseTime = Date.now() - initialCallTime let content = extractChatCompletionText(currentResponse.choices[0]?.message?.content) - const tokens = { - input: currentResponse.usage?.prompt_tokens || 0, - output: currentResponse.usage?.completion_tokens || 0, - total: currentResponse.usage?.total_tokens || 0, - } + const usageMeter = createChatCompletionUsageMeter(request.model) + usageMeter.record(currentResponse.usage) const toolCalls = [] const toolResults: Record[] = [] const currentMessages = [...formattedMessages] @@ -514,11 +499,7 @@ export const mistralProvider: ProviderConfig = { content = extractChatCompletionText(currentResponse.choices[0]?.message?.content) || content - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) iterationCount++ } @@ -567,11 +548,7 @@ export const mistralProvider: ProviderConfig = { content = extractChatCompletionText(synthesisResponse.choices[0]?.message?.content) || content - if (synthesisResponse.usage) { - tokens.input += synthesisResponse.usage.prompt_tokens || 0 - tokens.output += synthesisResponse.usage.completion_tokens || 0 - tokens.total += synthesisResponse.usage.total_tokens || 0 - } + usageMeter.record(synthesisResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -585,8 +562,7 @@ export const mistralProvider: ProviderConfig = { if (request.stream) { logger.info('Projecting settled response after tool processing') - const accumulatedCost = calculateCost(request.model, tokens.input, tokens.output) - const toolCost = sumToolCosts(toolResults) + const accumulatedCost = usageMeter.cost(sumToolCosts(toolResults)) return createStreamingExecution({ model: request.model, @@ -600,17 +576,8 @@ export const mistralProvider: ProviderConfig = { iterations: timeSegments.filter((segment) => segment.type === 'model').length, timeSegments, }, - initialTokens: { - input: tokens.input, - output: tokens.output, - total: tokens.total, - }, - initialCost: { - input: accumulatedCost.input, - output: accumulatedCost.output, - toolCost: toolCost || undefined, - total: accumulatedCost.total + toolCost, - }, + initialTokens: { ...usageMeter.tokens }, + initialCost: accumulatedCost, toolCalls: toolCalls.length > 0 ? { @@ -634,7 +601,8 @@ export const mistralProvider: ProviderConfig = { return { content, model: request.model, - tokens, + tokens: { ...usageMeter.tokens }, + cost: usageMeter.cost(), toolCalls: toolCalls.length > 0 ? toolCalls : undefined, toolResults: toolResults.length > 0 ? toolResults : undefined, timing: { diff --git a/apps/sim/providers/nebius/index.test.ts b/apps/sim/providers/nebius/index.test.ts index 30c9a0fa18d..5c0a463fec2 100644 --- a/apps/sim/providers/nebius/index.test.ts +++ b/apps/sim/providers/nebius/index.test.ts @@ -48,7 +48,7 @@ describe('Nebius Chat Completions wire contract', () => { model: selectedModel, })) as ProviderResponse expect(result.model).toBe(selectedModel) - expect(result.tokens).toEqual({ input: 10, output: 5, total: 15 }) + expect(result.tokens).toEqual({ input: 10, output: 5, cacheRead: 0, total: 15 }) } ) @@ -159,7 +159,7 @@ describe('Nebius Chat Completions wire contract', () => { expect(events).toContain('Compute.') const output = await result.execution expect(output.output.content).toBe('42') - expect(output.output.tokens).toEqual({ input: 10, output: 5, total: 15 }) + expect(output.output.tokens).toEqual({ input: 10, output: 5, cacheRead: 0, total: 15 }) expect(output.output.cost?.total).toBeCloseTo(0.0000025) }) diff --git a/apps/sim/providers/nvidia/index.ts b/apps/sim/providers/nvidia/index.ts index 8865e8c6b5e..bfb540e471d 100644 --- a/apps/sim/providers/nvidia/index.ts +++ b/apps/sim/providers/nvidia/index.ts @@ -23,6 +23,7 @@ import { import { createOpenAICompatAssistantHistory } from '@/providers/openai-compat/assistant-history' import { getChatCompletionConversationUsage } from '@/providers/openai-compat/conversation-usage' import { createOpenAICompatibleAgentEventStream } from '@/providers/openai-compat/stream-events' +import { createChatCompletionUsageMeter } from '@/providers/openai-compat/usage-meter' import { buildJsonSchemaResponseFormat } from '@/providers/response-format' import { executeProviderTool } from '@/providers/runtime-context' import { createSettledAgentEventStream } from '@/providers/stream-events' @@ -43,7 +44,6 @@ import type { } from '@/providers/types' import { ProviderError } from '@/providers/types' import { - calculateCost, generateSchemaInstructions, isFunctionToolCall, prepareToolExecution, @@ -198,22 +198,10 @@ export const nvidiaProvider: ProviderConfig = { request, onComplete: ({ content, usage }) => { output.content = content - output.tokens = { - input: usage.prompt_tokens, - output: usage.completion_tokens, - total: usage.total_tokens, - } - - const costResult = calculateCost( - request.model, - usage.prompt_tokens, - usage.completion_tokens - ) - output.cost = { - input: costResult.input, - output: costResult.output, - total: costResult.total, - } + const streamUsage = createChatCompletionUsageMeter(request.model) + streamUsage.record(usage) + output.tokens = { ...streamUsage.tokens } + output.cost = streamUsage.cost() }, } ), @@ -243,11 +231,8 @@ export const nvidiaProvider: ProviderConfig = { let content = currentResponse.choices[0]?.message?.content || '' - const tokens = { - input: currentResponse.usage?.prompt_tokens || 0, - output: currentResponse.usage?.completion_tokens || 0, - total: currentResponse.usage?.total_tokens || 0, - } + const usageMeter = createChatCompletionUsageMeter(request.model) + usageMeter.record(currentResponse.usage) const toolCalls = [] const toolResults: Record[] = [] const currentMessages = [...formattedMessages] @@ -532,11 +517,7 @@ export const nvidiaProvider: ProviderConfig = { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) iterationCount++ } @@ -591,11 +572,7 @@ export const nvidiaProvider: ProviderConfig = { if (currentResponse.choices[0]?.message?.content) { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -654,11 +631,7 @@ export const nvidiaProvider: ProviderConfig = { content = formattedContent } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -669,8 +642,7 @@ export const nvidiaProvider: ProviderConfig = { } if (request.stream) { - const accumulatedCost = calculateCost(request.model, tokens.input, tokens.output) - const toolCost = sumToolCosts(toolResults) + const accumulatedCost = usageMeter.cost(sumToolCosts(toolResults)) const streamingResult = createStreamingExecution({ model: request.model, @@ -684,17 +656,8 @@ export const nvidiaProvider: ProviderConfig = { iterations: timeSegments.filter((segment) => segment.type === 'model').length, timeSegments, }, - initialTokens: { - input: tokens.input, - output: tokens.output, - total: tokens.total, - }, - initialCost: { - input: accumulatedCost.input, - output: accumulatedCost.output, - toolCost: toolCost || undefined, - total: accumulatedCost.total + toolCost, - }, + initialTokens: { ...usageMeter.tokens }, + initialCost: accumulatedCost, toolCalls: toolCalls.length > 0 ? { @@ -721,7 +684,8 @@ export const nvidiaProvider: ProviderConfig = { return { content, model: request.model, - tokens, + tokens: { ...usageMeter.tokens }, + cost: usageMeter.cost(), toolCalls: toolCalls.length > 0 ? toolCalls : undefined, toolResults: toolResults.length > 0 ? toolResults : undefined, timing: { diff --git a/apps/sim/providers/openai-compat/cache-billing.test.ts b/apps/sim/providers/openai-compat/cache-billing.test.ts index d16ada36e47..db4ec3ebd4e 100644 --- a/apps/sim/providers/openai-compat/cache-billing.test.ts +++ b/apps/sim/providers/openai-compat/cache-billing.test.ts @@ -1,6 +1,8 @@ +import { collectStream } from '@sim/testing/helpers/async' import { openaiMock, openaiMockFns } from '@sim/testing/mocks/openai.mock' import { providersMock } from '@sim/testing/mocks/providers.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' +import type { StreamingExecution } from '@/executor/types' import type { ProviderConfig, ProviderResponse } from '@/providers/types' vi.mock('openai', () => openaiMock) @@ -14,8 +16,12 @@ vi.mock('groq-sdk', () => ({ vi.mock('@/providers', () => providersMock) import { deepseekProvider } from '@/providers/deepseek/index' +import { fireworksProvider } from '@/providers/fireworks/index' import { groqProvider } from '@/providers/groq/index' import { kimiProvider } from '@/providers/kimi/index' +import { metaProvider } from '@/providers/meta/index' +import { mistralProvider } from '@/providers/mistral/index' +import { sakanaProvider } from '@/providers/sakana/index' import { zaiProvider } from '@/providers/zai/index' const mockCreate = openaiMockFns.mockChatCompletionsCreate @@ -53,6 +59,34 @@ describe.each<[string, ProviderConfig, string, Record, number]> { prompt_tokens_details: { cached_tokens: 800_000 } }, 0.2 * 0.15 + 0.8 * 0.075, ], + [ + 'Meta', + metaProvider, + 'muse-spark-1.3', + { prompt_tokens_details: { cached_tokens: 800_000 } }, + 0.2 * 1.25 + 0.8 * 0.15, + ], + [ + 'Mistral', + mistralProvider, + 'mistral-large-4', + { prompt_tokens_details: { cached_tokens: 800_000 } }, + 0.2 * 0.7 + 0.8 * 0.07, + ], + [ + 'Sakana', + sakanaProvider, + 'fugu-max', + { prompt_tokens_details: { cached_tokens: 800_000 } }, + 0.2 * 2 + 0.8 * 0.25, + ], + [ + 'Fireworks (shared Chat Completions path)', + fireworksProvider, + 'fireworks/glm-5.3', + { prompt_tokens_details: { cached_tokens: 800_000 } }, + 0.2 * 1.4 + 0.8 * 0.26, + ], ])('%s cache-read billing', (_name, provider, model, cacheFields, expectedInputCost) => { beforeEach(() => { mockCreate.mockReset() @@ -77,4 +111,34 @@ describe.each<[string, ProviderConfig, string, Record, number]> expect(response.tokens).toMatchObject({ input: 200_000, cacheRead: 800_000 }) expect(response.cost?.input).toBeCloseTo(expectedInputCost, 8) }) + + it('prices cached prompt tokens reported at the end of a stream', async () => { + mockCreate.mockReset() + mockCreate.mockResolvedValue( + (async function* () { + yield { choices: [{ index: 0, delta: { content: 'ok' }, finish_reason: 'stop' }] } + yield { + choices: [], + usage: { + prompt_tokens: 1_000_000, + completion_tokens: 0, + total_tokens: 1_000_000, + ...cacheFields, + }, + } + })() + ) + + const result = (await provider.executeRequest({ + model, + apiKey: 'test-key', + messages: [{ role: 'user', content: 'hi' }], + stream: true, + })) as StreamingExecution + await collectStream(result.stream) + const { output } = await result.execution + + expect(output.tokens).toMatchObject({ input: 200_000, cacheRead: 800_000 }) + expect(output.cost?.input).toBeCloseTo(expectedInputCost, 8) + }) }) diff --git a/apps/sim/providers/openai-compat/chat-completions.ts b/apps/sim/providers/openai-compat/chat-completions.ts index f8e3e99f6ef..ceb93363731 100644 --- a/apps/sim/providers/openai-compat/chat-completions.ts +++ b/apps/sim/providers/openai-compat/chat-completions.ts @@ -27,6 +27,7 @@ import { } from '@/providers/openai-compat/assistant-history' import { getChatCompletionConversationUsage } from '@/providers/openai-compat/conversation-usage' import { createOpenAICompatibleAgentEventStream } from '@/providers/openai-compat/stream-events' +import { createChatCompletionUsageMeter } from '@/providers/openai-compat/usage-meter' import { executeProviderTool } from '@/providers/runtime-context' import { createSettledAgentEventStream } from '@/providers/stream-events' import { createStreamingExecution } from '@/providers/streaming-execution' @@ -46,7 +47,6 @@ import type { } from '@/providers/types' import { ProviderError } from '@/providers/types' import { - calculateCost, checkForForcedToolUsageOpenAI, isFunctionToolCall, prepareToolExecution, @@ -172,22 +172,10 @@ export async function executeChatCompletionRequest( providerName, onComplete: ({ content, usage }) => { output.content = content - output.tokens = { - input: usage.prompt_tokens, - output: usage.completion_tokens, - total: usage.total_tokens, - } - - const costResult = calculateCost( - reportedModel, - usage.prompt_tokens, - usage.completion_tokens - ) - output.cost = { - input: costResult.input, - output: costResult.output, - total: costResult.total, - } + const streamUsage = createChatCompletionUsageMeter(reportedModel) + streamUsage.record(usage) + output.tokens = { ...streamUsage.tokens } + output.cost = streamUsage.cost() finalizeTiming() }, @@ -217,11 +205,8 @@ export async function executeChatCompletionRequest( const firstResponseTime = Date.now() - initialCallTime let content = currentResponse.choices[0]?.message?.content || '' - const tokens = { - input: currentResponse.usage?.prompt_tokens || 0, - output: currentResponse.usage?.completion_tokens || 0, - total: currentResponse.usage?.total_tokens || 0, - } + const usageMeter = createChatCompletionUsageMeter(reportedModel) + usageMeter.record(currentResponse.usage) const toolCalls: FunctionCallResponse[] = [] const toolResults: Record[] = [] const currentMessages = [...formattedMessages] @@ -486,11 +471,7 @@ export async function executeChatCompletionRequest( if (currentResponse.choices[0]?.message?.content) { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) iterationCount++ } @@ -552,11 +533,7 @@ export async function executeChatCompletionRequest( if (finalResponse.choices[0]?.message?.content) { content = finalResponse.choices[0].message.content } - if (finalResponse.usage) { - tokens.input += finalResponse.usage.prompt_tokens || 0 - tokens.output += finalResponse.usage.completion_tokens || 0 - tokens.total += finalResponse.usage.total_tokens || 0 - } + usageMeter.record(finalResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -614,11 +591,7 @@ export async function executeChatCompletionRequest( if (finalResponse.choices[0]?.message?.content) { content = finalResponse.choices[0].message.content } - if (finalResponse.usage) { - tokens.input += finalResponse.usage.prompt_tokens || 0 - tokens.output += finalResponse.usage.completion_tokens || 0 - tokens.total += finalResponse.usage.total_tokens || 0 - } + usageMeter.record(finalResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -629,14 +602,7 @@ export async function executeChatCompletionRequest( } if (request.stream) { - const accumulatedCost = calculateCost(reportedModel, tokens.input, tokens.output) - const toolCost = sumToolCosts(toolResults) - const finalCost = { - input: accumulatedCost.input, - output: accumulatedCost.output, - toolCost: toolCost || undefined, - total: accumulatedCost.total + toolCost, - } + const finalCost = usageMeter.cost(sumToolCosts(toolResults)) const streamingResult = createStreamingExecution({ model: reportedModel, @@ -650,13 +616,13 @@ export async function executeChatCompletionRequest( iterations: timeSegments.filter((segment) => segment.type === 'model').length, timeSegments, }, - initialTokens: { input: tokens.input, output: tokens.output, total: tokens.total }, + initialTokens: { ...usageMeter.tokens }, initialCost: finalCost, toolCalls: toolCalls.length > 0 ? { list: toolCalls, count: toolCalls.length } : undefined, streamFormat: 'agent-events-v1', createStream: ({ output, finalizeTiming }) => { output.content = content - output.tokens = { input: tokens.input, output: tokens.output, total: tokens.total } + output.tokens = { ...usageMeter.tokens } output.cost = finalCost finalizeTiming() return createSettledAgentEventStream(content) @@ -673,7 +639,8 @@ export async function executeChatCompletionRequest( return { content, model: reportedModel, - tokens, + tokens: { ...usageMeter.tokens }, + cost: usageMeter.cost(), toolCalls: toolCalls.length > 0 ? toolCalls : undefined, toolResults: toolResults.length > 0 ? toolResults : undefined, timing: { diff --git a/apps/sim/providers/openai-compat/self-hosted.ts b/apps/sim/providers/openai-compat/self-hosted.ts index 59776903fb5..d68cae0579a 100644 --- a/apps/sim/providers/openai-compat/self-hosted.ts +++ b/apps/sim/providers/openai-compat/self-hosted.ts @@ -32,6 +32,7 @@ import { getOpenAICompatibleApiBaseUrl } from '@/providers/openai-compat/base-ur import { getChatCompletionConversationUsage } from '@/providers/openai-compat/conversation-usage' import { listOpenAICompatibleModels } from '@/providers/openai-compat/model-list' import { createOpenAICompatibleAgentEventStream } from '@/providers/openai-compat/stream-events' +import { createChatCompletionUsageMeter } from '@/providers/openai-compat/usage-meter' import { buildJsonSchemaResponseFormat } from '@/providers/response-format' import { executeProviderTool } from '@/providers/runtime-context' import { createSettledAgentEventStream } from '@/providers/stream-events' @@ -53,7 +54,6 @@ import type { } from '@/providers/types' import { ProviderError } from '@/providers/types' import { - calculateCost, checkForForcedToolUsageOpenAI, enforceStrictSchema, isFunctionToolCall, @@ -337,22 +337,10 @@ export async function executeSelfHostedChatRequest( onComplete: ({ content, usage }) => { output.content = content && request.responseFormat ? stripJsonFences(content) : content - output.tokens = { - input: usage.prompt_tokens, - output: usage.completion_tokens, - total: usage.total_tokens, - } - - const costResult = calculateCost( - request.model, - usage.prompt_tokens, - usage.completion_tokens - ) - output.cost = { - input: costResult.input, - output: costResult.output, - total: costResult.total, - } + const streamUsage = createChatCompletionUsageMeter(request.model) + streamUsage.record(usage) + output.tokens = { ...streamUsage.tokens } + output.cost = streamUsage.cost() finalizeTiming() }, @@ -388,11 +376,8 @@ export async function executeSelfHostedChatRequest( content = stripJsonFences(content) } - const tokens = { - input: currentResponse.usage?.prompt_tokens || 0, - output: currentResponse.usage?.completion_tokens || 0, - total: currentResponse.usage?.total_tokens || 0, - } + const usageMeter = createChatCompletionUsageMeter(request.model) + usageMeter.record(currentResponse.usage) const toolCalls: FunctionCallResponse[] = [] const toolResults: Record[] = [] const currentMessages = [...formattedMessages] @@ -681,11 +666,7 @@ export async function executeSelfHostedChatRequest( } } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) iterationCount++ } @@ -750,11 +731,7 @@ export async function executeSelfHostedChatRequest( if (formattedContent) { content = stripJsonFences(formattedContent) } - if (finalResponse.usage) { - tokens.input += finalResponse.usage.prompt_tokens || 0 - tokens.output += finalResponse.usage.completion_tokens || 0 - tokens.total += finalResponse.usage.total_tokens || 0 - } + usageMeter.record(finalResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -802,11 +779,7 @@ export async function executeSelfHostedChatRequest( if (content && request.responseFormat) { content = stripJsonFences(content) } - if (synthesisResponse.usage) { - tokens.input += synthesisResponse.usage.prompt_tokens || 0 - tokens.output += synthesisResponse.usage.completion_tokens || 0 - tokens.total += synthesisResponse.usage.total_tokens || 0 - } + usageMeter.record(synthesisResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -819,8 +792,7 @@ export async function executeSelfHostedChatRequest( if (request.stream) { logger.info('Projecting settled response after tool processing') - const accumulatedCost = calculateCost(request.model, tokens.input, tokens.output) - const toolCost = sumToolCosts(toolResults) + const accumulatedCost = usageMeter.cost(sumToolCosts(toolResults)) return createStreamingExecution({ model: request.model, @@ -834,17 +806,8 @@ export async function executeSelfHostedChatRequest( iterations: timeSegments.filter((segment) => segment.type === 'model').length, timeSegments, }, - initialTokens: { - input: tokens.input, - output: tokens.output, - total: tokens.total, - }, - initialCost: { - input: accumulatedCost.input, - output: accumulatedCost.output, - toolCost: toolCost || undefined, - total: accumulatedCost.total + toolCost, - }, + initialTokens: { ...usageMeter.tokens }, + initialCost: accumulatedCost, toolCalls: toolCalls.length > 0 ? { list: toolCalls, count: toolCalls.length } : undefined, isStreaming: true, streamFormat: 'agent-events-v1', @@ -863,7 +826,8 @@ export async function executeSelfHostedChatRequest( return { content, model: request.model, - tokens, + tokens: { ...usageMeter.tokens }, + cost: usageMeter.cost(), toolCalls: toolCalls.length > 0 ? toolCalls : undefined, toolResults: toolResults.length > 0 ? toolResults : undefined, timing: { diff --git a/apps/sim/providers/openrouter/index.test.ts b/apps/sim/providers/openrouter/index.test.ts index 3d992e5c3cd..d79c8d7264e 100644 --- a/apps/sim/providers/openrouter/index.test.ts +++ b/apps/sim/providers/openrouter/index.test.ts @@ -223,7 +223,7 @@ describe('openRouterProvider.executeRequest', () => { expect(res.content).toBe('Hi there') expect(res.model).toBe('anthropic/claude-3.5-sonnet') - expect(res.tokens).toEqual({ input: 10, output: 5, total: 15 }) + expect(res.tokens).toEqual({ input: 10, output: 5, cacheRead: 0, total: 15 }) const payload = mockCreate.mock.calls[0][0] expect(payload.model).toBe('anthropic/claude-3.5-sonnet') @@ -269,7 +269,7 @@ describe('openRouterProvider.executeRequest', () => { success: true, }) expect(res.toolResults).toEqual([{ temp: 70 }]) - expect(res.tokens).toEqual({ input: 28, output: 10, total: 38 }) + expect(res.tokens).toEqual({ input: 28, output: 10, cacheRead: 0, total: 38 }) const secondMessages = mockCreate.mock.calls[1][0].messages const assistant = secondMessages.find((m: { role: string }) => m.role === 'assistant') diff --git a/apps/sim/providers/sakana/index.ts b/apps/sim/providers/sakana/index.ts index 91d8155e891..0d3f38a7fca 100644 --- a/apps/sim/providers/sakana/index.ts +++ b/apps/sim/providers/sakana/index.ts @@ -19,6 +19,7 @@ import { getProviderDefaultModel, getProviderModels } from '@/providers/models' import { createOpenAICompatAssistantHistory } from '@/providers/openai-compat/assistant-history' import { getChatCompletionConversationUsage } from '@/providers/openai-compat/conversation-usage' import { createOpenAICompatibleAgentEventStream } from '@/providers/openai-compat/stream-events' +import { createChatCompletionUsageMeter } from '@/providers/openai-compat/usage-meter' import { buildJsonSchemaResponseFormat } from '@/providers/response-format' import { executeProviderTool } from '@/providers/runtime-context' import { createSettledAgentEventStream } from '@/providers/stream-events' @@ -39,7 +40,6 @@ import type { } from '@/providers/types' import { ProviderError } from '@/providers/types' import { - calculateCost, isFunctionToolCall, prepareToolExecution, prepareToolsWithUsageControl, @@ -178,22 +178,10 @@ export const sakanaProvider: ProviderConfig = { request, onComplete: ({ content, usage }) => { output.content = content - output.tokens = { - input: usage.prompt_tokens, - output: usage.completion_tokens, - total: usage.total_tokens, - } - - const costResult = calculateCost( - request.model, - usage.prompt_tokens, - usage.completion_tokens - ) - output.cost = { - input: costResult.input, - output: costResult.output, - total: costResult.total, - } + const streamUsage = createChatCompletionUsageMeter(request.model) + streamUsage.record(usage) + output.tokens = { ...streamUsage.tokens } + output.cost = streamUsage.cost() }, } ), @@ -223,11 +211,8 @@ export const sakanaProvider: ProviderConfig = { let content = currentResponse.choices[0]?.message?.content || '' - const tokens = { - input: currentResponse.usage?.prompt_tokens || 0, - output: currentResponse.usage?.completion_tokens || 0, - total: currentResponse.usage?.total_tokens || 0, - } + const usageMeter = createChatCompletionUsageMeter(request.model) + usageMeter.record(currentResponse.usage) const toolCalls = [] const toolResults: Record[] = [] const currentMessages = [...formattedMessages] @@ -516,11 +501,7 @@ export const sakanaProvider: ProviderConfig = { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) iterationCount++ } @@ -575,11 +556,7 @@ export const sakanaProvider: ProviderConfig = { if (currentResponse.choices[0]?.message?.content) { content = currentResponse.choices[0].message.content } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -639,11 +616,7 @@ export const sakanaProvider: ProviderConfig = { content = formattedContent } - if (currentResponse.usage) { - tokens.input += currentResponse.usage.prompt_tokens || 0 - tokens.output += currentResponse.usage.completion_tokens || 0 - tokens.total += currentResponse.usage.total_tokens || 0 - } + usageMeter.record(currentResponse.usage) enrichLastModelSegmentFromChatCompletions( timeSegments, @@ -654,8 +627,7 @@ export const sakanaProvider: ProviderConfig = { } if (request.stream) { - const accumulatedCost = calculateCost(request.model, tokens.input, tokens.output) - const toolCost = sumToolCosts(toolResults) + const accumulatedCost = usageMeter.cost(sumToolCosts(toolResults)) const streamingResult = createStreamingExecution({ model: request.model, @@ -669,17 +641,8 @@ export const sakanaProvider: ProviderConfig = { iterations: timeSegments.filter((segment) => segment.type === 'model').length, timeSegments, }, - initialTokens: { - input: tokens.input, - output: tokens.output, - total: tokens.total, - }, - initialCost: { - input: accumulatedCost.input, - output: accumulatedCost.output, - toolCost: toolCost || undefined, - total: accumulatedCost.total + toolCost, - }, + initialTokens: { ...usageMeter.tokens }, + initialCost: accumulatedCost, toolCalls: toolCalls.length > 0 ? { @@ -706,7 +669,8 @@ export const sakanaProvider: ProviderConfig = { return { content, model: request.model, - tokens, + tokens: { ...usageMeter.tokens }, + cost: usageMeter.cost(), toolCalls: toolCalls.length > 0 ? toolCalls : undefined, toolResults: toolResults.length > 0 ? toolResults : undefined, timing: { diff --git a/apps/sim/providers/settled-tool-streams.test.ts b/apps/sim/providers/settled-tool-streams.test.ts index a79cbae4f6f..7dbe29a708e 100644 --- a/apps/sim/providers/settled-tool-streams.test.ts +++ b/apps/sim/providers/settled-tool-streams.test.ts @@ -236,14 +236,8 @@ const STRUCTURED_OUTPUT_PROVIDERS = [ }, ] as const -/** - * The mocked model cost of a three-call settled run: Z.ai meters each call (cache-aware), the other - * providers here price the summed usage once. Tool cost is the mocked 4 either way. - */ -function settledRunCost(provider: ProviderConfig) { - const pricedCalls = provider === zaiProvider ? 3 : 1 - return { input: pricedCalls, output: 2 * pricedCalls, toolCost: 4, total: 3 * pricedCalls + 4 } -} +/** Mocked cost of a three-call settled run: each call is priced at the mocked 1/2, plus tool cost 4. */ +const SETTLED_RUN_COST = { input: 3, output: 6, toolCost: 4, total: 13 } function toolCall(id: string, argumentsJson = '{}'): ToolCall { return { @@ -409,7 +403,7 @@ describe('settled provider tool streams', () => { expect(result.execution.output).toMatchObject({ content: '{"value":"found"}', tokens: { input: 15, output: 9, total: 24 }, - cost: settledRunCost(provider), + cost: SETTLED_RUN_COST, toolCalls: { count: 1 }, }) expectModelIterations(result, 3) @@ -436,7 +430,7 @@ describe('settled provider tool streams', () => { expect(result.execution.output).toMatchObject({ content: '{"value":"capped"}', tokens: { input: 15, output: 9, total: 24 }, - cost: settledRunCost(provider), + cost: SETTLED_RUN_COST, }) expectModelIterations(result, 3) } diff --git a/apps/sim/providers/vllm/index.test.ts b/apps/sim/providers/vllm/index.test.ts index 7547e754cd3..8fa600a959c 100644 --- a/apps/sim/providers/vllm/index.test.ts +++ b/apps/sim/providers/vllm/index.test.ts @@ -291,7 +291,7 @@ describe('vllmProvider', () => { 'user', ]) expect(result.content).toBe('hello') - expect(result.tokens).toEqual({ input: 10, output: 5, total: 15 }) + expect(result.tokens).toEqual({ input: 10, output: 5, cacheRead: 0, total: 15 }) }) it('sends response_format as json_schema with strict when a responseFormat is provided', async () => { @@ -472,7 +472,12 @@ describe('vllmProvider', () => { expect('stream' in result).toBe(true) if (!('stream' in result)) throw new Error('Expected streaming execution') expect(result.execution.output.content).toBe('answer') - expect(result.execution.output.tokens).toEqual({ input: 20, output: 10, total: 30 }) + expect(result.execution.output.tokens).toEqual({ + input: 20, + output: 10, + cacheRead: 0, + total: 30, + }) expect(result.execution.output.providerTiming?.iterations).toBe(2) expect( result.execution.output.providerTiming?.timeSegments?.filter(