@matthewdunbar/amazon-bedrock-mantle 2.0.30 → 2.0.31

package/dist/index.d.mts

@@ -275,6 +275,11 @@ interface OpenAICompatibleProviderSettings {
      * The AWS session token to use for request signing. Defaults to `AWS_SESSION_TOKEN`.
      */
     sessionToken?: string;
+    /**
+     * The AWS shared profile name to load credentials from (e.g. `default`, `dev`).
+     * Falls back to `AWS_PROFILE` when not provided.
+     */
+    profile?: string;
     /**
      * Optional async credentials provider used for request signing.
      */

package/dist/index.d.ts

@@ -275,6 +275,11 @@ interface OpenAICompatibleProviderSettings {
      * The AWS session token to use for request signing. Defaults to `AWS_SESSION_TOKEN`.
      */
     sessionToken?: string;
+    /**
+     * The AWS shared profile name to load credentials from (e.g. `default`, `dev`).
+     * Falls back to `AWS_PROFILE` when not provided.
+     */
+    profile?: string;
     /**
      * Optional async credentials provider used for request signing.
      */

package/dist/index.js

@@ -648,7 +648,7 @@ var OpenAICompatibleChatLanguageModel = class {
     let usage = void 0;
     let isFirstChunk = true;
     const providerOptionsName = this.providerOptionsName;
-    const shouldTerminateOnFinishReason = providerOptionsName.includes("bedrock") && !this.config.includeUsage;
+    const shouldTerminateOnFinishReason = providerOptionsName.includes("bedrock");
     let isActiveReasoning = false;
     let isActiveText = false;
     let hasFinished = false;
@@ -1772,8 +1772,132 @@ function prepareBodyString(body) {
   return JSON.stringify(body);
 }
 
+// src/load-aws-profile-credentials.ts
+var import_promises = require("fs/promises");
+var import_node_os = require("os");
+var import_node_path = require("path");
+var import_node_child_process = require("child_process");
+var import_node_util = require("util");
+var execFileAsync = (0, import_node_util.promisify)(import_node_child_process.execFile);
+async function loadAwsProfileCredentials({
+  profile,
+  credentialsFilePath,
+  configFilePath
+}) {
+  var _a, _b, _c;
+  const sharedCredentialsPath = (_a = credentialsFilePath != null ? credentialsFilePath : process.env.AWS_SHARED_CREDENTIALS_FILE) != null ? _a : (0, import_node_path.join)((0, import_node_os.homedir)(), ".aws", "credentials");
+  const sharedConfigPath = (_b = configFilePath != null ? configFilePath : process.env.AWS_CONFIG_FILE) != null ? _b : (0, import_node_path.join)((0, import_node_os.homedir)(), ".aws", "config");
+  const [credentialsIni, configIni] = await Promise.all([
+    readIniFile(sharedCredentialsPath),
+    readIniFile(sharedConfigPath)
+  ]);
+  const credentialsSection = credentialsIni == null ? void 0 : credentialsIni[profile];
+  const configSection = configIni == null ? void 0 : configIni[profile === "default" ? "default" : `profile ${profile}`];
+  if (credentialsSection == null && configSection == null) {
+    return loadCredentialsViaAwsCli(profile);
+  }
+  const accessKeyId = credentialsSection == null ? void 0 : credentialsSection.aws_access_key_id;
+  const secretAccessKey = credentialsSection == null ? void 0 : credentialsSection.aws_secret_access_key;
+  if (accessKeyId == null || secretAccessKey == null) {
+    return loadCredentialsViaAwsCli(profile);
+  }
+  const sessionToken = credentialsSection == null ? void 0 : credentialsSection.aws_session_token;
+  const region = (_c = credentialsSection == null ? void 0 : credentialsSection.region) != null ? _c : configSection == null ? void 0 : configSection.region;
+  return {
+    accessKeyId,
+    secretAccessKey,
+    sessionToken,
+    region
+  };
+}
+async function loadCredentialsViaAwsCli(profile) {
+  try {
+    const { stdout } = await execFileAsync(
+      "aws",
+      [
+        "configure",
+        "export-credentials",
+        "--profile",
+        profile,
+        "--format",
+        "process"
+      ],
+      {
+        timeout: 5e3
+      }
+    );
+    const parsed = parseProcessCredentials(stdout);
+    if (parsed == null) {
+      return void 0;
+    }
+    return {
+      accessKeyId: parsed.accessKeyId,
+      secretAccessKey: parsed.secretAccessKey,
+      sessionToken: parsed.sessionToken
+    };
+  } catch (e) {
+    return void 0;
+  }
+}
+function parseProcessCredentials(value) {
+  try {
+    const parsed = JSON.parse(value);
+    if (parsed.AccessKeyId == null || parsed.SecretAccessKey == null) {
+      return void 0;
+    }
+    return {
+      accessKeyId: parsed.AccessKeyId,
+      secretAccessKey: parsed.SecretAccessKey,
+      sessionToken: parsed.SessionToken
+    };
+  } catch (e) {
+    return void 0;
+  }
+}
+async function readIniFile(filePath) {
+  try {
+    const contents = await (0, import_promises.readFile)(filePath, "utf8");
+    return parseIni(contents);
+  } catch (error) {
+    if (error != null && typeof error === "object" && "code" in error && error.code === "ENOENT") {
+      return void 0;
+    }
+    throw error;
+  }
+}
+function parseIni(contents) {
+  var _a;
+  const sections = {};
+  let currentSection;
+  for (const rawLine of contents.split(/\r?\n/u)) {
+    const line = rawLine.trim();
+    if (line.length === 0 || line.startsWith("#") || line.startsWith(";")) {
+      continue;
+    }
+    if (line.startsWith("[") && line.endsWith("]")) {
+      currentSection = line.slice(1, -1).trim();
+      (_a = sections[currentSection]) != null ? _a : sections[currentSection] = {};
+      continue;
+    }
+    if (currentSection == null) {
+      continue;
+    }
+    const delimiterIndex = line.indexOf("=");
+    if (delimiterIndex === -1) {
+      continue;
+    }
+    const key = line.slice(0, delimiterIndex).trim();
+    const value = line.slice(delimiterIndex + 1).trim();
+    if (key.length > 0) {
+      sections[currentSection][key] = value;
+    }
+  }
+  return sections;
+}
+
 // src/openai-compatible-provider.ts
 function createOpenAICompatible(options) {
+  var _a;
   const baseURL = (0, import_provider_utils7.withoutTrailingSlash)(options.baseURL);
   const providerName = options.name;
   const headers = {
@@ -1783,10 +1907,18 @@ function createOpenAICompatible(options) {
   const hasAuthorizationHeader = Object.keys(headers).some(
     (key) => key.toLowerCase() === "authorization"
   );
+  const profile = (_a = options.profile) != null ? _a : (0, import_provider_utils7.loadOptionalSetting)({
+    settingValue: options.profile,
+    environmentVariableName: "AWS_PROFILE"
+  });
+  const profileCredentialsPromise = profile == null ? void 0 : loadAwsProfileCredentials({
+    profile
+  });
   const getHeaders = () => (0, import_provider_utils7.withUserAgentSuffix)(headers, `ai-sdk/openai-compatible/${VERSION}`);
   const sigV4Fetch = createMantleSigV4FetchFunction(async () => {
-    var _a;
-    const resolvedRegion = (_a = options.region) != null ? _a : (0, import_provider_utils7.loadSetting)({
+    var _a2, _b, _c, _d, _e, _f, _g, _h;
+    const profileCredentials = await profileCredentialsPromise;
+    const resolvedRegion = (_b = (_a2 = options.region) != null ? _a2 : profileCredentials == null ? void 0 : profileCredentials.region) != null ? _b : (0, import_provider_utils7.loadSetting)({
       settingValue: options.region,
       settingName: "region",
       environmentVariableName: "AWS_REGION",
@@ -1801,19 +1933,19 @@ function createOpenAICompatible(options) {
     }
     return {
       region: resolvedRegion,
-      accessKeyId: (0, import_provider_utils7.loadSetting)({
+      accessKeyId: (_d = (_c = options.accessKeyId) != null ? _c : profileCredentials == null ? void 0 : profileCredentials.accessKeyId) != null ? _d : (0, import_provider_utils7.loadSetting)({
         settingValue: options.accessKeyId,
         settingName: "accessKeyId",
         environmentVariableName: "AWS_ACCESS_KEY_ID",
         description: "AWS access key ID"
       }),
-      secretAccessKey: (0, import_provider_utils7.loadSetting)({
+      secretAccessKey: (_f = (_e = options.secretAccessKey) != null ? _e : profileCredentials == null ? void 0 : profileCredentials.secretAccessKey) != null ? _f : (0, import_provider_utils7.loadSetting)({
         settingValue: options.secretAccessKey,
         settingName: "secretAccessKey",
         environmentVariableName: "AWS_SECRET_ACCESS_KEY",
         description: "AWS secret access key"
       }),
-      sessionToken: (0, import_provider_utils7.loadOptionalSetting)({
+      sessionToken: (_h = (_g = options.sessionToken) != null ? _g : profileCredentials == null ? void 0 : profileCredentials.sessionToken) != null ? _h : (0, import_provider_utils7.loadOptionalSetting)({
         settingValue: options.sessionToken,
         environmentVariableName: "AWS_SESSION_TOKEN"
       })