@ai-sdk/google 3.0.113 → 3.0.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/google",
-  "version": "3.0.113",
+  "version": "3.0.114",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",

package/src/convert-json-schema-to-openapi-schema.ts

@@ -14,6 +14,18 @@ type ReferenceContext = {
   resolvingReferences: ReadonlySet<string>;
 };
 
+const recursiveReferenceFunctionalityPrefix =
+  'recursive JSON Schema reference:';
+
+export function isRecursiveJSONSchemaReferenceError(
+  error: unknown,
+): error is UnsupportedFunctionalityError {
+  return (
+    UnsupportedFunctionalityError.isInstance(error) &&
+    error.functionality.startsWith(recursiveReferenceFunctionalityPrefix)
+  );
+}
+
 /**
  * Converts JSON Schema 7 to OpenAPI Schema 3.0
  */
@@ -207,7 +219,7 @@ function convertJSONSchemaReference({
 
   if (referenceContext.resolvingReferences.has(referenceKey)) {
     throw new UnsupportedFunctionalityError({
-      functionality: `recursive JSON Schema reference: ${reference}`,
+      functionality: `${recursiveReferenceFunctionalityPrefix} ${reference}`,
       message:
         'Google schema conversion does not support recursive JSON Schema references.',
     });

package/src/google-prepare-tools.ts

@@ -3,10 +3,25 @@ import {
   type LanguageModelV3CallOptions,
   type SharedV3Warning,
 } from '@ai-sdk/provider';
-import { convertJSONSchemaToOpenAPISchema } from './convert-json-schema-to-openapi-schema';
+import {
+  convertJSONSchemaToOpenAPISchema,
+  isRecursiveJSONSchemaReferenceError,
+} from './convert-json-schema-to-openapi-schema';
 import type { GoogleGenerativeAIModelId } from './google-generative-ai-options';
 import { getGoogleModelCapabilities } from './google-model-capabilities';
 
+type FunctionTool = Extract<
+  NonNullable<LanguageModelV3CallOptions['tools']>[number],
+  { type: 'function' }
+>;
+
+type GoogleFunctionDeclaration = {
+  name: string;
+  description: string;
+  parameters?: unknown;
+  parametersJsonSchema?: unknown;
+};
+
 export function prepareTools({
   tools,
   toolChoice,
@@ -21,11 +36,7 @@ export function prepareTools({
   tools:
     | Array<
         | {
-            functionDeclarations: Array<{
-              name: string;
-              description: string;
-              parameters: unknown;
-            }>;
+            functionDeclarations: GoogleFunctionDeclaration[];
           }
         | Record<string, any>
       >
@@ -172,18 +183,10 @@ export function prepareTools({
     });
 
     if (hasFunctionTools && usesGemini3Features && googleTools.length > 0) {
-      const functionDeclarations: Array<{
-        name: string;
-        description: string;
-        parameters: unknown;
-      }> = [];
+      const functionDeclarations: GoogleFunctionDeclaration[] = [];
       for (const tool of tools) {
         if (tool.type === 'function') {
-          functionDeclarations.push({
-            name: tool.name,
-            description: tool.description ?? '',
-            parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema),
-          });
+          functionDeclarations.push(prepareFunctionDeclaration(tool));
         }
       }
 
@@ -238,11 +241,7 @@ export function prepareTools({
   for (const tool of tools) {
     switch (tool.type) {
       case 'function':
-        functionDeclarations.push({
-          name: tool.name,
-          description: tool.description ?? '',
-          parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema),
-        });
+        functionDeclarations.push(prepareFunctionDeclaration(tool));
         if (tool.strict === true) {
           hasStrictTools = true;
         }
@@ -314,3 +313,28 @@ export function prepareTools({
     }
   }
 }
+
+function prepareFunctionDeclaration(
+  tool: FunctionTool,
+): GoogleFunctionDeclaration {
+  const declaration = {
+    name: tool.name,
+    description: tool.description ?? '',
+  };
+
+  try {
+    return {
+      ...declaration,
+      parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema),
+    };
+  } catch (error) {
+    if (!isRecursiveJSONSchemaReferenceError(error)) {
+      throw error;
+    }
+
+    return {
+      ...declaration,
+      parametersJsonSchema: tool.inputSchema,
+    };
+  }
+}