@ai-sdk/google 2.0.62 → 2.0.64

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @ai-sdk/google
 
+## 2.0.64
+
+### Patch Changes
+
+- fd3f1d3: feat(provider/google): add support for service tier parameter
+
+## 2.0.63
+
+### Patch Changes
+
+- 7655bcf: feat(provider/google): Add multimodal tool-result support for Google function responses.
+
+  Tool results with `output.type = 'content'` now map media parts into
+  `functionResponse.parts` for Google models, including `image-data`,
+  `file-data`, and base64 `data:` URLs in URL-style content parts.
+  Remote HTTP(S) URLs in URL-style tool-result parts are not supported.
+
 ## 2.0.62
 
 ### Patch Changes

package/dist/index.d.mts

@@ -39,6 +39,7 @@ declare const googleGenerativeAIProviderOptions: _ai_sdk_provider_utils.LazySche
             longitude: number;
         } | undefined;
     } | undefined;
+    serviceTier?: "SERVICE_TIER_STANDARD" | "SERVICE_TIER_FLEX" | "SERVICE_TIER_PRIORITY" | undefined;
 }>;
 type GoogleGenerativeAIProviderOptions = InferValidator<typeof googleGenerativeAIProviderOptions>;
 
@@ -152,6 +153,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
             blocked?: boolean | null | undefined;
         }[] | null | undefined;
     } | null | undefined;
+    serviceTier?: string | null | undefined;
 }>;
 type GroundingMetadataSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['groundingMetadata']>;
 type UrlContextMetadataSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['urlContextMetadata']>;
@@ -164,6 +166,7 @@ interface GoogleGenerativeAIProviderMetadata {
     groundingMetadata: GoogleGenerativeAIGroundingMetadata | null;
     urlContextMetadata: GoogleGenerativeAIUrlContextMetadata | null;
     safetyRatings: GoogleGenerativeAISafetyRating[] | null;
+    serviceTier: string | null;
 }
 
 type GoogleGenerativeAIImageModelId = 'imagen-4.0-generate-001' | 'imagen-4.0-ultra-generate-001' | 'imagen-4.0-fast-generate-001' | (string & {});

package/dist/index.d.ts

@@ -39,6 +39,7 @@ declare const googleGenerativeAIProviderOptions: _ai_sdk_provider_utils.LazySche
             longitude: number;
         } | undefined;
     } | undefined;
+    serviceTier?: "SERVICE_TIER_STANDARD" | "SERVICE_TIER_FLEX" | "SERVICE_TIER_PRIORITY" | undefined;
 }>;
 type GoogleGenerativeAIProviderOptions = InferValidator<typeof googleGenerativeAIProviderOptions>;
 
@@ -152,6 +153,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
             blocked?: boolean | null | undefined;
         }[] | null | undefined;
     } | null | undefined;
+    serviceTier?: string | null | undefined;
 }>;
 type GroundingMetadataSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['groundingMetadata']>;
 type UrlContextMetadataSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['urlContextMetadata']>;
@@ -164,6 +166,7 @@ interface GoogleGenerativeAIProviderMetadata {
     groundingMetadata: GoogleGenerativeAIGroundingMetadata | null;
     urlContextMetadata: GoogleGenerativeAIUrlContextMetadata | null;
     safetyRatings: GoogleGenerativeAISafetyRating[] | null;
+    serviceTier: string | null;
 }
 
 type GoogleGenerativeAIImageModelId = 'imagen-4.0-generate-001' | 'imagen-4.0-ultra-generate-001' | 'imagen-4.0-fast-generate-001' | (string & {});

package/dist/index.js

@@ -18,19 +18,19 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   VERSION: () => VERSION,
   createGoogleGenerativeAI: () => createGoogleGenerativeAI,
   google: () => google
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/google-provider.ts
 var import_provider_utils15 = require("@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
 var import_provider = require("@ai-sdk/provider");
@@ -360,11 +360,12 @@ function isEmptyObjectSchema(jsonSchema) {
 var import_provider2 = require("@ai-sdk/provider");
 var import_provider_utils4 = require("@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": {
@@ -412,8 +413,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 : {
@@ -466,36 +467,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({
@@ -526,6 +501,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) {
@@ -649,7 +695,15 @@ var googleGenerativeAIProviderOptions = (0, import_provider_utils5.lazySchema)(
           latitude: import_v44.z.number(),
           longitude: import_v44.z.number()
         }).optional()
-      }).optional()
+      }).optional(),
+      /**
+       * Optional. The service tier to use for the request.
+       */
+      serviceTier: import_v44.z.enum([
+        "SERVICE_TIER_STANDARD",
+        "SERVICE_TIER_FLEX",
+        "SERVICE_TIER_PRIORITY"
+      ]).optional()
     })
   )
 );
@@ -926,9 +980,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,
@@ -979,13 +1034,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 = (0, import_provider_utils6.combineHeaders)(
@@ -1095,7 +1151,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 },
@@ -1133,6 +1189,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;
@@ -1164,6 +1221,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;
@@ -1328,7 +1388,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) {
@@ -1595,7 +1656,8 @@ var responseSchema = (0, import_provider_utils6.lazySchema)(
       promptFeedback: import_v45.z.object({
         blockReason: import_v45.z.string().nullish(),
         safetyRatings: import_v45.z.array(getSafetyRatingSchema()).nullish()
-      }).nullish()
+      }).nullish(),
+      serviceTier: import_v45.z.string().nullish()
     })
   )
 );
@@ -1615,7 +1677,8 @@ var chunkSchema = (0, import_provider_utils6.lazySchema)(
       promptFeedback: import_v45.z.object({
         blockReason: import_v45.z.string().nullish(),
         safetyRatings: import_v45.z.array(getSafetyRatingSchema()).nullish()
-      }).nullish()
+      }).nullish(),
+      serviceTier: import_v45.z.string().nullish()
     })
   )
 );