add changeset, simplify header merging.

vercel · Nov 30, 2024 · 2f30d44 · 2f30d44
1 parent 58bd1a2
commit 2f30d44
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/.changeset/stupid-trees-unite.md b/.changeset/stupid-trees-unite.md
@@ -0,0 +1,6 @@
+---
+'@ai-sdk/google-vertex': patch
+'@ai-sdk/google': patch
+---
+
+feat (provider/google-vertex): Add support for edge runtime.
diff --git a/packages/google-vertex/package.json b/packages/google-vertex/package.json
@@ -30,6 +30,7 @@
     }
   },
   "dependencies": {
+    "@ai-sdk/google": "1.0.4",
     "@ai-sdk/provider": "1.0.1",
     "@ai-sdk/provider-utils": "2.0.2"
   },
@@ -41,7 +42,6 @@
     "zod": "3.23.8"
   },
   "peerDependencies": {
-    "@ai-sdk/google": "1.0.4",
     "google-auth-library": "^9.15.0",
     "zod": "^3.0.0"
   },

diff --git a/packages/google/package.json b/packages/google/package.json
@@ -32,6 +32,7 @@
     "./internal": {
       "types": "./internal/dist/index.d.ts",
       "import": "./internal/dist/index.mjs",
+      "module": "./internal/dist/index.mjs",
       "require": "./internal/dist/index.js"
     }
   },

diff --git a/packages/google/src/google-generative-ai-embedding-model.ts b/packages/google/src/google-generative-ai-embedding-model.ts
@@ -73,9 +73,11 @@ export class GoogleGenerativeAIEmbeddingModel
     }
 
     const asyncHeaders = this.config.experimental_getHeadersAsync?.();
-    const mergedHeaders = asyncHeaders
-      ? combineHeaders(this.config.headers(), await asyncHeaders, headers)
-      : combineHeaders(this.config.headers(), headers);
+    const mergedHeaders = combineHeaders(
+      this.config.headers(),
+      asyncHeaders ? await asyncHeaders : {},
+      headers,
+    );
 
     const { responseHeaders, value: response } = await postJsonToApi({
       url: `${this.config.baseURL}/models/${this.modelId}:batchEmbedContents`,

diff --git a/packages/google/src/google-generative-ai-language-model.ts b/packages/google/src/google-generative-ai-language-model.ts
@@ -202,13 +202,11 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV1 {
     const body = JSON.stringify(args);
 
     const asyncHeaders = this.config.experimental_getHeadersAsync?.();
-    const mergedHeaders = asyncHeaders
-      ? combineHeaders(
-          this.config.headers(),
-          await asyncHeaders,
-          options.headers,
-        )
-      : combineHeaders(this.config.headers(), options.headers);
+    const mergedHeaders = combineHeaders(
+      this.config.headers(),
+      asyncHeaders ? await asyncHeaders : {},
+      options.headers,
+    );
 
     const { responseHeaders, value: response } = await postJsonToApi({
       url: `${this.config.baseURL}/${getModelPath(
@@ -258,13 +256,11 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV1 {
     const body = JSON.stringify(args);
 
     const asyncHeaders = this.config.experimental_getHeadersAsync?.();
-    const headers = asyncHeaders
-      ? combineHeaders(
-          this.config.headers(),
-          await asyncHeaders,
-          options.headers,
-        )
-      : combineHeaders(this.config.headers(), options.headers);
+    const headers = combineHeaders(
+      this.config.headers(),
+      asyncHeaders ? await asyncHeaders : {},
+      options.headers,
+    );
 
     const { responseHeaders, value: response } = await postJsonToApi({
       url: `${this.config.baseURL}/${getModelPath(