@ai-sdk/google 4.0.54 → 4.0.56

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/google
 
+## 4.0.56
+
+### Patch Changes
+
+- 3ad9da9: Preserve complete Google Generative Language usage metadata in raw usage results.
+- e9bc618: Omit unsupported frequency and presence penalties from Gemini 2.5 requests and return warnings instead.
+
+## 4.0.55
+
+### Patch Changes
+
+- 56d492f: Surface prompt-level Google safety blocks without candidates as content-filter results with prompt feedback metadata.
+
 ## 4.0.54
 
 ### Patch Changes

package/dist/index.d.ts

@@ -56,7 +56,8 @@ declare const googleLanguageModelOptions: _ai_sdk_provider_utils.LazySchema<{
 type GoogleLanguageModelOptions = InferSchema<typeof googleLanguageModelOptions>;
 
 declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
-    candidates: {
+    responseId?: string | null | undefined;
+    candidates?: {
         content?: Record<string, never> | {
             parts?: ({
                 functionCall: {
@@ -172,21 +173,34 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
                 urlRetrievalStatus: string;
             }[] | null | undefined;
         } | null | undefined;
-    }[];
-    responseId?: string | null | undefined;
+    }[] | null | undefined;
     usageMetadata?: {
+        [x: string]: unknown;
         cachedContentTokenCount?: number | null | undefined;
         thoughtsTokenCount?: number | null | undefined;
         promptTokenCount?: number | null | undefined;
         candidatesTokenCount?: number | null | undefined;
+        toolUsePromptTokenCount?: number | null | undefined;
         totalTokenCount?: number | null | undefined;
         trafficType?: string | null | undefined;
         serviceTier?: string | null | undefined;
         promptTokensDetails?: {
+            [x: string]: unknown;
+            modality: string;
+            tokenCount: number;
+        }[] | null | undefined;
+        cacheTokensDetails?: {
+            [x: string]: unknown;
             modality: string;
             tokenCount: number;
         }[] | null | undefined;
         candidatesTokensDetails?: {
+            [x: string]: unknown;
+            modality: string;
+            tokenCount: number;
+        }[] | null | undefined;
+        toolUsePromptTokensDetails?: {
+            [x: string]: unknown;
             modality: string;
             tokenCount: number;
         }[] | null | undefined;
@@ -203,9 +217,10 @@ declare const responseSchema: _ai_sdk_provider_utils.LazySchema<{
         }[] | null | undefined;
     } | null | undefined;
 }>;
-type GroundingMetadataSchema = NonNullable<InferSchema<typeof responseSchema>['candidates'][number]['groundingMetadata']>;
-type UrlContextMetadataSchema = NonNullable<InferSchema<typeof responseSchema>['candidates'][number]['urlContextMetadata']>;
-type SafetyRatingSchema = NonNullable<InferSchema<typeof responseSchema>['candidates'][number]['safetyRatings']>[number];
+type CandidateSchema = NonNullable<InferSchema<typeof responseSchema>['candidates']>[number];
+type GroundingMetadataSchema = NonNullable<CandidateSchema['groundingMetadata']>;
+type UrlContextMetadataSchema = NonNullable<CandidateSchema['urlContextMetadata']>;
+type SafetyRatingSchema = NonNullable<CandidateSchema['safetyRatings']>[number];
 type PromptFeedbackSchema = NonNullable<InferSchema<typeof responseSchema>['promptFeedback']>;
 type UsageMetadataSchema = NonNullable<InferSchema<typeof responseSchema>['usageMetadata']>;
 

package/dist/index.js

@@ -7,7 +7,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "4.0.54" : "0.0.0-test";
+var VERSION = true ? "4.0.56" : "0.0.0-test";
 
 // src/google-embedding-model.ts
 import {
@@ -1806,6 +1806,7 @@ var configurableSafetySettingCategories = [
   "HARM_CATEGORY_HARASSMENT",
   "HARM_CATEGORY_SEXUALLY_EXPLICIT"
 ];
+var gemini25ModelPattern2 = /(^|\/)gemini-2\.5(?:[.-]|$)/i;
 var GoogleLanguageModel = class _GoogleLanguageModel {
   constructor(modelId, config) {
     this.specificationVersion = "v4";
@@ -1923,6 +1924,19 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
       }
     }
     const isGemmaModel = this.modelId.toLowerCase().startsWith("gemma-");
+    const isGemini25DeveloperApiModel = !isVertexProvider && gemini25ModelPattern2.test(this.modelId);
+    if (isGemini25DeveloperApiModel && frequencyPenalty != null) {
+      warnings.push({
+        type: "unsupported",
+        feature: "frequencyPenalty"
+      });
+    }
+    if (isGemini25DeveloperApiModel && presencePenalty != null) {
+      warnings.push({
+        type: "unsupported",
+        feature: "presencePenalty"
+      });
+    }
     const { usesGemini3Features } = getGoogleModelCapabilities(this.modelId);
     const { contents, systemInstruction } = convertToGoogleMessages(prompt, {
       isGemmaModel,
@@ -1974,8 +1988,8 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           temperature,
           topK,
           topP,
-          frequencyPenalty,
-          presencePenalty,
+          frequencyPenalty: isGemini25DeveloperApiModel ? void 0 : frequencyPenalty,
+          presencePenalty: isGemini25DeveloperApiModel ? void 0 : presencePenalty,
           stopSequences,
           seed,
           // response format:
@@ -2014,18 +2028,21 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
     warnings,
     providerOptionsNames
   }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     const wrapProviderMetadata = (payload) => Object.fromEntries(
       providerOptionsNames.map((name) => [name, payload])
     );
-    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 rawFinishReason = (_d = (_c = candidate == null ? void 0 : candidate.finishReason) != null ? _c : promptBlockReason) != null ? _d : void 0;
     const content = [];
-    const parts = (_b = (_a = candidate.content) == null ? void 0 : _a.parts) != null ? _b : [];
+    const parts = (_f = (_e = candidate == null ? void 0 : candidate.content) == null ? void 0 : _e.parts) != null ? _f : [];
     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)) {
+      if ("executableCode" in part && ((_g = part.executableCode) == null ? void 0 : _g.code)) {
         const toolCallId = this.config.generateId();
         lastCodeExecutionToolCallId = toolCallId;
         content.push({
@@ -2043,7 +2060,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           toolName: "code_execution",
           result: {
             outcome: part.codeExecutionResult.outcome,
-            output: (_d = part.codeExecutionResult.output) != null ? _d : ""
+            output: (_h = part.codeExecutionResult.output) != null ? _h : ""
           }
         });
       } else if ("text" in part && part.text != null) {
@@ -2067,7 +2084,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           type: "tool-call",
           toolCallId: part.functionCall.id || this.config.generateId(),
           toolName: part.functionCall.name,
-          input: JSON.stringify((_e = part.functionCall.args) != null ? _e : {}),
+          input: JSON.stringify((_i = part.functionCall.args) != null ? _i : {}),
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
             thoughtSignature: part.thoughtSignature
           }) : void 0
@@ -2090,7 +2107,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           type: "tool-call",
           toolCallId,
           toolName: `server:${part.toolCall.toolType}`,
-          input: JSON.stringify((_f = part.toolCall.args) != null ? _f : {}),
+          input: JSON.stringify((_j = part.toolCall.args) != null ? _j : {}),
           providerExecuted: true,
           dynamic: true,
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
@@ -2108,7 +2125,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           type: "tool-result",
           toolCallId: responseToolCallId,
           toolName: `server:${part.toolResponse.toolType}`,
-          result: (_g = part.toolResponse.response) != null ? _g : {},
+          result: (_k = part.toolResponse.response) != null ? _k : {},
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
             thoughtSignature: part.thoughtSignature,
             serverToolCallId: responseToolCallId,
@@ -2121,39 +2138,39 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
         lastServerToolCallId = void 0;
       }
     }
