@ai-sdk/amazon-bedrock 3.0.0-beta.6 → 3.0.0-beta.7

package/dist/index.mjs

@@ -1361,10 +1361,28 @@ function prepareBodyString(body) {
     return JSON.stringify(body);
   }
 }
+function createApiKeyFetchFunction(apiKey, fetch = globalThis.fetch) {
+  return async (input, init) => {
+    const originalHeaders = extractHeaders(init == null ? void 0 : init.headers);
+    return fetch(input, {
+      ...init,
+      headers: removeUndefinedEntries(
+        combineHeaders4(originalHeaders, {
+          Authorization: `Bearer ${apiKey}`
+        })
+      )
+    });
+  };
+}
 
 // src/bedrock-provider.ts
 function createAmazonBedrock(options = {}) {
-  const sigv4Fetch = createSigV4FetchFunction(async () => {
+  const rawApiKey = loadOptionalSetting({
+    settingValue: options.apiKey,
+    environmentVariableName: "AWS_BEARER_TOKEN_BEDROCK"
+  });
+  const apiKey = rawApiKey && rawApiKey.trim().length > 0 ? rawApiKey.trim() : void 0;
+  const fetchFunction = apiKey ? createApiKeyFetchFunction(apiKey, options.fetch) : createSigV4FetchFunction(async () => {
     const region = loadSetting({
       settingValue: options.region,
       settingName: "region",
@@ -1372,30 +1390,58 @@ function createAmazonBedrock(options = {}) {
       description: "AWS region"
     });
     if (options.credentialProvider) {
+      try {
+        return {
+          ...await options.credentialProvider(),
+          region
+        };
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        throw new Error(
+          `AWS credential provider failed: ${errorMessage}. Please ensure your credential provider returns valid AWS credentials with accessKeyId and secretAccessKey properties.`
+        );
+      }
+    }
+    try {
       return {
-        ...await options.credentialProvider(),
-        region
+        region,
+        accessKeyId: loadSetting({
+          settingValue: options.accessKeyId,
+          settingName: "accessKeyId",
+          environmentVariableName: "AWS_ACCESS_KEY_ID",
+          description: "AWS access key ID"
+        }),
+        secretAccessKey: loadSetting({
+          settingValue: options.secretAccessKey,
+          settingName: "secretAccessKey",
+          environmentVariableName: "AWS_SECRET_ACCESS_KEY",
+          description: "AWS secret access key"
+        }),
+        sessionToken: loadOptionalSetting({
+          settingValue: options.sessionToken,
+          environmentVariableName: "AWS_SESSION_TOKEN"
+        })
       };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      if (errorMessage.includes("AWS_ACCESS_KEY_ID") || errorMessage.includes("accessKeyId")) {
+        throw new Error(
+          `AWS SigV4 authentication requires AWS credentials. Please provide either:
+1. Set AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables
+2. Provide accessKeyId and secretAccessKey in options
+3. Use a credentialProvider function
+4. Use API key authentication with AWS_BEARER_TOKEN_BEDROCK or apiKey option
+Original error: ${errorMessage}`
+        );
+      }
+      if (errorMessage.includes("AWS_SECRET_ACCESS_KEY") || errorMessage.includes("secretAccessKey")) {
+        throw new Error(
+          `AWS SigV4 authentication requires both AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY. Please ensure both credentials are provided.
+Original error: ${errorMessage}`
+        );
+      }
+      throw error;
     }
-    return {
-      region,
-      accessKeyId: loadSetting({
-        settingValue: options.accessKeyId,
-        settingName: "accessKeyId",
-        environmentVariableName: "AWS_ACCESS_KEY_ID",
-        description: "AWS access key ID"
-      }),
-      secretAccessKey: loadSetting({
-        settingValue: options.secretAccessKey,
-        settingName: "secretAccessKey",
-        environmentVariableName: "AWS_SECRET_ACCESS_KEY",
-        description: "AWS secret access key"
-      }),
-      sessionToken: loadOptionalSetting({
-        settingValue: options.sessionToken,
-        environmentVariableName: "AWS_SESSION_TOKEN"
-      })
-    };
   }, options.fetch);
   const getBaseUrl = () => {
     var _a, _b;
@@ -1413,7 +1459,7 @@ function createAmazonBedrock(options = {}) {
     return new BedrockChatLanguageModel(modelId, {
       baseUrl: getBaseUrl,
       headers: (_a = options.headers) != null ? _a : {},
-      fetch: sigv4Fetch,
+      fetch: fetchFunction,
       generateId
     });
   };
@@ -1430,7 +1476,7 @@ function createAmazonBedrock(options = {}) {
     return new BedrockEmbeddingModel(modelId, {
       baseUrl: getBaseUrl,
       headers: (_a = options.headers) != null ? _a : {},
-      fetch: sigv4Fetch
+      fetch: fetchFunction
     });
   };
   const createImageModel = (modelId) => {
@@ -1438,7 +1484,7 @@ function createAmazonBedrock(options = {}) {
     return new BedrockImageModel(modelId, {
       baseUrl: getBaseUrl,
       headers: (_a = options.headers) != null ? _a : {},
-      fetch: sigv4Fetch
+      fetch: fetchFunction
     });
   };
   provider.languageModel = createChatModel;