@ai-sdk/google 4.0.0-canary.62 → 4.0.0-canary.64

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ai-sdk/google
 
+## 4.0.0-canary.64
+
+### Patch Changes
+
+- 41da50c: fix(provider/google): support `functionCall.id` when returned by Gemini API and provide matching `functionResponse.id`
+
+## 4.0.0-canary.63
+
+### Patch Changes
+
+- Updated dependencies [28dfa06]
+- Updated dependencies [e93fa91]
+  - @ai-sdk/provider-utils@5.0.0-canary.41
+
 ## 4.0.0-canary.62
 
 ### Patch Changes

package/dist/index.d.ts

@@ -49,6 +49,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
         content?: Record<string, never> | {
             parts?: ({
                 functionCall: {
+                    id?: string | null | undefined;
                     name?: string | null | undefined;
                     args?: unknown;
                     partialArgs?: {

package/dist/index.js

@@ -7,7 +7,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "4.0.0-canary.62" : "0.0.0-test";
+var VERSION = true ? "4.0.0-canary.64" : "0.0.0-test";
 
 // src/google-embedding-model.ts
 import {
@@ -459,7 +459,7 @@ function convertUrlToolResultPart(url) {
     }
   };
 }
-function appendToolResultParts(parts, toolName, outputValue) {
+function appendToolResultParts(parts, toolName, outputValue, toolCallId) {
   const functionResponseParts = [];
   const responseTextParts = [];
   for (const contentPart of outputValue) {
@@ -498,6 +498,7 @@ function appendToolResultParts(parts, toolName, outputValue) {
   }
   parts.push({
     functionResponse: {
+      ...toolCallId != null ? { id: toolCallId } : {},
       name: toolName,
       response: {
         name: toolName,
@@ -507,12 +508,13 @@ function appendToolResultParts(parts, toolName, outputValue) {
     }
   });
 }
-function appendLegacyToolResultParts(parts, toolName, outputValue) {
+function appendLegacyToolResultParts(parts, toolName, outputValue, toolCallId) {
   for (const contentPart of outputValue) {
     switch (contentPart.type) {
       case "text":
         parts.push({
           functionResponse: {
+            ...toolCallId != null ? { id: toolCallId } : {},
             name: toolName,
             response: {
               name: toolName,
@@ -747,6 +749,7 @@ function convertToGoogleMessages(prompt, options) {
                 }
                 return {
                   functionCall: {
+                    ...part.toolCallId != null ? { id: part.toolCallId } : {},
                     name: part.toolName,
                     args: part.input
                   },
@@ -803,13 +806,24 @@ function convertToGoogleMessages(prompt, options) {
           const output = part.output;
           if (output.type === "content") {
             if (supportsFunctionResponseParts) {
-              appendToolResultParts(parts, part.toolName, output.value);
+              appendToolResultParts(
+                parts,
+                part.toolName,
+                output.value,
+                part.toolCallId
+              );
             } else {
-              appendLegacyToolResultParts(parts, part.toolName, output.value);
+              appendLegacyToolResultParts(
+                parts,
+                part.toolName,
+                output.value,
+                part.toolCallId
+              );
             }
           } else {
             parts.push({
               functionResponse: {
+                ...part.toolCallId != null ? { id: part.toolCallId } : {},
                 name: part.toolName,
                 response: {
                   name: part.toolName,
@@ -1651,7 +1665,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const { args, warnings, providerOptionsNames } = await this.getArgs(options);
     const wrapProviderMetadata = (payload) => Object.fromEntries(
       providerOptionsNames.map((name) => [name, payload])
@@ -1723,9 +1737,9 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
       } else if ("functionCall" in part && part.functionCall.name != null) {
         content.push({
           type: "tool-call",
-          toolCallId: this.config.generateId(),
+          toolCallId: (_e = part.functionCall.id) != null ? _e : this.config.generateId(),
           toolName: part.functionCall.name,
-          input: JSON.stringify((_e = part.functionCall.args) != null ? _e : {}),
+          input: JSON.stringify((_f = part.functionCall.args) != null ? _f : {}),
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
             thoughtSignature: part.thoughtSignature
           }) : void 0
@@ -1742,13 +1756,13 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           }) : void 0
         });
       } else if ("toolCall" in part && part.toolCall) {
-        const toolCallId = (_f = part.toolCall.id) != null ? _f : this.config.generateId();
+        const toolCallId = (_g = part.toolCall.id) != null ? _g : this.config.generateId();
         lastServerToolCallId = toolCallId;
         content.push({
           type: "tool-call",
           toolCallId,
           toolName: `server:${part.toolCall.toolType}`,
-          input: JSON.stringify((_g = part.toolCall.args) != null ? _g : {}),
+          input: JSON.stringify((_h = part.toolCall.args) != null ? _h : {}),
           providerExecuted: true,
           dynamic: true,
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
@@ -1761,12 +1775,12 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           })
         });
       } else if ("toolResponse" in part && part.toolResponse) {
-        const responseToolCallId = (_h = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _h : this.config.generateId();
+        const responseToolCallId = (_i = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _i : this.config.generateId();
         content.push({
           type: "tool-result",
           toolCallId: responseToolCallId,
           toolName: `server:${part.toolResponse.toolType}`,
-          result: (_i = part.toolResponse.response) != null ? _i : {},
+          result: (_j = part.toolResponse.response) != null ? _j : {},
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
             thoughtSignature: part.thoughtSignature,
             serverToolCallId: responseToolCallId,
@@ -1779,10 +1793,10 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
         lastServerToolCallId = void 0;
       }
     }
-    const sources = (_j = extractSources({
+    const sources = (_k = extractSources({
       groundingMetadata: candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _j : [];
+    })) != null ? _k : [];
     for (const source of sources) {
       content.push(source);
     }
@@ -1796,18 +1810,18 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
             (part) => part.type === "tool-call" && !part.providerExecuted
           )
         }),
-        raw: (_k = candidate.finishReason) != null ? _k : void 0
+        raw: (_l = candidate.finishReason) != null ? _l : void 0
       },
       usage: convertGoogleUsage(usageMetadata),
       warnings,
       providerMetadata: wrapProviderMetadata({
-        promptFeedback: (_l = response.promptFeedback) != null ? _l : null,
-        groundingMetadata: (_m = candidate.groundingMetadata) != null ? _m : null,
-        urlContextMetadata: (_n = candidate.urlContextMetadata) != null ? _n : null,
-        safetyRatings: (_o = candidate.safetyRatings) != null ? _o : null,
+        promptFeedback: (_m = response.promptFeedback) != null ? _m : null,
+        groundingMetadata: (_n = candidate.groundingMetadata) != null ? _n : null,
+        urlContextMetadata: (_o = candidate.urlContextMetadata) != null ? _o : null,
+        safetyRatings: (_p = candidate.safetyRatings) != null ? _p : null,
         usageMetadata: usageMetadata != null ? usageMetadata : null,
-        finishMessage: (_p = candidate.finishMessage) != null ? _p : null,
-        serviceTier: (_q = response.serviceTier) != null ? _q : null
+        finishMessage: (_q = candidate.finishMessage) != null ? _q : null,
+        serviceTier: (_r = response.serviceTier) != null ? _r : null
       }),
       request: { body: args },
       response: {
@@ -1865,7 +1879,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
             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, _h, _i, _j, _k, _l, _m, _n, _o;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -2060,7 +2074,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                 const isNoArgsCompleteCall = part.functionCall.name != null && part.functionCall.args == null && part.functionCall.partialArgs == null && part.functionCall.willContinue !== true;
                 if (isStreamingChunk) {
                   if (part.functionCall.name != null && part.functionCall.willContinue === true) {
-                    const toolCallId = generateId3();
+                    const toolCallId = (_i = part.functionCall.id) != null ? _i : generateId3();
                     const accumulator = new GoogleJSONAccumulator();
                     activeStreamingToolCalls.push({
                       toolCallId,
@@ -2126,9 +2140,9 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                   });
                   hasToolCalls = true;
                 } else if (isCompleteCall) {
-                  const toolCallId = generateId3();
+                  const toolCallId = (_j = part.functionCall.id) != null ? _j : generateId3();
                   const toolName = part.functionCall.name;
-                  const args2 = typeof part.functionCall.args === "string" ? part.functionCall.args : JSON.stringify((_i = part.functionCall.args) != null ? _i : {});
+                  const args2 = typeof part.functionCall.args === "string" ? part.functionCall.args : JSON.stringify((_k = part.functionCall.args) != null ? _k : {});
                   controller.enqueue({
                     type: "tool-input-start",
                     id: toolCallId,
@@ -2155,7 +2169,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                   });
                   hasToolCalls = true;
                 } else if (isNoArgsCompleteCall) {
-                  const toolCallId = generateId3();
+                  const toolCallId = (_l = part.functionCall.id) != null ? _l : generateId3();
                   const toolName = part.functionCall.name;
                   controller.enqueue({
                     type: "tool-input-start",
@@ -2188,12 +2202,12 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                 raw: candidate.finishReason
               };
               providerMetadata = wrapProviderMetadata({
-                promptFeedback: (_j = value.promptFeedback) != null ? _j : null,
+                promptFeedback: (_m = value.promptFeedback) != null ? _m : null,
                 groundingMetadata: lastGroundingMetadata,
                 urlContextMetadata: lastUrlContextMetadata,
-                safetyRatings: (_k = candidate.safetyRatings) != null ? _k : null,
+                safetyRatings: (_n = candidate.safetyRatings) != null ? _n : null,
                 usageMetadata: usageMetadata != null ? usageMetadata : null,
-                finishMessage: (_l = candidate.finishMessage) != null ? _l : null,
+                finishMessage: (_o = candidate.finishMessage) != null ? _o : null,
                 serviceTier
               });
             }
@@ -2451,6 +2465,7 @@ var getContentSchema = () => z5.object({
       // note: order matters since text can be fully empty
       z5.object({
         functionCall: z5.object({
+          id: z5.string().nullish(),
           name: z5.string().nullish(),
           args: z5.unknown().nullish(),
           partialArgs: z5.array(partialArgSchema).nullish(),