@ai-sdk/google 4.0.0-beta.0 → 4.0.0-beta.10

package/src/google-prepare-tools.ts

@@ -1,6 +1,6 @@
 import {
-  LanguageModelV3CallOptions,
-  SharedV3Warning,
+  LanguageModelV4CallOptions,
+  SharedV4Warning,
   UnsupportedFunctionalityError,
 } from '@ai-sdk/provider';
 import { convertJSONSchemaToOpenAPISchema } from './convert-json-schema-to-openapi-schema';
@@ -11,8 +11,8 @@ export function prepareTools({
   toolChoice,
   modelId,
 }: {
-  tools: LanguageModelV3CallOptions['tools'];
-  toolChoice?: LanguageModelV3CallOptions['toolChoice'];
+  tools: LanguageModelV4CallOptions['tools'];
+  toolChoice?: LanguageModelV4CallOptions['toolChoice'];
   modelId: GoogleGenerativeAIModelId;
 }): {
   tools:
@@ -31,16 +31,16 @@ export function prepareTools({
     | undefined
     | {
         functionCallingConfig: {
-          mode: 'AUTO' | 'NONE' | 'ANY';
+          mode: 'AUTO' | 'NONE' | 'ANY' | 'VALIDATED';
           allowedFunctionNames?: string[];
         };
       };
-  toolWarnings: SharedV3Warning[];
+  toolWarnings: SharedV4Warning[];
 } {
   // when the tools array is empty, change it to undefined to prevent errors:
   tools = tools?.length ? tools : undefined;
 
-  const toolWarnings: SharedV3Warning[] = [];
+  const toolWarnings: SharedV4Warning[] = [];
 
   const isLatest = (
     [
@@ -186,6 +186,7 @@ export function prepareTools({
   }
 
   const functionDeclarations = [];
+  let hasStrictTools = false;
   for (const tool of tools) {
     switch (tool.type) {
       case 'function':
@@ -194,6 +195,9 @@ export function prepareTools({
           description: tool.description ?? '',
           parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema),
         });
+        if (tool.strict === true) {
+          hasStrictTools = true;
+        }
         break;
       default:
         toolWarnings.push({
@@ -207,7 +211,9 @@ export function prepareTools({
   if (toolChoice == null) {
     return {
       tools: [{ functionDeclarations }],
-      toolConfig: undefined,
+      toolConfig: hasStrictTools
+        ? { functionCallingConfig: { mode: 'VALIDATED' } }
+        : undefined,
       toolWarnings,
     };
   }
@@ -218,7 +224,11 @@ export function prepareTools({
     case 'auto':
       return {
         tools: [{ functionDeclarations }],
-        toolConfig: { functionCallingConfig: { mode: 'AUTO' } },
+        toolConfig: {
+          functionCallingConfig: {
+            mode: hasStrictTools ? 'VALIDATED' : 'AUTO',
+          },
+        },
         toolWarnings,
       };
     case 'none':
@@ -230,7 +240,11 @@ export function prepareTools({
     case 'required':
       return {
         tools: [{ functionDeclarations }],
-        toolConfig: { functionCallingConfig: { mode: 'ANY' } },
+        toolConfig: {
+          functionCallingConfig: {
+            mode: hasStrictTools ? 'VALIDATED' : 'ANY',
+          },
+        },
         toolWarnings,
       };
     case 'tool':
@@ -238,7 +252,7 @@ export function prepareTools({
         tools: [{ functionDeclarations }],
         toolConfig: {
           functionCallingConfig: {
-            mode: 'ANY',
+            mode: hasStrictTools ? 'VALIDATED' : 'ANY',
             allowedFunctionNames: [toolChoice.toolName],
           },
         },

package/src/google-provider.ts

@@ -1,9 +1,9 @@
 import {
-  EmbeddingModelV3,
-  Experimental_VideoModelV3,
-  ImageModelV3,
-  LanguageModelV3,
-  ProviderV3,
+  EmbeddingModelV4,
+  Experimental_VideoModelV4,
+  ImageModelV4,
+  LanguageModelV4,
+  ProviderV4,
 } from '@ai-sdk/provider';
 import {
   FetchFunction,
@@ -27,12 +27,12 @@ import { GoogleGenerativeAIImageModel } from './google-generative-ai-image-model
 import { GoogleGenerativeAIVideoModel } from './google-generative-ai-video-model';
 import { GoogleGenerativeAIVideoModelId } from './google-generative-ai-video-settings';
 
-export interface GoogleGenerativeAIProvider extends ProviderV3 {
-  (modelId: GoogleGenerativeAIModelId): LanguageModelV3;
+export interface GoogleGenerativeAIProvider extends ProviderV4 {
+  (modelId: GoogleGenerativeAIModelId): LanguageModelV4;
 
-  languageModel(modelId: GoogleGenerativeAIModelId): LanguageModelV3;
+  languageModel(modelId: GoogleGenerativeAIModelId): LanguageModelV4;
 
-  chat(modelId: GoogleGenerativeAIModelId): LanguageModelV3;
+  chat(modelId: GoogleGenerativeAIModelId): LanguageModelV4;
 
   /**
    * Creates a model for image generation.
@@ -40,46 +40,46 @@ export interface GoogleGenerativeAIProvider extends ProviderV3 {
   image(
     modelId: GoogleGenerativeAIImageModelId,
     settings?: GoogleGenerativeAIImageSettings,
-  ): ImageModelV3;
+  ): ImageModelV4;
 
   /**
    * @deprecated Use `chat()` instead.
    */
-  generativeAI(modelId: GoogleGenerativeAIModelId): LanguageModelV3;
+  generativeAI(modelId: GoogleGenerativeAIModelId): LanguageModelV4;
 
   /**
    * Creates a model for text embeddings.
    */
-  embedding(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV3;
+  embedding(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV4;
 
   /**
    * Creates a model for text embeddings.
    */
-  embeddingModel(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV3;
+  embeddingModel(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV4;
 
   /**
    * @deprecated Use `embedding` instead.
    */
-  textEmbedding(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV3;
+  textEmbedding(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV4;
 
   /**
    * @deprecated Use `embeddingModel` instead.
    */
   textEmbeddingModel(
     modelId: GoogleGenerativeAIEmbeddingModelId,
-  ): EmbeddingModelV3;
+  ): EmbeddingModelV4;
 
   /**
    * Creates a model for video generation.
    */
-  video(modelId: GoogleGenerativeAIVideoModelId): Experimental_VideoModelV3;
+  video(modelId: GoogleGenerativeAIVideoModelId): Experimental_VideoModelV4;
 
   /**
    * Creates a model for video generation.
    */
   videoModel(
     modelId: GoogleGenerativeAIVideoModelId,
-  ): Experimental_VideoModelV3;
+  ): Experimental_VideoModelV4;
 
   tools: typeof googleTools;
 }
@@ -204,7 +204,7 @@ export function createGoogleGenerativeAI(
     return createChatModel(modelId);
   };
 
-  provider.specificationVersion = 'v3' as const;
+  provider.specificationVersion = 'v4' as const;
   provider.languageModel = createChatModel;
   provider.chat = createChatModel;
   provider.generativeAI = createChatModel;

package/src/map-google-generative-ai-finish-reason.ts

@@ -1,4 +1,4 @@
-import { LanguageModelV3FinishReason } from '@ai-sdk/provider';
+import { LanguageModelV4FinishReason } from '@ai-sdk/provider';
 
 export function mapGoogleGenerativeAIFinishReason({
   finishReason,
@@ -6,7 +6,7 @@ export function mapGoogleGenerativeAIFinishReason({
 }: {
   finishReason: string | null | undefined;
   hasToolCalls: boolean;
-}): LanguageModelV3FinishReason['unified'] {
+}): LanguageModelV4FinishReason['unified'] {
   switch (finishReason) {
     case 'STOP':
       return hasToolCalls ? 'tool-calls' : 'stop';