@ai-sdk/google 3.0.53 → 3.0.55

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ai-sdk/google
 
+## 3.0.55
+
+### Patch Changes
+
+- bdde9d4: feat(provider/google): support combining built-in tools with function calling on Gemini 3
+
+## 3.0.54
+
+### Patch Changes
+
+- 4e22c2c: feat(provider/google): add support for service tier parameter
+
 ## 3.0.53
 
 ### Patch Changes

package/dist/index.d.mts

@@ -39,6 +39,7 @@ declare const googleLanguageModelOptions: _ai_sdk_provider_utils.LazySchema<{
             longitude: number;
         } | undefined;
     } | undefined;
+    serviceTier?: "SERVICE_TIER_STANDARD" | "SERVICE_TIER_FLEX" | "SERVICE_TIER_PRIORITY" | undefined;
 }>;
 type GoogleLanguageModelOptions = InferSchema<typeof googleLanguageModelOptions>;
 
@@ -58,6 +59,20 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
                 };
                 thought?: boolean | null | undefined;
                 thoughtSignature?: string | null | undefined;
+            } | {
+                toolCall: {
+                    toolType: string;
+                    id: string;
+                    args?: unknown;
+                };
+                thoughtSignature?: string | null | undefined;
+            } | {
+                toolResponse: {
+                    toolType: string;
+                    id: string;
+                    response?: unknown;
+                };
+                thoughtSignature?: string | null | undefined;
             } | {
                 executableCode?: {
                     language: string;
@@ -155,6 +170,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
             blocked?: boolean | null | undefined;
         }[] | null | undefined;
     } | null | undefined;
+    serviceTier?: string | null | undefined;
 }>;
 type GroundingMetadataSchema = NonNullable<InferSchema<typeof responseSchema>['candidates'][number]['groundingMetadata']>;
 type UrlContextMetadataSchema = NonNullable<InferSchema<typeof responseSchema>['candidates'][number]['urlContextMetadata']>;
@@ -174,6 +190,7 @@ interface GoogleGenerativeAIProviderMetadata {
     safetyRatings: GoogleGenerativeAISafetyRating[] | null;
     usageMetadata: GoogleGenerativeAIUsageMetadata | null;
     finishMessage: string | null;
+    serviceTier: string | null;
 }
 
 type GoogleGenerativeAIImageModelId = 'imagen-4.0-generate-001' | 'imagen-4.0-ultra-generate-001' | 'imagen-4.0-fast-generate-001' | 'gemini-2.5-flash-image' | 'gemini-3-pro-image-preview' | 'gemini-3.1-flash-image-preview' | (string & {});

package/dist/index.d.ts

@@ -39,6 +39,7 @@ declare const googleLanguageModelOptions: _ai_sdk_provider_utils.LazySchema<{
             longitude: number;
         } | undefined;
     } | undefined;
+    serviceTier?: "SERVICE_TIER_STANDARD" | "SERVICE_TIER_FLEX" | "SERVICE_TIER_PRIORITY" | undefined;
 }>;
 type GoogleLanguageModelOptions = InferSchema<typeof googleLanguageModelOptions>;
 
@@ -58,6 +59,20 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
                 };
                 thought?: boolean | null | undefined;
                 thoughtSignature?: string | null | undefined;
+            } | {
+                toolCall: {
+                    toolType: string;
+                    id: string;
+                    args?: unknown;
+                };
+                thoughtSignature?: string | null | undefined;
+            } | {
+                toolResponse: {
+                    toolType: string;
+                    id: string;
+                    response?: unknown;
+                };
+                thoughtSignature?: string | null | undefined;
             } | {
                 executableCode?: {
                     language: string;
@@ -155,6 +170,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
             blocked?: boolean | null | undefined;
         }[] | null | undefined;
     } | null | undefined;
+    serviceTier?: string | null | undefined;
 }>;
 type GroundingMetadataSchema = NonNullable<InferSchema<typeof responseSchema>['candidates'][number]['groundingMetadata']>;
 type UrlContextMetadataSchema = NonNullable<InferSchema<typeof responseSchema>['candidates'][number]['urlContextMetadata']>;
