@ai-sdk/google 3.0.0-beta.67 → 3.0.0-beta.68

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @ai-sdk/google
 
+## 3.0.0-beta.68
+
+### Patch Changes
+
+- 3bd2689: feat: extended token usage
+- Updated dependencies [3bd2689]
+  - @ai-sdk/provider@3.0.0-beta.26
+  - @ai-sdk/provider-utils@4.0.0-beta.45
+
 ## 3.0.0-beta.67
 
 ### Patch Changes

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(src_exports);
 var import_provider_utils13 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.0-beta.67" : "0.0.0-test";
+var VERSION = true ? "3.0.0-beta.68" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -207,6 +207,45 @@ var googleGenerativeAISingleEmbeddingResponseSchema = (0, import_provider_utils3
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
 var import_v45 = require("zod/v4");
 
+// src/convert-google-generative-ai-usage.ts
+function convertGoogleGenerativeAIUsage(usage) {
+  var _a, _b, _c, _d;
+  if (usage == null) {
+    return {
+      inputTokens: {
+        total: void 0,
+        noCache: void 0,
+        cacheRead: void 0,
+        cacheWrite: void 0
+      },
+      outputTokens: {
+        total: void 0,
+        text: void 0,
+        reasoning: void 0
+      },
+      raw: void 0
+    };
+  }
+  const promptTokens = (_a = usage.promptTokenCount) != null ? _a : 0;
+  const candidatesTokens = (_b = usage.candidatesTokenCount) != null ? _b : 0;
+  const cachedContentTokens = (_c = usage.cachedContentTokenCount) != null ? _c : 0;
+  const thoughtsTokens = (_d = usage.thoughtsTokenCount) != null ? _d : 0;
+  return {
+    inputTokens: {
+      total: promptTokens,
+      noCache: promptTokens - cachedContentTokens,
+      cacheRead: cachedContentTokens,
+      cacheWrite: void 0
+    },
+    outputTokens: {
+      total: candidatesTokens + thoughtsTokens,
+      text: candidatesTokens,
+      reasoning: thoughtsTokens
+    },
+    raw: usage
+  };
+}
+
 // src/convert-json-schema-to-openapi-schema.ts
 function convertJSONSchemaToOpenAPISchema(jsonSchema) {
   if (jsonSchema == null || isEmptyObjectSchema(jsonSchema)) {
@@ -893,7 +932,7 @@ var GoogleGenerativeAILanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const { args, warnings } = await this.getArgs(options);
     const body = JSON.stringify(args);
     const mergedHeaders = (0, import_provider_utils6.combineHeaders)(
@@ -979,20 +1018,14 @@ var GoogleGenerativeAILanguageModel = class {
         finishReason: candidate.finishReason,
         hasToolCalls: content.some((part) => part.type === "tool-call")
       }),
-      usage: {
-        inputTokens: (_e = usageMetadata == null ? void 0 : usageMetadata.promptTokenCount) != null ? _e : void 0,
-        outputTokens: (_f = usageMetadata == null ? void 0 : usageMetadata.candidatesTokenCount) != null ? _f : void 0,
-        totalTokens: (_g = usageMetadata == null ? void 0 : usageMetadata.totalTokenCount) != null ? _g : void 0,
-        reasoningTokens: (_h = usageMetadata == null ? void 0 : usageMetadata.thoughtsTokenCount) != null ? _h : void 0,
-        cachedInputTokens: (_i = usageMetadata == null ? void 0 : usageMetadata.cachedContentTokenCount) != null ? _i : void 0
-      },
+      usage: convertGoogleGenerativeAIUsage(usageMetadata),
       warnings,
       providerMetadata: {
         google: {
-          promptFeedback: (_j = response.promptFeedback) != null ? _j : null,
-          groundingMetadata: (_k = candidate.groundingMetadata) != null ? _k : null,
-          urlContextMetadata: (_l = candidate.urlContextMetadata) != null ? _l : null,
-          safetyRatings: (_m = candidate.safetyRatings) != null ? _m : null,
+          promptFeedback: (_e = response.promptFeedback) != null ? _e : null,
+          groundingMetadata: (_f = candidate.groundingMetadata) != null ? _f : null,
+          urlContextMetadata: (_g = candidate.urlContextMetadata) != null ? _g : null,
+          safetyRatings: (_h = candidate.safetyRatings) != null ? _h : null,
           usageMetadata: usageMetadata != null ? usageMetadata : null
         }
       },
@@ -1023,11 +1056,7 @@ var GoogleGenerativeAILanguageModel = class {
       fetch: this.config.fetch
     });
     let finishReason = "unknown";
-    const usage = {
-      inputTokens: void 0,
-      outputTokens: void 0,
-      totalTokens: void 0
-    };
+    let usage = void 0;
     let providerMetadata = void 0;
     const generateId3 = this.config.generateId;
     let hasToolCalls = false;
@@ -1043,7 +1072,7 @@ var GoogleGenerativeAILanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -1054,13 +1083,9 @@ var GoogleGenerativeAILanguageModel = class {
             const value = chunk.value;
             const usageMetadata = value.usageMetadata;
             if (usageMetadata != null) {
-              usage.inputTokens = (_a = usageMetadata.promptTokenCount) != null ? _a : void 0;
-              usage.outputTokens = (_b = usageMetadata.candidatesTokenCount) != null ? _b : void 0;
-              usage.totalTokens = (_c = usageMetadata.totalTokenCount) != null ? _c : void 0;
-              usage.reasoningTokens = (_d = usageMetadata.thoughtsTokenCount) != null ? _d : void 0;
-              usage.cachedInputTokens = (_e = usageMetadata.cachedContentTokenCount) != null ? _e : void 0;
+              usage = usageMetadata;
             }
-            const candidate = (_f = value.candidates) == null ? void 0 : _f[0];
+            const candidate = (_a = value.candidates) == null ? void 0 : _a[0];
             if (candidate == null) {
               return;
             }
@@ -1078,9 +1103,9 @@ var GoogleGenerativeAILanguageModel = class {
               }
             }
             if (content != null) {
-              const parts = (_g = content.parts) != null ? _g : [];
+              const parts = (_b = content.parts) != null ? _b : [];
               for (const part of parts) {
-                if ("executableCode" in part && ((_h = part.executableCode) == null ? void 0 : _h.code)) {
+                if ("executableCode" in part && ((_c = part.executableCode) == null ? void 0 : _c.code)) {
                   const toolCallId = generateId3();
                   lastCodeExecutionToolCallId = toolCallId;
                   controller.enqueue({
@@ -1212,10 +1237,10 @@ var GoogleGenerativeAILanguageModel = class {
               });
               providerMetadata = {
                 google: {
-                  promptFeedback: (_i = value.promptFeedback) != null ? _i : null,
-                  groundingMetadata: (_j = candidate.groundingMetadata) != null ? _j : null,
-                  urlContextMetadata: (_k = candidate.urlContextMetadata) != null ? _k : null,
-                  safetyRatings: (_l = candidate.safetyRatings) != null ? _l : null
+                  promptFeedback: (_d = value.promptFeedback) != null ? _d : null,
+                  groundingMetadata: (_e = candidate.groundingMetadata) != null ? _e : null,
+                  urlContextMetadata: (_f = candidate.urlContextMetadata) != null ? _f : null,
+                  safetyRatings: (_g = candidate.safetyRatings) != null ? _g : null
                 }
               };
               if (usageMetadata != null) {
@@ -1239,7 +1264,7 @@ var GoogleGenerativeAILanguageModel = class {
             controller.enqueue({
               type: "finish",
               finishReason,
-              usage,
+              usage: convertGoogleGenerativeAIUsage(usage),
               providerMetadata
             });
           }