ai 6.0.0-beta.137 → 6.0.0-beta.139

package/dist/index.mjs

@@ -495,12 +495,65 @@ function asLanguageModelV3(model) {
   });
   return new Proxy(model, {
     get(target, prop) {
-      if (prop === "specificationVersion")
-        return "v3";
-      return target[prop];
+      switch (prop) {
+        case "specificationVersion":
+          return "v3";
+        case "doGenerate":
+          return async (...args) => {
+            const result = await target.doGenerate(...args);
+            return {
+              ...result,
+              usage: convertV2UsageToV3(result.usage)
+            };
+          };
+        case "doStream":
+          return async (...args) => {
+            const result = await target.doStream(...args);
+            return {
+              ...result,
+              stream: convertV2StreamToV3(result.stream)
+            };
+          };
+        default:
+          return target[prop];
+      }
     }
   });
 }
+function convertV2StreamToV3(stream) {
+  return stream.pipeThrough(
+    new TransformStream({
+      transform(chunk, controller) {
+        switch (chunk.type) {
+          case "finish":
+            controller.enqueue({
+              ...chunk,
+              usage: convertV2UsageToV3(chunk.usage)
+            });
+            break;
+          default:
+            controller.enqueue(chunk);
+            break;
+        }
+      }
+    })
+  );
+}
+function convertV2UsageToV3(usage) {
+  return {
+    inputTokens: {
+      total: usage.inputTokens,
+      noCache: void 0,
+      cacheRead: usage.cachedInputTokens,
+      cacheWrite: void 0
+    },
+    outputTokens: {
+      total: usage.outputTokens,
+      text: void 0,
+      reasoning: usage.reasoningTokens
+    }
+  };
+}
 
 // src/model/as-speech-model-v3.ts
 function asSpeechModelV3(model) {
@@ -813,7 +866,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.0-beta.137" : "0.0.0-test";
+var VERSION = true ? "6.0.0-beta.139" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -1910,10 +1963,74 @@ function stringifyForTelemetry(prompt) {
 }
 
 // src/types/usage.ts
+function asLanguageModelUsage(usage) {
+  return {
+    inputTokens: usage.inputTokens.total,
+    inputTokenDetails: {
+      noCacheTokens: usage.inputTokens.noCache,
+      cacheReadTokens: usage.inputTokens.cacheRead,
+      cacheWriteTokens: usage.inputTokens.cacheWrite
+    },
+    outputTokens: usage.outputTokens.total,
+    outputTokenDetails: {
+      textTokens: usage.outputTokens.text,
+      reasoningTokens: usage.outputTokens.reasoning
+    },
+    totalTokens: addTokenCounts(
+      usage.inputTokens.total,
+      usage.outputTokens.total
+    ),
+    raw: usage.raw,
+    reasoningTokens: usage.outputTokens.reasoning,
+    cachedInputTokens: usage.inputTokens.cacheRead
+  };
+}
+function createNullLanguageModelUsage() {
+  return {
+    inputTokens: void 0,
+    inputTokenDetails: {
+      noCacheTokens: void 0,
+      cacheReadTokens: void 0,
+      cacheWriteTokens: void 0
+    },
+    outputTokens: void 0,
+    outputTokenDetails: {
+      textTokens: void 0,
+      reasoningTokens: void 0
+    },
+    totalTokens: void 0,
+    raw: void 0
+  };
+}
 function addLanguageModelUsage(usage1, usage2) {
+  var _a15, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   return {
     inputTokens: addTokenCounts(usage1.inputTokens, usage2.inputTokens),
+    inputTokenDetails: {
+      noCacheTokens: addTokenCounts(
+        (_a15 = usage1.inputTokenDetails) == null ? void 0 : _a15.noCacheTokens,
+        (_b = usage2.inputTokenDetails) == null ? void 0 : _b.noCacheTokens
+      ),
+      cacheReadTokens: addTokenCounts(
+        (_c = usage1.inputTokenDetails) == null ? void 0 : _c.cacheReadTokens,
+        (_d = usage2.inputTokenDetails) == null ? void 0 : _d.cacheReadTokens
+      ),
+      cacheWriteTokens: addTokenCounts(
+        (_e = usage1.inputTokenDetails) == null ? void 0 : _e.cacheWriteTokens,
+        (_f = usage2.inputTokenDetails) == null ? void 0 : _f.cacheWriteTokens
+      )
+    },
     outputTokens: addTokenCounts(usage1.outputTokens, usage2.outputTokens),
+    outputTokenDetails: {
+      textTokens: addTokenCounts(
+        (_g = usage1.outputTokenDetails) == null ? void 0 : _g.textTokens,
+        (_h = usage2.outputTokenDetails) == null ? void 0 : _h.textTokens
+      ),
+      reasoningTokens: addTokenCounts(
+        (_i = usage1.outputTokenDetails) == null ? void 0 : _i.reasoningTokens,
+        (_j = usage2.outputTokenDetails) == null ? void 0 : _j.reasoningTokens
+      )
+    },
     totalTokens: addTokenCounts(usage1.totalTokens, usage2.totalTokens),
     reasoningTokens: addTokenCounts(
       usage1.reasoningTokens,
@@ -3456,14 +3573,14 @@ async function generateText({
                           result.providerMetadata
                         ),
                         // TODO rename telemetry attributes to inputTokens and outputTokens
-                        "ai.usage.promptTokens": result.usage.inputTokens,
-                        "ai.usage.completionTokens": result.usage.outputTokens,
+                        "ai.usage.promptTokens": result.usage.inputTokens.total,
+                        "ai.usage.completionTokens": result.usage.outputTokens.total,
                         // standardized gen-ai llm span attributes:
                         "gen_ai.response.finish_reasons": [result.finishReason],
                         "gen_ai.response.id": responseData.id,
                         "gen_ai.response.model": responseData.modelId,
-                        "gen_ai.usage.input_tokens": result.usage.inputTokens,
-                        "gen_ai.usage.output_tokens": result.usage.outputTokens
+                        "gen_ai.usage.input_tokens": result.usage.inputTokens.total,
+                        "gen_ai.usage.output_tokens": result.usage.outputTokens.total
                       }
                     })
                   );
@@ -3563,7 +3680,7 @@ async function generateText({
           const currentStepResult = new DefaultStepResult({
             content: stepContent,
             finishReason: currentModelResponse.finishReason,
-            usage: currentModelResponse.usage,
+            usage: asLanguageModelUsage(currentModelResponse.usage),
             warnings: currentModelResponse.warnings,
             providerMetadata: currentModelResponse.providerMetadata,
             request: (_f = currentModelResponse.request) != null ? _f : {},
@@ -3604,8 +3721,8 @@ async function generateText({
                 currentModelResponse.providerMetadata
               ),
               // TODO rename telemetry attributes to inputTokens and outputTokens
-              "ai.usage.promptTokens": currentModelResponse.usage.inputTokens,
-              "ai.usage.completionTokens": currentModelResponse.usage.outputTokens
+              "ai.usage.promptTokens": currentModelResponse.usage.inputTokens.total,
+              "ai.usage.completionTokens": currentModelResponse.usage.outputTokens.total
             }
           })
         );
@@ -5051,7 +5168,7 @@ function runToolsTransformation({
           finishChunk = {
             type: "finish",
             finishReason: chunk.finishReason,
-            usage: chunk.usage,
+            usage: asLanguageModelUsage(chunk.usage),
             providerMetadata: chunk.providerMetadata
           };
           break;
@@ -5534,11 +5651,7 @@ var DefaultStreamTextResult = class {
             return;
           }
           const finishReason = recordedFinishReason != null ? recordedFinishReason : "unknown";
-          const totalUsage = recordedTotalUsage != null ? recordedTotalUsage : {
-            inputTokens: void 0,
-            outputTokens: void 0,
-            totalTokens: void 0
-          };
+          const totalUsage = recordedTotalUsage != null ? recordedTotalUsage : createNullLanguageModelUsage();
           self._finishReason.resolve(finishReason);
           self._totalUsage.resolve(totalUsage);
           self._steps.resolve(recordedSteps);
@@ -5859,11 +5972,7 @@ var DefaultStreamTextResult = class {
           let warnings;
           const activeToolCallToolNames = {};
           let stepFinishReason = "unknown";
-          let stepUsage = {
-            inputTokens: void 0,
-            outputTokens: void 0,
-            totalTokens: void 0
-          };
+          let stepUsage = createNullLanguageModelUsage();
           let stepProviderMetadata;
           let stepFirstChunk = true;
           let stepResponse = {
@@ -6129,11 +6238,7 @@ var DefaultStreamTextResult = class {
         await streamStep({
           currentStep: 0,
           responseMessages: initialResponseMessages,
-          usage: {
-            inputTokens: void 0,
-            outputTokens: void 0,
-            totalTokens: void 0
-          }
+          usage: createNullLanguageModelUsage()
         });
       }
     }).catch((error) => {
@@ -8607,7 +8712,7 @@ async function generateObject(options) {
                 throw new NoObjectGeneratedError({
                   message: "No object generated: the model did not return a response.",
                   response: responseData,
-                  usage: result2.usage,
+                  usage: asLanguageModelUsage(result2.usage),
                   finishReason: result2.finishReason
                 });
               }
@@ -8624,14 +8729,14 @@ async function generateObject(options) {
                       result2.providerMetadata
                     ),
                     // TODO rename telemetry attributes to inputTokens and outputTokens
-                    "ai.usage.promptTokens": result2.usage.inputTokens,
-                    "ai.usage.completionTokens": result2.usage.outputTokens,
+                    "ai.usage.promptTokens": result2.usage.inputTokens.total,
+                    "ai.usage.completionTokens": result2.usage.outputTokens.total,
                     // standardized gen-ai llm span attributes:
                     "gen_ai.response.finish_reasons": [result2.finishReason],
                     "gen_ai.response.id": responseData.id,
                     "gen_ai.response.model": responseData.modelId,
-                    "gen_ai.usage.input_tokens": result2.usage.inputTokens,
-                    "gen_ai.usage.output_tokens": result2.usage.outputTokens
+                    "gen_ai.usage.input_tokens": result2.usage.inputTokens.total,
+                    "gen_ai.usage.output_tokens": result2.usage.outputTokens.total
                   }
                 })
               );
@@ -8646,7 +8751,7 @@ async function generateObject(options) {
         );
         result = generateResult.objectText;
         finishReason = generateResult.finishReason;
-        usage = generateResult.usage;
+        usage = asLanguageModelUsage(generateResult.usage);
         warnings = generateResult.warnings;
         resultProviderMetadata = generateResult.providerMetadata;
         request = (_a15 = generateResult.request) != null ? _a15 : {};
@@ -9083,11 +9188,7 @@ var DefaultStreamObjectResult = class {
         );
         self._request.resolve(request != null ? request : {});
         let warnings;
-        let usage = {
-          inputTokens: void 0,
-          outputTokens: void 0,
-          totalTokens: void 0
-        };
+        let usage = createNullLanguageModelUsage();
         let finishReason;
         let providerMetadata;
         let object2;
@@ -9167,7 +9268,7 @@ var DefaultStreamObjectResult = class {
                     controller.enqueue({ type: "text-delta", textDelta });
                   }
                   finishReason = chunk.finishReason;
-                  usage = chunk.usage;
+                  usage = asLanguageModelUsage(chunk.usage);
                   providerMetadata = chunk.providerMetadata;
                   controller.enqueue({
                     ...chunk,