@@ -174,6 +190,7 @@ interface GoogleGenerativeAIProviderMetadata {
     safetyRatings: GoogleGenerativeAISafetyRating[] | null;
     usageMetadata: GoogleGenerativeAIUsageMetadata | null;
     finishMessage: string | null;
+    serviceTier: string | null;
 }
 
 type GoogleGenerativeAIImageModelId = 'imagen-4.0-generate-001' | 'imagen-4.0-ultra-generate-001' | 'imagen-4.0-fast-generate-001' | 'gemini-2.5-flash-image' | 'gemini-3-pro-image-preview' | 'gemini-3.1-flash-image-preview' | (string & {});

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(index_exports);
 var import_provider_utils16 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.53" : "0.0.0-test";
+var VERSION = true ? "3.0.55" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -505,7 +505,7 @@ function appendLegacyToolResultParts(parts, toolName, outputValue) {
   }
 }
 function convertToGoogleGenerativeAIMessages(prompt, options) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const systemInstructionParts = [];
   const contents = [];
   let systemMessagesAllowed = true;
@@ -592,6 +592,18 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
                 };
               }
               case "tool-call": {
+                const serverToolCallId = (providerOpts == null ? void 0 : providerOpts.serverToolCallId) != null ? String(providerOpts.serverToolCallId) : void 0;
+                const serverToolType = (providerOpts == null ? void 0 : providerOpts.serverToolType) != null ? String(providerOpts.serverToolType) : void 0;
+                if (serverToolCallId && serverToolType) {
+                  return {
+                    toolCall: {
+                      toolType: serverToolType,
+                      args: typeof part.input === "string" ? JSON.parse(part.input) : part.input,
+                      id: serverToolCallId
+                    },
+                    thoughtSignature
+                  };
+                }
                 return {
                   functionCall: {
                     name: part.toolName,
@@ -600,6 +612,21 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
                   thoughtSignature
                 };
               }
+              case "tool-result": {
+                const serverToolCallId = (providerOpts == null ? void 0 : providerOpts.serverToolCallId) != null ? String(providerOpts.serverToolCallId) : void 0;
+                const serverToolType = (providerOpts == null ? void 0 : providerOpts.serverToolType) != null ? String(providerOpts.serverToolType) : void 0;
+                if (serverToolCallId && serverToolType) {
+                  return {
+                    toolResponse: {
+                      toolType: serverToolType,
+                      response: part.output.type === "json" ? part.output.value : {},
+                      id: serverToolCallId
+                    },
+                    thoughtSignature
+                  };
+                }
+                return void 0;
+              }
             }
           }).filter((part) => part !== void 0)
         });
@@ -612,6 +639,26 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
           if (part.type === "tool-approval-response") {
             continue;
           }
+          const partProviderOpts = (_g = (_d = part.providerOptions) == null ? void 0 : _d[providerOptionsName]) != null ? _g : providerOptionsName !== "google" ? (_e = part.providerOptions) == null ? void 0 : _e.google : (_f = part.providerOptions) == null ? void 0 : _f.vertex;
+          const serverToolCallId = (partProviderOpts == null ? void 0 : partProviderOpts.serverToolCallId) != null ? String(partProviderOpts.serverToolCallId) : void 0;
+          const serverToolType = (partProviderOpts == null ? void 0 : partProviderOpts.serverToolType) != null ? String(partProviderOpts.serverToolType) : void 0;
+          if (serverToolCallId && serverToolType) {
+            const serverThoughtSignature = (partProviderOpts == null ? void 0 : partProviderOpts.thoughtSignature) != null ? String(partProviderOpts.thoughtSignature) : void 0;
+            if (contents.length > 0) {
+              const lastContent = contents[contents.length - 1];
+              if (lastContent.role === "model") {
+                lastContent.parts.push({
+                  toolResponse: {
+                    toolType: serverToolType,
+                    response: part.output.type === "json" ? part.output.value : {},
+                    id: serverToolCallId
+                  },
+                  thoughtSignature: serverThoughtSignature
+                });
+                continue;
+              }
+            }
+          }
           const output = part.output;
           if (output.type === "content") {
             if (supportsFunctionResponseParts) {
@@ -625,7 +672,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
                 name: part.toolName,
                 response: {
                   name: part.toolName,
-                  content: output.type === "execution-denied" ? (_d = output.reason) != null ? _d : "Tool execution denied." : output.value
+                  content: output.type === "execution-denied" ? (_h = output.reason) != null ? _h : "Tool execution denied." : output.value
                 }
               }
             });
