@ai-sdk/google 3.0.0-beta.70 → 3.0.0-beta.72

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ai-sdk/google
 
+## 3.0.0-beta.72
+
+### Patch Changes
+
+- ee8cd23: fix(vertex): allow 'vertex' as a key for providerOptions
+
+## 3.0.0-beta.71
+
+### Patch Changes
+
+- 49e2b6a: fix(google): return request as object
+
 ## 3.0.0-beta.70
 
 ### Patch Changes

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(src_exports);
 var import_provider_utils13 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.0-beta.70" : "0.0.0-test";
+var VERSION = true ? "3.0.0-beta.72" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -862,11 +862,19 @@ var GoogleGenerativeAILanguageModel = class {
   }) {
     var _a;
     const warnings = [];
-    const googleOptions = await (0, import_provider_utils6.parseProviderOptions)({
-      provider: "google",
+    const providerOptionsName = this.config.provider.includes("vertex") ? "vertex" : "google";
+    let googleOptions = await (0, import_provider_utils6.parseProviderOptions)({
+      provider: providerOptionsName,
       providerOptions,
       schema: googleGenerativeAIProviderOptions
     });
+    if (googleOptions == null && providerOptionsName !== "google") {
+      googleOptions = await (0, import_provider_utils6.parseProviderOptions)({
+        provider: "google",
+        providerOptions,
+        schema: googleGenerativeAIProviderOptions
+      });
+    }
     if ((tools == null ? void 0 : tools.some(
       (tool) => tool.type === "provider" && tool.id === "google.vertex_rag_store"
     )) && !this.config.provider.startsWith("google.vertex.")) {
@@ -928,13 +936,13 @@ var GoogleGenerativeAILanguageModel = class {
         cachedContent: googleOptions == null ? void 0 : googleOptions.cachedContent,
         labels: googleOptions == null ? void 0 : googleOptions.labels
       },
-      warnings: [...warnings, ...toolWarnings]
+      warnings: [...warnings, ...toolWarnings],
+      providerOptionsName
     };
   }
   async doGenerate(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { args, warnings } = await this.getArgs(options);
-    const body = JSON.stringify(args);
+    const { args, warnings, providerOptionsName } = await this.getArgs(options);
     const mergedHeaders = (0, import_provider_utils6.combineHeaders)(
       await (0, import_provider_utils6.resolve)(this.config.headers),
       options.headers
@@ -986,7 +994,11 @@ var GoogleGenerativeAILanguageModel = class {
         content.push({
           type: part.thought === true ? "reasoning" : "text",
           text: part.text,
-          providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
+          providerMetadata: part.thoughtSignature ? {
+            [providerOptionsName]: {
+              thoughtSignature: part.thoughtSignature
+            }
+          } : void 0
         });
       } else if ("functionCall" in part) {
         content.push({
@@ -994,14 +1006,22 @@ var GoogleGenerativeAILanguageModel = class {
           toolCallId: this.config.generateId(),
           toolName: part.functionCall.name,
           input: JSON.stringify(part.functionCall.args),
-          providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
+          providerMetadata: part.thoughtSignature ? {
+            [providerOptionsName]: {
+              thoughtSignature: part.thoughtSignature
+            }
+          } : void 0
         });
       } else if ("inlineData" in part) {
         content.push({
           type: "file",
           data: part.inlineData.data,
           mediaType: part.inlineData.mimeType,
-          providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
+          providerMetadata: part.thoughtSignature ? {
+            [providerOptionsName]: {
+              thoughtSignature: part.thoughtSignature
+            }
+          } : void 0
         });
       }
     }
@@ -1021,7 +1041,7 @@ var GoogleGenerativeAILanguageModel = class {
       usage: convertGoogleGenerativeAIUsage(usageMetadata),
       warnings,
       providerMetadata: {
-        google: {
+        [providerOptionsName]: {
           promptFeedback: (_e = response.promptFeedback) != null ? _e : null,
           groundingMetadata: (_f = candidate.groundingMetadata) != null ? _f : null,
           urlContextMetadata: (_g = candidate.urlContextMetadata) != null ? _g : null,
@@ -1029,7 +1049,7 @@ var GoogleGenerativeAILanguageModel = class {
           usageMetadata: usageMetadata != null ? usageMetadata : null
         }
       },
-      request: { body },
+      request: { body: args },
       response: {
         // TODO timestamp, model id, id
         headers: responseHeaders,
@@ -1038,8 +1058,7 @@ var GoogleGenerativeAILanguageModel = class {
     };
   }
   async doStream(options) {
-    const { args, warnings } = await this.getArgs(options);
-    const body = JSON.stringify(args);
+    const { args, warnings, providerOptionsName } = await this.getArgs(options);
     const headers = (0, import_provider_utils6.combineHeaders)(
       await (0, import_provider_utils6.resolve)(this.config.headers),
       options.headers
@@ -1145,7 +1164,7 @@ var GoogleGenerativeAILanguageModel = class {
                         type: "reasoning-start",
                         id: currentReasoningBlockId,
                         providerMetadata: part.thoughtSignature ? {
-                          google: {
+                          [providerOptionsName]: {
                             thoughtSignature: part.thoughtSignature
                           }
                         } : void 0
@@ -1156,7 +1175,9 @@ var GoogleGenerativeAILanguageModel = class {
                       id: currentReasoningBlockId,
                       delta: part.text,
                       providerMetadata: part.thoughtSignature ? {
-                        google: { thoughtSignature: part.thoughtSignature }
+                        [providerOptionsName]: {
+                          thoughtSignature: part.thoughtSignature
+                        }
                       } : void 0
                     });
                   } else {
@@ -1173,7 +1194,7 @@ var GoogleGenerativeAILanguageModel = class {
                         type: "text-start",
                         id: currentTextBlockId,
                         providerMetadata: part.thoughtSignature ? {
-                          google: {
+                          [providerOptionsName]: {
                             thoughtSignature: part.thoughtSignature
                           }
                         } : void 0
@@ -1184,7 +1205,9 @@ var GoogleGenerativeAILanguageModel = class {
                       id: currentTextBlockId,
                       delta: part.text,
                       providerMetadata: part.thoughtSignature ? {
-                        google: { thoughtSignature: part.thoughtSignature }
+                        [providerOptionsName]: {
+                          thoughtSignature: part.thoughtSignature
+                        }
                       } : void 0
                     });
                   }
@@ -1198,7 +1221,8 @@ var GoogleGenerativeAILanguageModel = class {
               }
               const toolCallDeltas = getToolCallsFromParts({
                 parts: content.parts,
-                generateId: generateId3
+                generateId: generateId3,
+                providerOptionsName
               });
               if (toolCallDeltas != null) {
                 for (const toolCall of toolCallDeltas) {
@@ -1236,7 +1260,7 @@ var GoogleGenerativeAILanguageModel = class {
                 hasToolCalls
               });
               providerMetadata = {
-                google: {
+                [providerOptionsName]: {
                   promptFeedback: (_d = value.promptFeedback) != null ? _d : null,
                   groundingMetadata: (_e = candidate.groundingMetadata) != null ? _e : null,
                   urlContextMetadata: (_f = candidate.urlContextMetadata) != null ? _f : null,
@@ -1244,7 +1268,7 @@ var GoogleGenerativeAILanguageModel = class {
                 }
               };
               if (usageMetadata != null) {
-                providerMetadata.google.usageMetadata = usageMetadata;
+                providerMetadata[providerOptionsName].usageMetadata = usageMetadata;
               }
             }
           },
@@ -1271,13 +1295,14 @@ var GoogleGenerativeAILanguageModel = class {
         })
       ),
       response: { headers: responseHeaders },
-      request: { body }
+      request: { body: args }
     };
   }
 };
 function getToolCallsFromParts({
   parts,
-  generateId: generateId3
+  generateId: generateId3,
+  providerOptionsName
 }) {
   const functionCallParts = parts == null ? void 0 : parts.filter(
     (part) => "functionCall" in part
@@ -1287,7 +1312,11 @@ function getToolCallsFromParts({
     toolCallId: generateId3(),
     toolName: part.functionCall.name,
     args: JSON.stringify(part.functionCall.args),
-    providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
+    providerMetadata: part.thoughtSignature ? {
+      [providerOptionsName]: {
+        thoughtSignature: part.thoughtSignature
+      }
+    } : void 0
   }));
 }
 function extractSources({