@ai-sdk/google 2.0.90 → 2.0.94

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @ai-sdk/google
 
+## 2.0.94
+
+### Patch Changes
+
+- c43ba7d: Surface prompt-level Google safety blocks without candidates as content-filter results with prompt feedback metadata.
+- 7a292cd: Omit unsupported frequency and presence penalties from Gemini 2.5 requests and return warnings instead.
+
+## 2.0.93
+
+### Patch Changes
+
+- a3fe2a8: fix(google): convert enum values to the Gemini schema format
+
+## 2.0.92
+
+### Patch Changes
+
+- Updated dependencies [77d33c0]
+  - @ai-sdk/provider-utils@3.0.35
+
+## 2.0.91
+
+### Patch Changes
+
+- b616db6: Preserve recursive tool input schemas without aborting Google model calls.
+- Updated dependencies [2fff9f1]
+- Updated dependencies [f364ea0]
+  - @ai-sdk/provider-utils@3.0.34
+
 ## 2.0.90
 
 ### Patch Changes

package/dist/index.d.mts

@@ -51,7 +51,7 @@ declare const googleGenerativeAIProviderOptions: _ai_sdk_provider_utils.LazySche
 type GoogleGenerativeAIProviderOptions = InferValidator<typeof googleGenerativeAIProviderOptions>;
 
 declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