@@ -771,7 +818,15 @@ var googleLanguageModelOptions = (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()
     })
   )
 );
@@ -783,7 +838,7 @@ function prepareTools({
   toolChoice,
   modelId
 }) {
-  var _a;
+  var _a, _b;
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
   const isLatest = [
@@ -792,13 +847,14 @@ function prepareTools({
     "gemini-pro-latest"
   ].some((id) => id === modelId);
   const isGemini2orNewer = modelId.includes("gemini-2") || modelId.includes("gemini-3") || modelId.includes("nano-banana") || isLatest;
+  const isGemini3orNewer = modelId.includes("gemini-3");
   const supportsFileSearch = modelId.includes("gemini-2.5") || modelId.includes("gemini-3");
   if (tools == null) {
     return { tools: void 0, toolConfig: void 0, toolWarnings };
   }
   const hasFunctionTools = tools.some((tool) => tool.type === "function");
   const hasProviderTools = tools.some((tool) => tool.type === "provider");
-  if (hasFunctionTools && hasProviderTools) {
+  if (hasFunctionTools && hasProviderTools && !isGemini3orNewer) {
     toolWarnings.push({
       type: "unsupported",
       feature: `combination of function and provider-defined tools`
@@ -903,6 +959,45 @@ function prepareTools({
           break;
       }
     });
+    if (hasFunctionTools && isGemini3orNewer && googleTools2.length > 0) {
+      const functionDeclarations2 = [];
+      for (const tool of tools) {
+        if (tool.type === "function") {
+          functionDeclarations2.push({
+            name: tool.name,
+            description: (_a = tool.description) != null ? _a : "",
+            parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
+          });
+        }
+      }
+      const combinedToolConfig = {
+        functionCallingConfig: { mode: "VALIDATED" },
+        includeServerSideToolInvocations: true
+      };
+      if (toolChoice != null) {
+        switch (toolChoice.type) {
+          case "auto":
+            break;
+          case "none":
+            combinedToolConfig.functionCallingConfig = { mode: "NONE" };
+            break;
+          case "required":
+            combinedToolConfig.functionCallingConfig = { mode: "ANY" };
+            break;
+          case "tool":
+            combinedToolConfig.functionCallingConfig = {
+              mode: "ANY",
+              allowedFunctionNames: [toolChoice.toolName]
+            };
+            break;
+        }
+      }
+      return {
+        tools: [...googleTools2, { functionDeclarations: functionDeclarations2 }],
+        toolConfig: combinedToolConfig,
+        toolWarnings
+      };
+    }
     return {
       tools: googleTools2.length > 0 ? googleTools2 : void 0,
       toolConfig: void 0,
@@ -916,7 +1011,7 @@ function prepareTools({
       case "function":
         functionDeclarations.push({
           name: tool.name,
-          description: (_a = tool.description) != null ? _a : "",
+          description: (_b = tool.description) != null ? _b : "",
           parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
         });
         if (tool.strict === true) {
@@ -1125,14 +1220,15 @@ 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],
       providerOptionsName
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const { args, warnings, providerOptionsName } = await this.getArgs(options);
     const mergedHeaders = (0, import_provider_utils6.combineHeaders)(
       await (0, import_provider_utils6.resolve)(this.config.headers),
@@ -1158,6 +1254,7 @@ var GoogleGenerativeAILanguageModel = class {
     const parts = (_b = (_a = candidate.content) == null ? void 0 : _a.parts) != null ? _b : [];
     const usageMetadata = response.usageMetadata;
     let lastCodeExecutionToolCallId;
+    let lastServerToolCallId;
     for (const part of parts) {
       if ("executableCode" in part && ((_c = part.executableCode) == null ? void 0 : _c.code)) {
         const toolCallId = this.config.generateId();
@@ -1225,12 +1322,56 @@ var GoogleGenerativeAILanguageModel = class {
             }
           } : void 0
         });
+      } else if ("toolCall" in part && part.toolCall) {
+        const toolCallId = (_e = part.toolCall.id) != null ? _e : this.config.generateId();
+        lastServerToolCallId = toolCallId;
+        content.push({
+          type: "tool-call",
+          toolCallId,
+          toolName: `server:${part.toolCall.toolType}`,
+          input: JSON.stringify((_f = part.toolCall.args) != null ? _f : {}),
+          providerExecuted: true,
+          dynamic: true,
+          providerMetadata: part.thoughtSignature ? {
+            [providerOptionsName]: {
+              thoughtSignature: part.thoughtSignature,
+              serverToolCallId: toolCallId,
+              serverToolType: part.toolCall.toolType
+            }
+          } : {
+            [providerOptionsName]: {
+              serverToolCallId: toolCallId,
+              serverToolType: part.toolCall.toolType
+            }
+          }
+        });
+      } else if ("toolResponse" in part && part.toolResponse) {
+        const responseToolCallId = (_g = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _g : this.config.generateId();
+        content.push({
+          type: "tool-result",
+          toolCallId: responseToolCallId,
+          toolName: `server:${part.toolResponse.toolType}`,
+          result: (_h = part.toolResponse.response) != null ? _h : {},
+          providerMetadata: part.thoughtSignature ? {
+            [providerOptionsName]: {
+              thoughtSignature: part.thoughtSignature,
+              serverToolCallId: responseToolCallId,
+              serverToolType: part.toolResponse.toolType
+            }
+          } : {
+            [providerOptionsName]: {
+              serverToolCallId: responseToolCallId,
+              serverToolType: part.toolResponse.toolType
+            }
+          }
+        });
+        lastServerToolCallId = void 0;
       }
     }
-    const sources = (_e = extractSources({
+    const sources = (_i = extractSources({
       groundingMetadata: candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _e : [];
+    })) != null ? _i : [];
     for (const source of sources) {
       content.push(source);
     }
@@ -1244,18 +1385,19 @@ var GoogleGenerativeAILanguageModel = class {
             (part) => part.type === "tool-call" && !part.providerExecuted
           )
         }),
-        raw: (_f = candidate.finishReason) != null ? _f : void 0
+        raw: (_j = candidate.finishReason) != null ? _j : void 0
       },
       usage: convertGoogleGenerativeAIUsage(usageMetadata),
       warnings,
       providerMetadata: {
         [providerOptionsName]: {
-          promptFeedback: (_g = response.promptFeedback) != null ? _g : null,
-          groundingMetadata: (_h = candidate.groundingMetadata) != null ? _h : null,
-          urlContextMetadata: (_i = candidate.urlContextMetadata) != null ? _i : null,
-          safetyRatings: (_j = candidate.safetyRatings) != null ? _j : 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,
           usageMetadata: usageMetadata != null ? usageMetadata : null,
-          finishMessage: (_k = candidate.finishMessage) != null ? _k : null
+          finishMessage: (_o = candidate.finishMessage) != null ? _o : null,
+          serviceTier: (_p = response.serviceTier) != null ? _p : null
         }
       },
       request: { body: args },
@@ -1291,6 +1433,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;
@@ -1298,6 +1441,7 @@ var GoogleGenerativeAILanguageModel = class {
     let blockCounter = 0;
     const emittedSourceUrls = /* @__PURE__ */ new Set();
     let lastCodeExecutionToolCallId;
+    let lastServerToolCallId;
     return {
       stream: response.pipeThrough(
         new TransformStream({
@@ -1305,7 +1449,7 @@ var GoogleGenerativeAILanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -1318,6 +1462,9 @@ var GoogleGenerativeAILanguageModel = class {
             if (usageMetadata != null) {
               usage = usageMetadata;
             }
+            if (value.serviceTier != null) {
+              serviceTier = value.serviceTier;
+            }
             const candidate = (_a = value.candidates) == null ? void 0 : _a[0];
             if (candidate == null) {
               return;
@@ -1457,6 +1604,42 @@ var GoogleGenerativeAILanguageModel = class {
                     data: part.inlineData.data,
                     providerMetadata: fileMeta
                   });
+                } else if ("toolCall" in part && part.toolCall) {
+                  const toolCallId = (_e = part.toolCall.id) != null ? _e : generateId3();
+                  lastServerToolCallId = toolCallId;
+                  const serverMeta = {
+                    [providerOptionsName]: {
+                      ...part.thoughtSignature ? { thoughtSignature: part.thoughtSignature } : {},
+                      serverToolCallId: toolCallId,
+                      serverToolType: part.toolCall.toolType
+                    }
+                  };
+                  controller.enqueue({
+                    type: "tool-call",
+                    toolCallId,
+                    toolName: `server:${part.toolCall.toolType}`,
+                    input: JSON.stringify((_f = part.toolCall.args) != null ? _f : {}),
+                    providerExecuted: true,
+                    dynamic: true,
+                    providerMetadata: serverMeta
+                  });
+                } else if ("toolResponse" in part && part.toolResponse) {
+                  const responseToolCallId = (_g = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _g : generateId3();
+                  const serverMeta = {
+                    [providerOptionsName]: {
+                      ...part.thoughtSignature ? { thoughtSignature: part.thoughtSignature } : {},
+                      serverToolCallId: responseToolCallId,
+                      serverToolType: part.toolResponse.toolType
+                    }
+                  };
+                  controller.enqueue({
+                    type: "tool-result",
+                    toolCallId: responseToolCallId,
+                    toolName: `server:${part.toolResponse.toolType}`,
+                    result: (_h = part.toolResponse.response) != null ? _h : {},
+                    providerMetadata: serverMeta
+                  });
+                  lastServerToolCallId = void 0;
                 }
               }
               const toolCallDeltas = getToolCallsFromParts({
@@ -1504,12 +1687,13 @@ var GoogleGenerativeAILanguageModel = class {
               };
               providerMetadata = {
                 [providerOptionsName]: {
-                  promptFeedback: (_e = value.promptFeedback) != null ? _e : null,
+                  promptFeedback: (_i = value.promptFeedback) != null ? _i : null,
                   groundingMetadata: lastGroundingMetadata,
                   urlContextMetadata: lastUrlContextMetadata,
-                  safetyRatings: (_f = candidate.safetyRatings) != null ? _f : null,
+                  safetyRatings: (_j = candidate.safetyRatings) != null ? _j : null,
                   usageMetadata: usageMetadata != null ? usageMetadata : null,
-                  finishMessage: (_g = candidate.finishMessage) != null ? _g : null
+                  finishMessage: (_k = candidate.finishMessage) != null ? _k : null,
+                  serviceTier
                 }
               };
             }
@@ -1723,6 +1907,22 @@ var getContentSchema = () => import_v45.z.object({
         thought: import_v45.z.boolean().nullish(),
         thoughtSignature: import_v45.z.string().nullish()
       }),
+      import_v45.z.object({
+        toolCall: import_v45.z.object({
+          toolType: import_v45.z.string(),
+          args: import_v45.z.unknown().nullish(),
+          id: import_v45.z.string()
+        }),
+        thoughtSignature: import_v45.z.string().nullish()
+      }),
+      import_v45.z.object({
+        toolResponse: import_v45.z.object({
+          toolType: import_v45.z.string(),
+          response: import_v45.z.unknown().nullish(),
+          id: import_v45.z.string()
+        }),
+        thoughtSignature: import_v45.z.string().nullish()
+      }),
       import_v45.z.object({
         executableCode: import_v45.z.object({
           language: import_v45.z.string(),
@@ -1781,7 +1981,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()
     })
   )
 );
@@ -1802,7 +2003,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()
     })
   )
 );