@ai-sdk/google 2.0.62 → 2.0.64

package/dist/index.mjs

@@ -7,7 +7,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "2.0.62" : "0.0.0-test";
+var VERSION = true ? "2.0.64" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 import {
@@ -366,11 +366,12 @@ import {
 } from "@ai-sdk/provider";
 import { convertToBase64 } from "@ai-sdk/provider-utils";
 function convertToGoogleGenerativeAIMessages(prompt, options) {
-  var _a;
+  var _a, _b;
   const systemInstructionParts = [];
   const contents = [];
   let systemMessagesAllowed = true;
   const isGemmaModel = (_a = options == null ? void 0 : options.isGemmaModel) != null ? _a : false;
+  const supportsFunctionResponseParts = (_b = options == null ? void 0 : options.supportsFunctionResponseParts) != null ? _b : true;
   for (const { role, content } of prompt) {
     switch (role) {
       case "system": {
@@ -418,8 +419,8 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
         contents.push({
           role: "model",
           parts: content.map((part) => {
-            var _a2, _b, _c;
-            const thoughtSignature = ((_b = (_a2 = part.providerOptions) == null ? void 0 : _a2.google) == null ? void 0 : _b.thoughtSignature) != null ? String((_c = part.providerOptions.google) == null ? void 0 : _c.thoughtSignature) : void 0;
+            var _a2, _b2, _c;
+            const thoughtSignature = ((_b2 = (_a2 = part.providerOptions) == null ? void 0 : _a2.google) == null ? void 0 : _b2.thoughtSignature) != null ? String((_c = part.providerOptions.google) == null ? void 0 : _c.thoughtSignature) : void 0;
             switch (part.type) {
               case "text": {
                 return part.text.length === 0 ? void 0 : {
@@ -472,36 +473,10 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
         for (const part of content) {
           const output = part.output;
           if (output.type === "content") {
-            for (const contentPart of output.value) {
-              switch (contentPart.type) {
-                case "text":
-                  parts.push({
-                    functionResponse: {
-                      name: part.toolName,
-                      response: {
-                        name: part.toolName,
-                        content: contentPart.text
-                      }
-                    }
-                  });
-                  break;
-                case "media":
-                  parts.push(
-                    {
-                      inlineData: {
-                        mimeType: contentPart.mediaType,
-                        data: contentPart.data
-                      }
-                    },
-                    {
-                      text: "Tool executed successfully and returned this image as a response"
-                    }
-                  );
-                  break;
-                default:
-                  parts.push({ text: JSON.stringify(contentPart) });
-                  break;
-              }
+            if (supportsFunctionResponseParts) {
+              appendToolResultParts({ parts, part, output });
+            } else {
+              appendLegacyToolResultParts({ parts, part, output });
             }
           } else {
             parts.push({
@@ -532,6 +507,77 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
     contents
   };
 }
+function appendToolResultParts({
+  parts,
+  part,
+  output
+}) {
+  const responseTextParts = [];
+  const functionResponseParts = [];
+  for (const contentPart of output.value) {
+    switch (contentPart.type) {
+      case "text":
+        responseTextParts.push(contentPart.text);
+        break;
+      case "media":
+        functionResponseParts.push({
+          inlineData: {
+            mimeType: contentPart.mediaType,
+            data: contentPart.data
+          }
+        });
+        break;
+    }
+  }
+  const responseText = responseTextParts.length > 0 ? responseTextParts.join("\n") : "Tool executed successfully.";
+  parts.push({
+    functionResponse: {
+      name: part.toolName,
+      response: {
+        name: part.toolName,
+        content: responseText
+      },
+      ...functionResponseParts.length > 0 ? { parts: functionResponseParts } : {}
+    }
+  });
+}
+function appendLegacyToolResultParts({
+  parts,
+  part,
+  output
+}) {
+  for (const contentPart of output.value) {
+    switch (contentPart.type) {
+      case "text":
+        parts.push({
+          functionResponse: {
+            name: part.toolName,
+            response: {
+              name: part.toolName,
+              content: contentPart.text
+            }
+          }
+        });
+        break;
+      case "media":
+        parts.push(
+          {
+            inlineData: {
+              mimeType: contentPart.mediaType,
+              data: contentPart.data
+            }
+          },
+          {
+            text: "Tool executed successfully and returned this image as a response"
+          }
+        );
+        break;
+      default:
+        parts.push({ text: JSON.stringify(contentPart) });
+        break;
+    }
+  }
+}
 
 // src/get-model-path.ts
 function getModelPath(modelId) {
@@ -658,7 +704,15 @@ var googleGenerativeAIProviderOptions = lazySchema4(
           latitude: z4.number(),
           longitude: z4.number()
         }).optional()
-      }).optional()
+      }).optional(),
+      /**
+       * Optional. The service tier to use for the request.
+       */
+      serviceTier: z4.enum([
+        "SERVICE_TIER_STANDARD",
+        "SERVICE_TIER_FLEX",
+        "SERVICE_TIER_PRIORITY"
+      ]).optional()
     })
   )
 );
@@ -937,9 +991,10 @@ var GoogleGenerativeAILanguageModel = class {
       });
     }
     const isGemmaModel = this.modelId.toLowerCase().startsWith("gemma-");
+    const supportsFunctionResponseParts = this.modelId.startsWith("gemini-3");
     const { contents, systemInstruction } = convertToGoogleGenerativeAIMessages(
       prompt,
-      { isGemmaModel }
+      { isGemmaModel, supportsFunctionResponseParts }
     );
     const {
       tools: googleTools2,
@@ -990,13 +1045,14 @@ var GoogleGenerativeAILanguageModel = class {
           retrievalConfig: googleOptions.retrievalConfig
         } : googleToolConfig,
         cachedContent: googleOptions == null ? void 0 : googleOptions.cachedContent,
-        labels: googleOptions == null ? void 0 : googleOptions.labels
+        labels: googleOptions == null ? void 0 : googleOptions.labels,
+        serviceTier: googleOptions == null ? void 0 : googleOptions.serviceTier
       },
       warnings: [...warnings, ...toolWarnings]
     };
   }
   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, _i, _j, _k, _l, _m, _n;
     const { args, warnings } = await this.getArgs(options);
     const body = JSON.stringify(args);
     const mergedHeaders = combineHeaders2(
@@ -1106,7 +1162,7 @@ var GoogleGenerativeAILanguageModel = class {
           groundingMetadata: (_k = candidate.groundingMetadata) != null ? _k : null,
           urlContextMetadata: (_l = candidate.urlContextMetadata) != null ? _l : null,
           safetyRatings: (_m = candidate.safetyRatings) != null ? _m : null,
-          usageMetadata: usageMetadata != null ? usageMetadata : null
+          serviceTier: (_n = response.serviceTier) != null ? _n : null
         }
       },
       request: { body },
@@ -1144,6 +1200,7 @@ var GoogleGenerativeAILanguageModel = class {
     let providerMetadata = void 0;
     let lastGroundingMetadata = null;
     let lastUrlContextMetadata = null;
+    let serviceTier = null;
     const generateId3 = this.config.generateId;
     let hasToolCalls = false;
     let currentTextBlockId = null;
@@ -1175,6 +1232,9 @@ var GoogleGenerativeAILanguageModel = class {
               usage.reasoningTokens = (_d = usageMetadata.thoughtsTokenCount) != null ? _d : void 0;
               usage.cachedInputTokens = (_e = usageMetadata.cachedContentTokenCount) != null ? _e : void 0;
             }
+            if (value.serviceTier != null) {
+              serviceTier = value.serviceTier;
+            }
             const candidate = (_f = value.candidates) == null ? void 0 : _f[0];
             if (candidate == null) {
               return;
@@ -1339,7 +1399,8 @@ var GoogleGenerativeAILanguageModel = class {
                   promptFeedback: (_i = value.promptFeedback) != null ? _i : null,
                   groundingMetadata: lastGroundingMetadata,
                   urlContextMetadata: lastUrlContextMetadata,
-                  safetyRatings: (_j = candidate.safetyRatings) != null ? _j : null
+                  safetyRatings: (_j = candidate.safetyRatings) != null ? _j : null,
+                  serviceTier
                 }
               };
               if (usageMetadata != null) {
@@ -1606,7 +1667,8 @@ var responseSchema = lazySchema5(
       promptFeedback: z5.object({
         blockReason: z5.string().nullish(),
         safetyRatings: z5.array(getSafetyRatingSchema()).nullish()
-      }).nullish()
+      }).nullish(),
+      serviceTier: z5.string().nullish()
     })
   )
 );
@@ -1626,7 +1688,8 @@ var chunkSchema = lazySchema5(
       promptFeedback: z5.object({
         blockReason: z5.string().nullish(),
         safetyRatings: z5.array(getSafetyRatingSchema()).nullish()
-      }).nullish()
+      }).nullish(),
+      serviceTier: z5.string().nullish()
     })
   )
 );