@ai-sdk/google 3.0.73 → 3.0.74

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ai-sdk/google
 
+## 3.0.74
+
+### Patch Changes
+
+- 3ca0daa: fix(provider/google): support `functionCall.id` when returned by Gemini API and provide matching `functionResponse.id`
+
 ## 3.0.73
 
 ### Patch Changes

package/dist/index.d.mts

@@ -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.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

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(index_exports);
 var import_provider_utils23 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.73" : "0.0.0-test";
+var VERSION = true ? "3.0.74" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -429,7 +429,7 @@ function convertUrlToolResultPart(url) {
     }
   };
 }
-function appendToolResultParts(parts, toolName, outputValue) {
+function appendToolResultParts(parts, toolName, outputValue, toolCallId) {
   const functionResponseParts = [];
   const responseTextParts = [];
   for (const contentPart of outputValue) {
@@ -468,6 +468,7 @@ function appendToolResultParts(parts, toolName, outputValue) {
   }
   parts.push({
     functionResponse: {
+      ...toolCallId != null ? { id: toolCallId } : {},
       name: toolName,
       response: {
         name: toolName,
@@ -477,12 +478,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,
@@ -612,6 +614,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
                 }
                 return {
                   functionCall: {
+                    ...part.toolCallId != null ? { id: part.toolCallId } : {},
                     name: part.toolName,
                     args: part.input
                   },
@@ -668,13 +671,24 @@ function convertToGoogleGenerativeAIMessages(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,
@@ -1494,7 +1508,7 @@ var GoogleGenerativeAILanguageModel = class {
     };
   }
   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, providerOptionsName } = await this.getArgs(options);
     const mergedHeaders = (0, import_provider_utils6.combineHeaders)(
       await (0, import_provider_utils6.resolve)(this.config.headers),
@@ -1565,9 +1579,9 @@ var GoogleGenerativeAILanguageModel = class {
       } 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 ? {
             [providerOptionsName]: {
               thoughtSignature: part.thoughtSignature
@@ -1589,13 +1603,13 @@ var GoogleGenerativeAILanguageModel = class {
           } : 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 ? {
@@ -1612,12 +1626,12 @@ var GoogleGenerativeAILanguageModel = class {
           }
         });
       } 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 ? {
             [providerOptionsName]: {
               thoughtSignature: part.thoughtSignature,
@@ -1634,10 +1648,10 @@ var GoogleGenerativeAILanguageModel = class {
         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);
     }
@@ -1651,19 +1665,19 @@ var GoogleGenerativeAILanguageModel = class {
             (part) => part.type === "tool-call" && !part.providerExecuted
           )
         }),
-        raw: (_k = candidate.finishReason) != null ? _k : void 0
+        raw: (_l = candidate.finishReason) != null ? _l : void 0
       },
       usage: convertGoogleGenerativeAIUsage(usageMetadata),
       warnings,
       providerMetadata: {
         [providerOptionsName]: {
-          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 },
@@ -1719,7 +1733,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, _h, _i, _j, _k, _l, _m, _n, _o;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -1925,7 +1939,7 @@ var GoogleGenerativeAILanguageModel = class {
                 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,
@@ -1991,9 +2005,9 @@ var GoogleGenerativeAILanguageModel = class {
                   });
                   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,
@@ -2020,7 +2034,7 @@ var GoogleGenerativeAILanguageModel = class {
                   });
                   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",
@@ -2054,12 +2068,12 @@ var GoogleGenerativeAILanguageModel = class {
               };
               providerMetadata = {
                 [providerOptionsName]: {
-                  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
                 }
               };
@@ -2249,6 +2263,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().nullish(),
           args: import_v45.z.unknown().nullish(),
           partialArgs: import_v45.z.array(partialArgSchema).nullish(),