@wix/evalforge-evaluator 0.207.0 → 0.209.0

package/build/index.js

@@ -10966,7 +10966,14 @@ function calculateFromPricing(modelId, tokenUsage) {
   return tokenUsage.prompt / 1e6 * pricing.input + tokenUsage.completion / 1e6 * pricing.output;
 }
 function calculateStepCost(step, modelId, provider, tokenUsage) {
-  return extractGatewayCost(step, provider) ?? calculateFromPricing(modelId, tokenUsage);
+  const gatewayCost = extractGatewayCost(step, provider);
+  if (gatewayCost !== void 0) {
+    return gatewayCost;
+  }
+  console.warn(
+    `[cost-calculation] gateway cost missing; using list-price fallback (provider=${provider}, model=${modelId}, promptTokens=${tokenUsage.prompt}, completionTokens=${tokenUsage.completion})`
+  );
+  return calculateFromPricing(modelId, tokenUsage);
 }
 
 // src/run-scenario/agents/simple-agent/build-conversation.ts
@@ -11246,13 +11253,13 @@ async function executeWithAiSdk(context) {
       [text, steps, rawUsage] = await Promise.all([
         stream.text,
         stream.steps,
-        stream.usage
+        stream.totalUsage
       ]);
     } else {
       const result = await (0, import_ai.generateText)(sdkParams);
       text = result.text;
       steps = result.steps;
-      rawUsage = result.usage;
+      rawUsage = result.totalUsage;
     }
     const durationMs = Date.now() - startTime;
     const usage = {
@@ -11263,7 +11270,6 @@ async function executeWithAiSdk(context) {
     const llmTrace = buildLLMTrace2(
       steps,
       durationMs,
-      usage,
       modelId,
       provider,
       startTime,
@@ -11412,7 +11418,7 @@ function findToolResultError(step) {
   }
   return null;
 }
-function buildLLMTrace2(steps, totalDurationMs, totalUsage, modelId, provider, executionStartMs, stepTimestamps) {
+function buildLLMTrace2(steps, totalDurationMs, modelId, provider, executionStartMs, stepTimestamps) {
   const traceSteps = steps.map((step, i) => {
     const stepFinishedAt = stepTimestamps[i] ?? executionStartMs;
     const stepStartedAt = i === 0 ? executionStartMs : stepTimestamps[i - 1] ?? executionStartMs;
@@ -11444,11 +11450,14 @@ function buildLLMTrace2(steps, totalDurationMs, totalUsage, modelId, provider, e
     };
   });
   const totalCostUsd = traceSteps.reduce((sum, s) => sum + s.costUsd, 0);
-  const finalTokens = {
-    prompt: totalUsage.inputTokens,
-    completion: totalUsage.outputTokens,
-    total: totalUsage.totalTokens
-  };
+  const finalTokens = traceSteps.reduce(
+    (acc, s) => ({
+      prompt: acc.prompt + s.tokenUsage.prompt,
+      completion: acc.completion + s.tokenUsage.completion,
+      total: acc.total + s.tokenUsage.total
+    }),
+    { prompt: 0, completion: 0, total: 0 }
+  );
   return {
     id: (0, import_crypto4.randomUUID)(),
     steps: traceSteps,