-    const sources = (_h = extractSources({
-      groundingMetadata: candidate.groundingMetadata,
+    const sources = (_l = extractSources({
+      groundingMetadata: candidate == null ? void 0 : candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _h : [];
+    })) != null ? _l : [];
     for (const source of sources) {
       content.push(source);
     }
     return {
       content,
       finishReason: {
-        unified: mapGoogleFinishReason({
-          finishReason: candidate.finishReason,
+        unified: isPromptBlocked ? "content-filter" : mapGoogleFinishReason({
+          finishReason: rawFinishReason,
           // Only count client-executed tool calls for finish reason determination.
           hasToolCalls: content.some(
             (part) => part.type === "tool-call" && !part.providerExecuted
           )
         }),
-        raw: (_i = candidate.finishReason) != null ? _i : void 0
+        raw: rawFinishReason
       },
       usage: convertGoogleUsage(usageMetadata),
       warnings,
       providerMetadata: wrapProviderMetadata({
-        promptFeedback: (_j = response.promptFeedback) != null ? _j : null,
-        groundingMetadata: (_k = candidate.groundingMetadata) != null ? _k : null,
-        urlContextMetadata: (_l = candidate.urlContextMetadata) != null ? _l : null,
-        safetyRatings: (_m = candidate.safetyRatings) != null ? _m : 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,
         usageMetadata: usageMetadata != null ? usageMetadata : null,
-        finishMessage: (_n = candidate.finishMessage) != null ? _n : null,
-        serviceTier: (_o = usageMetadata == null ? void 0 : usageMetadata.serviceTier) != null ? _o : null
+        finishMessage: (_q = candidate == null ? void 0 : candidate.finishMessage) != null ? _q : null,
+        serviceTier: (_r = usageMetadata == null ? void 0 : usageMetadata.serviceTier) != null ? _r : null
       }),
       response: {
         // TODO timestamp, model id
-        id: (_p = response.responseId) != null ? _p : void 0
+        id: (_s = response.responseId) != null ? _s : void 0
       }
     };
   }
@@ -2268,7 +2285,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            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, _q;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -2290,6 +2307,22 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
             }
             const candidate = (_a = value.candidates) == null ? void 0 : _a[0];
             if (candidate == null) {
+              const promptBlockReason2 = (_b = value.promptFeedback) == null ? void 0 : _b.blockReason;
+              if (promptBlockReason2 != null) {
+                finishReason = {
+                  unified: "content-filter",
+                  raw: promptBlockReason2
+                };
+                providerMetadata = wrapProviderMetadata({
+                  promptFeedback: (_c = value.promptFeedback) != null ? _c : null,
+                  groundingMetadata: lastGroundingMetadata,
+                  urlContextMetadata: lastUrlContextMetadata,
+                  safetyRatings: null,
+                  usageMetadata: usageMetadata != null ? usageMetadata : null,
+                  finishMessage: null,
+                  serviceTier: (_d = usage == null ? void 0 : usage.serviceTier) != null ? _d : null
+                });
+              }
               return;
             }
             const content = candidate.content;
@@ -2312,9 +2345,9 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
               }
             }
             if (content != null) {
-              const parts = (_b = content.parts) != null ? _b : [];
+              const parts = (_e = content.parts) != null ? _e : [];
               for (const part of parts) {
-                if ("executableCode" in part && ((_c = part.executableCode) == null ? void 0 : _c.code)) {
+                if ("executableCode" in part && ((_f = part.executableCode) == null ? void 0 : _f.code)) {
                   const toolCallId = generateId4();
                   lastCodeExecutionToolCallId = toolCallId;
                   controller.enqueue({
@@ -2333,7 +2366,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                       toolName: "code_execution",
                       result: {
                         outcome: part.codeExecutionResult.outcome,
-                        output: (_d = part.codeExecutionResult.output) != null ? _d : ""
+                        output: (_g = part.codeExecutionResult.output) != null ? _g : ""
                       }
                     });
                   }
@@ -2433,7 +2466,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                     type: "tool-call",
                     toolCallId,
                     toolName: `server:${part.toolCall.toolType}`,
-                    input: JSON.stringify((_e = part.toolCall.args) != null ? _e : {}),
+                    input: JSON.stringify((_h = part.toolCall.args) != null ? _h : {}),
                     providerExecuted: true,
                     dynamic: true,
                     providerMetadata: serverMeta
@@ -2449,7 +2482,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                     type: "tool-result",
                     toolCallId: responseToolCallId,
                     toolName: `server:${part.toolResponse.toolType}`,
-                    result: (_f = part.toolResponse.response) != null ? _f : {},
+                    result: (_i = part.toolResponse.response) != null ? _i : {},
                     providerMetadata: serverMeta
                   });
                   lastServerToolCallId = void 0;
@@ -2516,7 +2549,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                 } else if (isCompleteCall) {
                   const toolCallId = part.functionCall.id || generateId4();
                   const toolName = part.functionCall.name;
-                  const args2 = typeof part.functionCall.args === "string" ? part.functionCall.args : JSON.stringify((_g = part.functionCall.args) != null ? _g : {});
+                  const args2 = typeof part.functionCall.args === "string" ? part.functionCall.args : JSON.stringify((_j = part.functionCall.args) != null ? _j : {});
                   controller.enqueue({
                     type: "tool-input-start",
                     id: toolCallId,
@@ -2567,22 +2600,25 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                 }
               }
             }
-            if (candidate.finishReason != null) {
+            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 = {
-                unified: mapGoogleFinishReason({
-                  finishReason: candidate.finishReason,
+                unified: isPromptBlocked ? "content-filter" : mapGoogleFinishReason({
+                  finishReason: rawFinishReason,
                   hasToolCalls
                 }),
-                raw: candidate.finishReason
+                raw: rawFinishReason
               };
               providerMetadata = wrapProviderMetadata({
-                promptFeedback: (_h = value.promptFeedback) != null ? _h : null,
+                promptFeedback: (_n = value.promptFeedback) != null ? _n : null,
                 groundingMetadata: lastGroundingMetadata,
                 urlContextMetadata: lastUrlContextMetadata,
-                safetyRatings: (_i = candidate.safetyRatings) != null ? _i : null,
+                safetyRatings: (_o = candidate.safetyRatings) != null ? _o : null,
                 usageMetadata: usageMetadata != null ? usageMetadata : null,
-                finishMessage: (_j = candidate.finishMessage) != null ? _j : null,
-                serviceTier: (_k = usage == null ? void 0 : usage.serviceTier) != null ? _k : null
+                finishMessage: (_p = candidate.finishMessage) != null ? _p : null,
+                serviceTier: (_q = usage == null ? void 0 : usage.serviceTier) != null ? _q : null
               });
             }
           },
@@ -2914,21 +2950,24 @@ var tokenDetailsSchema = z5.array(
   z5.object({
     modality: z5.string(),
     tokenCount: z5.number()
-  })
+  }).loose()
 ).nullish();
 var usageSchema = z5.object({
   cachedContentTokenCount: z5.number().nullish(),
   thoughtsTokenCount: z5.number().nullish(),
   promptTokenCount: z5.number().nullish(),
   candidatesTokenCount: z5.number().nullish(),
+  toolUsePromptTokenCount: z5.number().nullish(),
   totalTokenCount: z5.number().nullish(),
   // https://cloud.google.com/vertex-ai/generative-ai/docs/reference/rest/v1/GenerateContentResponse#TrafficType
   trafficType: z5.string().nullish(),
   serviceTier: z5.string().nullish(),
   // https://ai.google.dev/api/generate-content#Modality
   promptTokensDetails: tokenDetailsSchema,
-  candidatesTokensDetails: tokenDetailsSchema
-});
+  cacheTokensDetails: tokenDetailsSchema,
+  candidatesTokensDetails: tokenDetailsSchema,
+  toolUsePromptTokensDetails: tokenDetailsSchema
+}).loose();
 var getUrlContextMetadataSchema = () => z5.object({
   urlMetadata: z5.array(
     z5.object({
@@ -2950,7 +2989,7 @@ var responseSchema = lazySchema5(
           groundingMetadata: getGroundingMetadataSchema().nullish(),
           urlContextMetadata: getUrlContextMetadataSchema().nullish()
         })
-      ),
+      ).nullish(),
       usageMetadata: usageSchema.nullish(),
       promptFeedback: z5.object({
         blockReason: z5.string().nullish(),