@ai-sdk/google 2.0.71 → 2.0.73

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @ai-sdk/google
 
+## 2.0.73
+
+### Patch Changes
+
+- f081ba8: fix(provider/google): support `functionCall.id` when returned by Gemini API and provide matching `functionResponse.id`
+
+## 2.0.72
+
+### Patch Changes
+
+- 783fa6c: chore: ensure consistent import handling and avoid import duplicates or cycles
+- Updated dependencies [783fa6c]
+  - @ai-sdk/provider-utils@3.0.25
+  - @ai-sdk/provider@2.0.3
+
 ## 2.0.71
 
 ### Patch Changes

package/dist/index.d.mts

@@ -50,6 +50,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
                 functionCall: {
                     name: string;
                     args: unknown;
+                    id?: string | null | undefined;
                 };
                 thoughtSignature?: string | null | undefined;
             } | {

package/dist/index.d.ts

@@ -50,6 +50,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
                 functionCall: {
                     name: string;
                     args: unknown;
+                    id?: string | null | undefined;
                 };
                 thoughtSignature?: string | null | undefined;
             } | {

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(index_exports);
 var import_provider_utils15 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "2.0.71" : "0.0.0-test";
+var VERSION = true ? "2.0.73" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -450,6 +450,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
               case "tool-call": {
                 return {
                   functionCall: {
+                    ...part.toolCallId != null ? { id: part.toolCallId } : {},
                     name: part.toolName,
                     args: part.input
                   },
@@ -475,6 +476,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
           } else {
             parts.push({
               functionResponse: {
+                ...part.toolCallId != null ? { id: part.toolCallId } : {},
                 name: part.toolName,
                 response: {
                   name: part.toolName,
@@ -526,6 +528,7 @@ function appendToolResultParts({
   const responseText = responseTextParts.length > 0 ? responseTextParts.join("\n") : "Tool executed successfully.";
   parts.push({
     functionResponse: {
+      ...part.toolCallId != null ? { id: part.toolCallId } : {},
       name: part.toolName,
       response: {
         name: part.toolName,
@@ -545,6 +548,7 @@ function appendLegacyToolResultParts({
       case "text":
         parts.push({
           functionResponse: {
+            ...part.toolCallId != null ? { id: part.toolCallId } : {},
             name: part.toolName,
             response: {
               name: part.toolName,
@@ -1059,7 +1063,7 @@ var GoogleGenerativeAILanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     const { args, warnings } = await this.getArgs(options);
     const body = JSON.stringify(args);
     const mergedHeaders = (0, import_provider_utils6.combineHeaders)(
@@ -1129,7 +1133,7 @@ var GoogleGenerativeAILanguageModel = class {
       } else if ("functionCall" in part) {
         content.push({
           type: "tool-call",
-          toolCallId: this.config.generateId(),
+          toolCallId: (_d = part.functionCall.id) != null ? _d : this.config.generateId(),
           toolName: part.functionCall.name,
           input: JSON.stringify(part.functionCall.args),
           providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
@@ -1142,10 +1146,10 @@ var GoogleGenerativeAILanguageModel = class {
         });
       }
     }
-    const sources = (_d = extractSources({
+    const sources = (_e = extractSources({
       groundingMetadata: candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _d : [];
+    })) != null ? _e : [];
     for (const source of sources) {
       content.push(source);
     }
@@ -1156,20 +1160,20 @@ var GoogleGenerativeAILanguageModel = class {
         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
+        inputTokens: (_f = usageMetadata == null ? void 0 : usageMetadata.promptTokenCount) != null ? _f : void 0,
+        outputTokens: (_g = usageMetadata == null ? void 0 : usageMetadata.candidatesTokenCount) != null ? _g : void 0,
+        totalTokens: (_h = usageMetadata == null ? void 0 : usageMetadata.totalTokenCount) != null ? _h : void 0,
+        reasoningTokens: (_i = usageMetadata == null ? void 0 : usageMetadata.thoughtsTokenCount) != null ? _i : void 0,
+        cachedInputTokens: (_j = usageMetadata == null ? void 0 : usageMetadata.cachedContentTokenCount) != null ? _j : void 0
       },
       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,
-          serviceTier: (_n = response.serviceTier) != null ? _n : null
+          promptFeedback: (_k = response.promptFeedback) != null ? _k : null,
+          groundingMetadata: (_l = candidate.groundingMetadata) != null ? _l : null,
+          urlContextMetadata: (_m = candidate.urlContextMetadata) != null ? _m : null,
+          safetyRatings: (_n = candidate.safetyRatings) != null ? _n : null,
+          serviceTier: (_o = response.serviceTier) != null ? _o : null
         }
       },
       request: { body },
@@ -1449,13 +1453,16 @@ function getToolCallsFromParts({
   const functionCallParts = parts == null ? void 0 : parts.filter(
     (part) => "functionCall" in part
   );
-  return functionCallParts == null || functionCallParts.length === 0 ? void 0 : functionCallParts.map((part) => ({
-    type: "tool-call",
-    toolCallId: generateId3(),
-    toolName: part.functionCall.name,
-    args: JSON.stringify(part.functionCall.args),
-    providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
-  }));
+  return functionCallParts == null || functionCallParts.length === 0 ? void 0 : functionCallParts.map((part) => {
+    var _a;
+    return {
+      type: "tool-call",
+      toolCallId: (_a = part.functionCall.id) != null ? _a : generateId3(),
+      toolName: part.functionCall.name,
+      args: JSON.stringify(part.functionCall.args),
+      providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
+    };
+  });
 }
 function extractSources({
   groundingMetadata,
@@ -1606,6 +1613,7 @@ var getContentSchema = () => import_v45.z.object({
       // note: order matters since text can be fully empty
       import_v45.z.object({
         functionCall: import_v45.z.object({
+          id: import_v45.z.string().nullish(),
           name: import_v45.z.string(),
           args: import_v45.z.unknown()
         }),