@ai-sdk/google 3.0.122 → 3.0.124

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ai-sdk/google
 
+## 3.0.124
+
+### Patch Changes
+
+- 9548d8e: fix(google): ignore default prompt block reasons in non-streaming responses
+
+## 3.0.123
+
+### Patch Changes
+
+- c36c87c: fix(google): preserve prompt feedback and metadata across streaming chunks
+
 ## 3.0.122
 
 ### Patch Changes

package/dist/index.js

@@ -235,7 +235,7 @@ var googleInteractionsTranscriptionResponseSchema = import_v43.z.object({
 var import_provider_utils24 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.122" : "0.0.0-test";
+var VERSION = true ? "3.0.124" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider2 = require("@ai-sdk/provider");
@@ -2056,7 +2056,7 @@ var GoogleGenerativeAILanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
     const { args, warnings, providerOptionsName, extraHeaders } = await this.getArgs(options);
     const mergedHeaders = (0, import_provider_utils7.combineHeaders)(
       await (0, import_provider_utils7.resolve)(this.config.headers),
@@ -2080,15 +2080,18 @@ var GoogleGenerativeAILanguageModel = class {
     });
     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 confirmedPromptBlockReason = isConfirmedPromptBlockReason(
+      promptBlockReason
+    ) ? promptBlockReason : void 0;
+    const isPromptBlocked = (candidate == null ? void 0 : candidate.finishReason) == null && confirmedPromptBlockReason != null;
+    const rawFinishReason = (_c = candidate == null ? void 0 : candidate.finishReason) != null ? _c : confirmedPromptBlockReason;
     const content = [];
-    const parts = (_f = (_e = candidate == null ? void 0 : candidate.content) == null ? void 0 : _e.parts) != null ? _f : [];
+    const parts = (_e = (_d = candidate == null ? void 0 : candidate.content) == null ? void 0 : _d.parts) != null ? _e : [];
     const usageMetadata = response.usageMetadata;
     let lastCodeExecutionToolCallId;
     let lastServerToolCallId;
     for (const part of parts) {
-      if ("executableCode" in part && ((_g = part.executableCode) == null ? void 0 : _g.code)) {
+      if ("executableCode" in part && ((_f = part.executableCode) == null ? void 0 : _f.code)) {
         const toolCallId = this.config.generateId();
         lastCodeExecutionToolCallId = toolCallId;
         content.push({
@@ -2106,7 +2109,7 @@ var GoogleGenerativeAILanguageModel = class {
           toolName: "code_execution",
           result: {
             outcome: part.codeExecutionResult.outcome,
-            output: (_h = part.codeExecutionResult.output) != null ? _h : ""
+            output: (_g = part.codeExecutionResult.output) != null ? _g : ""
           }
         });
       } else if ("text" in part && part.text != null) {
@@ -2130,9 +2133,9 @@ var GoogleGenerativeAILanguageModel = class {
       } else if ("functionCall" in part && part.functionCall.name != null) {
         content.push({
           type: "tool-call",
-          toolCallId: (_i = part.functionCall.id) != null ? _i : this.config.generateId(),
+          toolCallId: (_h = part.functionCall.id) != null ? _h : this.config.generateId(),
           toolName: part.functionCall.name,
-          input: JSON.stringify((_j = part.functionCall.args) != null ? _j : {}),
+          input: JSON.stringify((_i = part.functionCall.args) != null ? _i : {}),
           providerMetadata: part.thoughtSignature ? {
             [providerOptionsName]: {
               thoughtSignature: part.thoughtSignature
@@ -2154,13 +2157,13 @@ var GoogleGenerativeAILanguageModel = class {
           } : void 0
         });
       } else if ("toolCall" in part && part.toolCall) {
-        const toolCallId = (_k = part.toolCall.id) != null ? _k : this.config.generateId();
+        const toolCallId = (_j = part.toolCall.id) != null ? _j : this.config.generateId();
         lastServerToolCallId = toolCallId;
         content.push({
           type: "tool-call",
           toolCallId,
           toolName: `server:${part.toolCall.toolType}`,
-          input: JSON.stringify((_l = part.toolCall.args) != null ? _l : {}),
+          input: JSON.stringify((_k = part.toolCall.args) != null ? _k : {}),
           providerExecuted: true,
           dynamic: true,
           providerMetadata: part.thoughtSignature ? {
@@ -2177,12 +2180,12 @@ var GoogleGenerativeAILanguageModel = class {
           }
         });
       } else if ("toolResponse" in part && part.toolResponse) {
-        const responseToolCallId = (_m = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _m : this.config.generateId();
+        const responseToolCallId = (_l = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _l : this.config.generateId();
         content.push({
           type: "tool-result",
           toolCallId: responseToolCallId,
           toolName: `server:${part.toolResponse.toolType}`,
-          result: (_n = part.toolResponse.response) != null ? _n : {},
+          result: (_m = part.toolResponse.response) != null ? _m : {},
           providerMetadata: part.thoughtSignature ? {
             [providerOptionsName]: {
               thoughtSignature: part.thoughtSignature,
@@ -2199,10 +2202,10 @@ var GoogleGenerativeAILanguageModel = class {
         lastServerToolCallId = void 0;
       }
     }
-    const sources = (_o = extractSources({
+    const sources = (_n = extractSources({
       groundingMetadata: candidate == null ? void 0 : candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _o : [];
+    })) != null ? _n : [];
     for (const source of sources) {
       content.push(source);
     }
@@ -2222,19 +2225,19 @@ var GoogleGenerativeAILanguageModel = class {
       warnings,
       providerMetadata: {
         [providerOptionsName]: {
-          promptFeedback: (_p = response.promptFeedback) != null ? _p : null,
-          groundingMetadata: (_q = candidate == null ? void 0 : candidate.groundingMetadata) != null ? _q : null,
-          urlContextMetadata: (_r = candidate == null ? void 0 : candidate.urlContextMetadata) != null ? _r : null,
-          safetyRatings: (_s = candidate == null ? void 0 : candidate.safetyRatings) != null ? _s : null,
+          promptFeedback: (_o = response.promptFeedback) != null ? _o : null,
+          groundingMetadata: (_p = candidate == null ? void 0 : candidate.groundingMetadata) != null ? _p : null,
+          urlContextMetadata: (_q = candidate == null ? void 0 : candidate.urlContextMetadata) != null ? _q : null,
+          safetyRatings: (_r = candidate == null ? void 0 : candidate.safetyRatings) != null ? _r : null,
           usageMetadata: usageMetadata != null ? usageMetadata : null,
-          finishMessage: (_t = candidate == null ? void 0 : candidate.finishMessage) != null ? _t : null,
-          serviceTier: (_u = usageMetadata == null ? void 0 : usageMetadata.serviceTier) != null ? _u : null
+          finishMessage: (_s = candidate == null ? void 0 : candidate.finishMessage) != null ? _s : null,
+          serviceTier: (_t = usageMetadata == null ? void 0 : usageMetadata.serviceTier) != null ? _t : null
         }
       },
       request: { body: args },
       response: {
         // TODO timestamp, model id
-        id: (_v = response.responseId) != null ? _v : void 0,
+        id: (_u = response.responseId) != null ? _u : void 0,
         headers: responseHeaders,
         body: rawResponse
       }
@@ -2263,9 +2266,12 @@ var GoogleGenerativeAILanguageModel = class {
       raw: void 0
     };
     let usage = void 0;
-    let providerMetadata = void 0;
+    let promptFeedback = null;
     let lastGroundingMetadata = null;
     let lastUrlContextMetadata = null;
+    let lastSafetyRatings = null;
+    let lastFinishMessage = null;
+    let confirmedPromptBlockReason;
     const generateId3 = this.config.generateId;
     let hasToolCalls = false;
     let hasEmittedResponseMetadata = false;
@@ -2311,7 +2317,7 @@ var GoogleGenerativeAILanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -2331,35 +2337,35 @@ var GoogleGenerativeAILanguageModel = class {
             if (usageMetadata != null) {
               usage = usageMetadata;
             }
-            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) {
+            if (value.promptFeedback != null && confirmedPromptBlockReason == null) {
+              promptFeedback = value.promptFeedback;
+              if (isConfirmedPromptBlockReason(value.promptFeedback.blockReason)) {
+                confirmedPromptBlockReason = value.promptFeedback.blockReason;
                 finishReason = {
                   unified: "content-filter",
-                  raw: promptBlockReason2
-                };
-                providerMetadata = {
-                  [providerOptionsName]: {
-                    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
-                  }
+                  raw: confirmedPromptBlockReason
                 };
               }
-              return;
             }
-            const content = candidate.content;
-            if (candidate.groundingMetadata != null) {
-              lastGroundingMetadata = candidate.groundingMetadata;
+            const candidate = (_a = value.candidates) == null ? void 0 : _a[0];
+            if (candidate != null) {
+              if (candidate.groundingMetadata != null) {
+                lastGroundingMetadata = candidate.groundingMetadata;
+              }
+              if (candidate.urlContextMetadata != null) {
+                lastUrlContextMetadata = candidate.urlContextMetadata;
+              }
+              if (candidate.safetyRatings != null) {
+                lastSafetyRatings = candidate.safetyRatings;
+              }
+              if (candidate.finishMessage != null) {
+                lastFinishMessage = candidate.finishMessage;
+              }
             }
-            if (candidate.urlContextMetadata != null) {
-              lastUrlContextMetadata = candidate.urlContextMetadata;
+            if (confirmedPromptBlockReason != null || candidate == null) {
+              return;
             }
+            const content = candidate.content;
             const sources = extractSources({
               groundingMetadata: candidate.groundingMetadata,
               generateId: generateId3
@@ -2373,9 +2379,9 @@ var GoogleGenerativeAILanguageModel = class {
               }
             }
             if (content != null) {
-              const parts = (_e = content.parts) != null ? _e : [];
+              const parts = (_b = content.parts) != null ? _b : [];
               for (const part of parts) {
-                if ("executableCode" in part && ((_f = part.executableCode) == null ? void 0 : _f.code)) {
+                if ("executableCode" in part && ((_c = part.executableCode) == null ? void 0 : _c.code)) {
                   const toolCallId = generateId3();
                   lastCodeExecutionToolCallId = toolCallId;
                   controller.enqueue({
@@ -2394,7 +2400,7 @@ var GoogleGenerativeAILanguageModel = class {
                       toolName: "code_execution",
                       result: {
                         outcome: part.codeExecutionResult.outcome,
-                        output: (_g = part.codeExecutionResult.output) != null ? _g : ""
+                        output: (_d = part.codeExecutionResult.output) != null ? _d : ""
                       }
                     });
                   }
@@ -2488,7 +2494,7 @@ var GoogleGenerativeAILanguageModel = class {
                     providerMetadata: fileMeta
                   });
                 } else if ("toolCall" in part && part.toolCall) {
-                  const toolCallId = (_h = part.toolCall.id) != null ? _h : generateId3();
+                  const toolCallId = (_e = part.toolCall.id) != null ? _e : generateId3();
                   lastServerToolCallId = toolCallId;
                   const serverMeta = {
                     [providerOptionsName]: {
@@ -2501,13 +2507,13 @@ var GoogleGenerativeAILanguageModel = class {
                     type: "tool-call",
                     toolCallId,
                     toolName: `server:${part.toolCall.toolType}`,
-                    input: JSON.stringify((_i = part.toolCall.args) != null ? _i : {}),
+                    input: JSON.stringify((_f = part.toolCall.args) != null ? _f : {}),
                     providerExecuted: true,
                     dynamic: true,
                     providerMetadata: serverMeta
                   });
                 } else if ("toolResponse" in part && part.toolResponse) {
-                  const responseToolCallId = (_j = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _j : generateId3();
+                  const responseToolCallId = (_g = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _g : generateId3();
                   const serverMeta = {
                     [providerOptionsName]: {
                       ...part.thoughtSignature ? { thoughtSignature: part.thoughtSignature } : {},
@@ -2519,7 +2525,7 @@ var GoogleGenerativeAILanguageModel = class {
                     type: "tool-result",
                     toolCallId: responseToolCallId,
                     toolName: `server:${part.toolResponse.toolType}`,
-                    result: (_k = part.toolResponse.response) != null ? _k : {},
+                    result: (_h = part.toolResponse.response) != null ? _h : {},
                     providerMetadata: serverMeta
                   });
                   lastServerToolCallId = void 0;
@@ -2538,7 +2544,7 @@ var GoogleGenerativeAILanguageModel = class {
                 const isNoArgsCompleteCall = part.functionCall.name != null && part.functionCall.args == null && part.functionCall.partialArgs == null && part.functionCall.willContinue !== true;
                 if (isStreamingChunk) {
                   if (part.functionCall.name != null) {
-                    const toolCallId = (_l = part.functionCall.id) != null ? _l : generateId3();
+                    const toolCallId = (_i = part.functionCall.id) != null ? _i : generateId3();
                     const accumulator = new GoogleJSONAccumulator();
                     activeStreamingToolCalls.push({
                       toolCallId,
@@ -2586,9 +2592,9 @@ var GoogleGenerativeAILanguageModel = class {
                 } else if (isTerminalChunk && activeStreamingToolCalls.length > 0) {
                   finishActiveStreamingToolCall(controller);
                 } else if (isCompleteCall) {
-                  const toolCallId = (_m = part.functionCall.id) != null ? _m : generateId3();
+                  const toolCallId = (_j = part.functionCall.id) != null ? _j : generateId3();
                   const toolName = part.functionCall.name;
-                  const args2 = typeof part.functionCall.args === "string" ? part.functionCall.args : JSON.stringify((_n = part.functionCall.args) != null ? _n : {});
+                  const args2 = typeof part.functionCall.args === "string" ? part.functionCall.args : JSON.stringify((_k = part.functionCall.args) != null ? _k : {});
                   controller.enqueue({
                     type: "tool-input-start",
                     id: toolCallId,
@@ -2615,7 +2621,7 @@ var GoogleGenerativeAILanguageModel = class {
                   });
                   hasToolCalls = true;
                 } else if (isNoArgsCompleteCall) {
-                  const toolCallId = (_o = part.functionCall.id) != null ? _o : generateId3();
+                  const toolCallId = (_l = part.functionCall.id) != null ? _l : generateId3();
                   const toolName = part.functionCall.name;
                   controller.enqueue({
                     type: "tool-input-start",
@@ -2639,31 +2645,18 @@ var GoogleGenerativeAILanguageModel = class {
                 }
               }
             }
-            const promptBlockReason = (_p = value.promptFeedback) == null ? void 0 : _p.blockReason;
-            const isPromptBlocked = candidate.finishReason == null && promptBlockReason != null;
-            const rawFinishReason = (_r = (_q = candidate.finishReason) != null ? _q : promptBlockReason) != null ? _r : void 0;
-            if (rawFinishReason != null) {
+            if (candidate.finishReason != null) {
               finishReason = {
-                unified: isPromptBlocked ? "content-filter" : mapGoogleGenerativeAIFinishReason({
-                  finishReason: rawFinishReason,
+                unified: mapGoogleGenerativeAIFinishReason({
+                  finishReason: candidate.finishReason,
                   hasToolCalls
                 }),
-                raw: rawFinishReason
-              };
-              providerMetadata = {
-                [providerOptionsName]: {
-                  promptFeedback: (_s = value.promptFeedback) != null ? _s : null,
-                  groundingMetadata: lastGroundingMetadata,
-                  urlContextMetadata: lastUrlContextMetadata,
-                  safetyRatings: (_t = candidate.safetyRatings) != null ? _t : null,
-                  usageMetadata: usageMetadata != null ? usageMetadata : null,
-                  finishMessage: (_u = candidate.finishMessage) != null ? _u : null,
-                  serviceTier: (_v = usage == null ? void 0 : usage.serviceTier) != null ? _v : null
-                }
+                raw: candidate.finishReason
               };
             }
           },
           flush(controller) {
+            var _a;
             if (currentTextBlockId !== null) {
               controller.enqueue({
                 type: "text-end",
@@ -2680,7 +2673,17 @@ var GoogleGenerativeAILanguageModel = class {
               type: "finish",
               finishReason,
               usage: convertGoogleGenerativeAIUsage(usage),
-              providerMetadata
+              providerMetadata: {
+                [providerOptionsName]: {
+                  promptFeedback,
+                  groundingMetadata: lastGroundingMetadata,
+                  urlContextMetadata: lastUrlContextMetadata,
+                  safetyRatings: lastSafetyRatings,
+                  usageMetadata: usage != null ? usage : null,
+                  finishMessage: lastFinishMessage,
+                  serviceTier: (_a = usage == null ? void 0 : usage.serviceTier) != null ? _a : null
+                }
+              }
             });
           }
         })
@@ -2977,6 +2980,9 @@ var chunkSchema = (0, import_provider_utils7.lazySchema)(
     })
   )
 );
+function isConfirmedPromptBlockReason(blockReason) {
+  return blockReason != null && blockReason !== "" && blockReason !== "BLOCK_REASON_UNSPECIFIED" && blockReason !== "BLOCKED_REASON_UNSPECIFIED";
+}
 
 // src/tool/code-execution.ts
 var import_provider_utils8 = require("@ai-sdk/provider-utils");