@ai-sdk/google 3.0.123 → 3.0.124

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @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

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.123" : "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
       }