@ai-sdk/google 2.0.72 → 2.0.74

package/dist/internal/index.mjs

@@ -224,6 +224,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
               case "tool-call": {
                 return {
                   functionCall: {
+                    ...part.toolCallId != null ? { id: part.toolCallId } : {},
                     name: part.toolName,
                     args: part.input
                   },
@@ -249,6 +250,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
           } else {
             parts.push({
               functionResponse: {
+                ...part.toolCallId != null ? { id: part.toolCallId } : {},
                 name: part.toolName,
                 response: {
                   name: part.toolName,
@@ -300,6 +302,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,
@@ -319,6 +322,7 @@ function appendLegacyToolResultParts({
       case "text":
         parts.push({
           functionResponse: {
+            ...part.toolCallId != null ? { id: part.toolCallId } : {},
             name: part.toolName,
             response: {
               name: part.toolName,
@@ -861,7 +865,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 = combineHeaders(
@@ -931,7 +935,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
@@ -944,10 +948,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);
     }
@@ -958,20 +962,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 },
@@ -1251,13 +1255,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: generateId2(),
-    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 : generateId2(),
+      toolName: part.functionCall.name,
+      args: JSON.stringify(part.functionCall.args),
+      providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
+    };
+  });
 }
 function extractSources({
   groundingMetadata,
@@ -1408,6 +1415,7 @@ var getContentSchema = () => z3.object({
       // note: order matters since text can be fully empty
       z3.object({
         functionCall: z3.object({
+          id: z3.string().nullish(),
           name: z3.string(),
           args: z3.unknown()
         }),