-    candidates: {
+    candidates?: {
         content?: Record<string, never> | {
             parts?: ({
                 functionCall: {
@@ -141,7 +141,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
                 urlRetrievalStatus: string;
             }[];
         } | null | undefined;
-    }[];
+    }[] | null | undefined;
     usageMetadata?: {
         cachedContentTokenCount?: number | null | undefined;
         thoughtsTokenCount?: number | null | undefined;
@@ -171,9 +171,10 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
     } | null | undefined;
     serviceTier?: string | null | undefined;
 }>;
-type GroundingMetadataSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['groundingMetadata']>;
-type UrlContextMetadataSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['urlContextMetadata']>;
-type SafetyRatingSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['safetyRatings']>[number];
+type CandidateSchema = NonNullable<InferValidator<typeof responseSchema>['candidates']>[number];
+type GroundingMetadataSchema = NonNullable<CandidateSchema['groundingMetadata']>;
+type UrlContextMetadataSchema = NonNullable<CandidateSchema['urlContextMetadata']>;
+type SafetyRatingSchema = NonNullable<CandidateSchema['safetyRatings']>[number];
 
 type GoogleGenerativeAIGroundingMetadata = GroundingMetadataSchema;
 type GoogleGenerativeAIUrlContextMetadata = UrlContextMetadataSchema;

package/dist/index.d.ts

@@ -51,7 +51,7 @@ declare const googleGenerativeAIProviderOptions: _ai_sdk_provider_utils.LazySche
 type GoogleGenerativeAIProviderOptions = InferValidator<typeof googleGenerativeAIProviderOptions>;
 
 declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
-    candidates: {
+    candidates?: {
         content?: Record<string, never> | {
             parts?: ({
                 functionCall: {
@@ -141,7 +141,7 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
                 urlRetrievalStatus: string;
             }[];
         } | null | undefined;
-    }[];
+    }[] | null | undefined;
     usageMetadata?: {
         cachedContentTokenCount?: number | null | undefined;
         thoughtsTokenCount?: number | null | undefined;
@@ -171,9 +171,10 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
     } | null | undefined;
     serviceTier?: string | null | undefined;
 }>;
-type GroundingMetadataSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['groundingMetadata']>;
-type UrlContextMetadataSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['urlContextMetadata']>;
-type SafetyRatingSchema = NonNullable<InferValidator<typeof responseSchema>['candidates'][number]['safetyRatings']>[number];
+type CandidateSchema = NonNullable<InferValidator<typeof responseSchema>['candidates']>[number];
+type GroundingMetadataSchema = NonNullable<CandidateSchema['groundingMetadata']>;
+type UrlContextMetadataSchema = NonNullable<CandidateSchema['urlContextMetadata']>;
+type SafetyRatingSchema = NonNullable<CandidateSchema['safetyRatings']>[number];
 
 type GoogleGenerativeAIGroundingMetadata = GroundingMetadataSchema;
 type GoogleGenerativeAIUrlContextMetadata = UrlContextMetadataSchema;

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(index_exports);
 var import_provider_utils15 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "2.0.90" : "0.0.0-test";
+var VERSION = true ? "2.0.94" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -243,6 +243,10 @@ var import_v45 = require("zod/v4");
 
 // src/convert-json-schema-to-openapi-schema.ts
 var import_provider2 = require("@ai-sdk/provider");
+var recursiveReferenceFunctionalityPrefix = "recursive JSON Schema reference:";
+function isRecursiveJSONSchemaReferenceError(error) {
+  return import_provider2.UnsupportedFunctionalityError.isInstance(error) && error.functionality.startsWith(recursiveReferenceFunctionalityPrefix);
+}
 function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
   const rootSchema = typeof jsonSchema === "object" ? jsonSchema : void 0;
   return convertJSONSchemaDefinition(jsonSchema, isRoot, {
@@ -293,9 +297,6 @@ function convertJSONSchemaDefinition(jsonSchema, isRoot, referenceContext) {
   if (description) result.description = description;
   if (required) result.required = required;
   if (format) result.format = format;
-  if (constValue !== void 0) {
-    result.enum = [constValue];
-  }
   if (type) {
     if (Array.isArray(type)) {
       const hasNull = type.includes("null");
@@ -312,8 +313,9 @@ function convertJSONSchemaDefinition(jsonSchema, isRoot, referenceContext) {
       result.type = type;
     }
   }
-  if (enumValues !== void 0) {
-    result.enum = enumValues;
+  const values = enumValues != null ? enumValues : constValue !== void 0 ? [constValue] : void 0;
+  if (values !== void 0) {
+    addEnumToSchema({ values, type, result });
   }
   if (properties != null) {
     result.properties = Object.entries(properties).reduce(
@@ -373,6 +375,68 @@ function convertJSONSchemaDefinition(jsonSchema, isRoot, referenceContext) {
   }
   return result;
 }
+function addEnumToSchema({
+  values,
+  type,
+  result
+}) {
+  const nullable = Array.isArray(type) && type.includes("null") || type === void 0 && values.includes(null);
+  const enumValues = nullable ? values.filter((value) => value !== null) : values;
+  if (values.length > 0 && values.every((value) => value === null)) {
+    const typeAllowsNull = type === void 0 || type === "null" || Array.isArray(type) && type.includes("null");
+    if (typeAllowsNull) {
+      result.type = "null";
+      if (Array.isArray(type)) {
+        delete result.anyOf;
+      }
+      return;
+    }
+  }
+  const enumType = getEnumType({ values: enumValues, type });
+  if (enumType === void 0) {
+    throw new import_provider2.UnsupportedFunctionalityError({
+      functionality: "JSON Schema enum with mixed or unsupported values",
+      message: "Google does not support this JSON Schema enum. Enum values must share one supported primitive type and match the schema type."
+    });
+  }
+  result.type = enumType;
+  if (Array.isArray(type)) {
+    delete result.anyOf;
+  }
+  if (nullable) {
+    result.nullable = true;
+  }
+  if (enumType === "string") {
+    result.enum = enumValues;
+  } else {
+    result.format = "enum";
+    result.enum = enumValues.map(String);
+  }
+}
+function getEnumType({
+  values,
+  type
+}) {
+  if (values.length === 0) {
+    return void 0;
+  }
+  const typeAllows = (enumType) => type === void 0 || type === enumType || Array.isArray(type) && type.includes(enumType);
+  if (typeAllows("string") && values.every((value) => typeof value === "string")) {
+    return "string";
+  }
+  if ((typeAllows("number") || typeAllows("integer")) && values.every((value) => typeof value === "number" && Number.isFinite(value))) {
+    if (typeAllows("number")) {
+      return "number";
+    }
+    if (values.every((value) => Number.isInteger(value))) {
+      return "integer";
+    }
+  }
+  if (typeAllows("boolean") && values.every((value) => typeof value === "boolean")) {
+    return "boolean";
+  }
+  return void 0;
+}
 function convertJSONSchemaReference({
   jsonSchema,
   reference,
@@ -385,7 +449,7 @@ function convertJSONSchemaReference({
   );
   if (referenceContext.resolvingReferences.has(referenceKey)) {
     throw new import_provider2.UnsupportedFunctionalityError({
-      functionality: `recursive JSON Schema reference: ${reference}`,
+      functionality: `${recursiveReferenceFunctionalityPrefix} ${reference}`,
       message: "Google schema conversion does not support recursive JSON Schema references."
     });
   }
@@ -871,7 +935,6 @@ function prepareTools({
   modelId,
   isVertexProvider = false
 }) {
-  var _a, _b;
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
   const { supportsGemini2Tools, supportsFileSearch, usesGemini3Features } = getGoogleModelCapabilities(modelId);
@@ -992,11 +1055,7 @@ function prepareTools({
       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)
-          });
+          functionDeclarations2.push(prepareFunctionDeclaration(tool));
         }
       }
       const combinedToolConfig = {
@@ -1040,11 +1099,7 @@ function prepareTools({
   for (const tool of tools) {
     switch (tool.type) {
       case "function":
-        functionDeclarations.push({
-          name: tool.name,
-          description: (_b = tool.description) != null ? _b : "",
-          parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
-        });
+        functionDeclarations.push(prepareFunctionDeclaration(tool));
         if (tool.strict === true) {
           hasStrictTools = true;
         }
@@ -1108,6 +1163,27 @@ function prepareTools({
     }
   }
 }
+function prepareFunctionDeclaration(tool) {
+  var _a;
+  const declaration = {
+    name: tool.name,
+    description: (_a = tool.description) != null ? _a : ""
+  };
+  try {
+    return {
+      ...declaration,
+      parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
+    };
+  } catch (error) {
+    if (!isRecursiveJSONSchemaReferenceError(error)) {
+      throw error;
+    }
+    return {
+      ...declaration,
+      parametersJsonSchema: tool.inputSchema
+    };
+  }
+}
 
 // src/map-google-generative-ai-finish-reason.ts
 function mapGoogleGenerativeAIFinishReason({
@@ -1143,6 +1219,7 @@ var configurableSafetySettingCategories = [
   "HARM_CATEGORY_HARASSMENT",
   "HARM_CATEGORY_SEXUALLY_EXPLICIT"
 ];
+var gemini25ModelPattern2 = /(^|\/)gemini-2\.5(?:[.-]|$)/i;
 var GoogleGenerativeAILanguageModel = class {
   constructor(modelId, config) {
     this.specificationVersion = "v2";
@@ -1220,6 +1297,19 @@ var GoogleGenerativeAILanguageModel = class {
       threshold: safetyThreshold
     })) : void 0;
     const isGemmaModel = this.modelId.toLowerCase().startsWith("gemma-");
+    const isGemini25DeveloperApiModel = !isVertexProvider && gemini25ModelPattern2.test(this.modelId);
+    if (isGemini25DeveloperApiModel && frequencyPenalty != null) {
+      warnings.push({
+        type: "unsupported-setting",
+        setting: "frequencyPenalty"
+      });
+    }
+    if (isGemini25DeveloperApiModel && presencePenalty != null) {
+      warnings.push({
+        type: "unsupported-setting",
+        setting: "presencePenalty"
+      });
+    }
     const { usesGemini3Features } = getGoogleModelCapabilities(this.modelId);
     const { contents, systemInstruction } = convertToGoogleGenerativeAIMessages(
       prompt,
@@ -1247,8 +1337,8 @@ var GoogleGenerativeAILanguageModel = class {
           temperature,
           topK,
           topP,
-          frequencyPenalty,
-          presencePenalty,
+          frequencyPenalty: isGemini25DeveloperApiModel ? void 0 : frequencyPenalty,
+          presencePenalty: isGemini25DeveloperApiModel ? void 0 : presencePenalty,
           stopSequences,
           seed,
           // response format:
@@ -1284,7 +1374,7 @@ var GoogleGenerativeAILanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const { args, warnings } = await this.getArgs(options);
     const body = JSON.stringify(args);
     const mergedHeaders = (0, import_provider_utils6.combineHeaders)(
@@ -1306,13 +1396,15 @@ var GoogleGenerativeAILanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const candidate = response.candidates[0];
+    const candidate = (_a = response.candidates) == null ? void 0 : _a[0];
+    const promptBlockReason = (_b = response.promptFeedback) == null ? void 0 : _b.blockReason;
+    const isPromptBlocked = (candidate == null ? void 0 : candidate.finishReason) == null && promptBlockReason != null;
     const content = [];
-    const parts = (_b = (_a = candidate.content) == null ? void 0 : _a.parts) != null ? _b : [];
+    const parts = (_d = (_c = candidate == null ? void 0 : candidate.content) == null ? void 0 : _c.parts) != null ? _d : [];
     const usageMetadata = response.usageMetadata;
     let lastCodeExecutionToolCallId;
     for (const part of parts) {
-      if ("executableCode" in part && ((_c = part.executableCode) == null ? void 0 : _c.code)) {
+      if ("executableCode" in part && ((_e = part.executableCode) == null ? void 0 : _e.code)) {
         const toolCallId = this.config.generateId();
         lastCodeExecutionToolCallId = toolCallId;
         content.push({
@@ -1353,7 +1445,7 @@ var GoogleGenerativeAILanguageModel = class {
       } else if ("functionCall" in part) {
         content.push({
           type: "tool-call",
-          toolCallId: (_d = part.functionCall.id) != null ? _d : this.config.generateId(),
+          toolCallId: (_f = part.functionCall.id) != null ? _f : this.config.generateId(),
           toolName: part.functionCall.name,
           input: JSON.stringify(part.functionCall.args),
           providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
@@ -1366,34 +1458,34 @@ var GoogleGenerativeAILanguageModel = class {
         });
       }
     }
-    const sources = (_e = extractSources({
-      groundingMetadata: candidate.groundingMetadata,
+    const sources = (_g = extractSources({
+      groundingMetadata: candidate == null ? void 0 : candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _e : [];
+    })) != null ? _g : [];
     for (const source of sources) {
       content.push(source);
     }
     return {
       content,
-      finishReason: mapGoogleGenerativeAIFinishReason({
-        finishReason: candidate.finishReason,
+      finishReason: isPromptBlocked ? "content-filter" : mapGoogleGenerativeAIFinishReason({
+        finishReason: candidate == null ? void 0 : candidate.finishReason,
         hasToolCalls: content.some((part) => part.type === "tool-call")
       }),
       usage: {
-        inputTokens: (_f = usageMetadata == null ? void 0 : usageMetadata.promptTokenCount) != null ? _f : void 0,
-        outputTokens: (_g = usageMetadata == null ? void 0 : usageMetadata.candidatesTokenCount) != null ? _g : void 0,
-        totalTokens: (_h = usageMetadata == null ? void 0 : usageMetadata.totalTokenCount) != null ? _h : void 0,
-        reasoningTokens: (_i = usageMetadata == null ? void 0 : usageMetadata.thoughtsTokenCount) != null ? _i : void 0,
-        cachedInputTokens: (_j = usageMetadata == null ? void 0 : usageMetadata.cachedContentTokenCount) != null ? _j : void 0
+        inputTokens: (_h = usageMetadata == null ? void 0 : usageMetadata.promptTokenCount) != null ? _h : void 0,
+        outputTokens: (_i = usageMetadata == null ? void 0 : usageMetadata.candidatesTokenCount) != null ? _i : void 0,
+        totalTokens: (_j = usageMetadata == null ? void 0 : usageMetadata.totalTokenCount) != null ? _j : void 0,
+        reasoningTokens: (_k = usageMetadata == null ? void 0 : usageMetadata.thoughtsTokenCount) != null ? _k : void 0,
+        cachedInputTokens: (_l = usageMetadata == null ? void 0 : usageMetadata.cachedContentTokenCount) != null ? _l : void 0
       },
       warnings,
       providerMetadata: {
         google: {
-          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,
-          serviceTier: (_o = response.serviceTier) != null ? _o : null,
+          promptFeedback: (_m = response.promptFeedback) != null ? _m : null,
+          groundingMetadata: (_n = candidate == null ? void 0 : candidate.groundingMetadata) != null ? _n : null,
+          urlContextMetadata: (_o = candidate == null ? void 0 : candidate.urlContextMetadata) != null ? _o : null,
+          safetyRatings: (_p = candidate == null ? void 0 : candidate.safetyRatings) != null ? _p : null,
+          serviceTier: (_q = response.serviceTier) != null ? _q : null,
           usageMetadata: usageMetadata != null ? usageMetadata : null
         }
       },
@@ -1447,7 +1539,7 @@ var GoogleGenerativeAILanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -1469,6 +1561,22 @@ var GoogleGenerativeAILanguageModel = class {
             }
             const candidate = (_f = value.candidates) == null ? void 0 : _f[0];
             if (candidate == null) {
+              const promptBlockReason2 = (_g = value.promptFeedback) == null ? void 0 : _g.blockReason;
+              if (promptBlockReason2 != null) {
+                finishReason = "content-filter";
+                providerMetadata = {
+                  google: {
+                    promptFeedback: (_h = value.promptFeedback) != null ? _h : null,
+                    groundingMetadata: lastGroundingMetadata,
+                    urlContextMetadata: lastUrlContextMetadata,
+                    safetyRatings: null,
+                    serviceTier
+                  }
+                };
+                if (usageMetadata != null) {
+                  providerMetadata.google.usageMetadata = usageMetadata;
+                }
+              }
               return;
             }
             const content = candidate.content;
@@ -1491,9 +1599,9 @@ var GoogleGenerativeAILanguageModel = class {
               }
             }
             if (content != null) {
-              const parts = (_g = content.parts) != null ? _g : [];
+              const parts = (_i = content.parts) != null ? _i : [];
               for (const part of parts) {
-                if ("executableCode" in part && ((_h = part.executableCode) == null ? void 0 : _h.code)) {
+                if ("executableCode" in part && ((_j = part.executableCode) == null ? void 0 : _j.code)) {
                   const toolCallId = generateId3();
                   lastCodeExecutionToolCallId = toolCallId;
                   controller.enqueue({
@@ -1620,17 +1728,20 @@ var GoogleGenerativeAILanguageModel = class {
                 }
               }
             }
-            if (candidate.finishReason != null) {
-              finishReason = mapGoogleGenerativeAIFinishReason({
-                finishReason: candidate.finishReason,
+            const promptBlockReason = (_k = value.promptFeedback) == null ? void 0 : _k.blockReason;
+            const isPromptBlocked = candidate.finishReason == null && promptBlockReason != null;
+            const rawFinishReason = (_m = (_l = candidate.finishReason) != null ? _l : promptBlockReason) != null ? _m : void 0;
+            if (rawFinishReason != null) {
+              finishReason = isPromptBlocked ? "content-filter" : mapGoogleGenerativeAIFinishReason({
+                finishReason: rawFinishReason,
                 hasToolCalls
               });
               providerMetadata = {
                 google: {
-                  promptFeedback: (_i = value.promptFeedback) != null ? _i : null,
+                  promptFeedback: (_n = value.promptFeedback) != null ? _n : null,
                   groundingMetadata: lastGroundingMetadata,
                   urlContextMetadata: lastUrlContextMetadata,
-                  safetyRatings: (_j = candidate.safetyRatings) != null ? _j : null,
+                  safetyRatings: (_o = candidate.safetyRatings) != null ? _o : null,
                   serviceTier
                 }
               };
@@ -1906,7 +2017,7 @@ var responseSchema = (0, import_provider_utils6.lazySchema)(
           groundingMetadata: getGroundingMetadataSchema().nullish(),
           urlContextMetadata: getUrlContextMetadataSchema().nullish()
         })
-      ),
+      ).nullish(),
       usageMetadata: usageSchema.nullish(),
       promptFeedback: import_v45.z.object({
         blockReason: import_v45.z.string().nullish(),