@matthewdunbar/amazon-bedrock-mantle 2.0.30 → 2.0.32

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

@@ -617,7 +617,97 @@ var OpenAICompatibleChatLanguageModel = class {
     };
   }
   async doStream(options) {
-    var _a;
+    var _a, _b, _c;
+    const shouldUseNonStreamingUsageFallback = this.providerOptionsName.includes("bedrock") && ((_a = this.config.includeUsage) != null ? _a : false);
+    if (shouldUseNonStreamingUsageFallback) {
+      const generateResult = await this.doGenerate(options);
+      const finishReason2 = this.config.legacyStringFinishReason ? generateResult.finishReason.unified : generateResult.finishReason;
+      return {
+        stream: new ReadableStream({
+          start(controller) {
+            controller.enqueue({
+              type: "stream-start",
+              warnings: generateResult.warnings
+            });
+            if (generateResult.response != null) {
+              controller.enqueue({
+                type: "response-metadata",
+                id: generateResult.response.id,
+                timestamp: generateResult.response.timestamp,
+                modelId: generateResult.response.modelId
+              });
+            }
+            let textIndex = 0;
+            let reasoningIndex = 0;
+            for (const contentPart of generateResult.content) {
+              switch (contentPart.type) {
+                case "text": {
+                  const id = `txt-${textIndex++}`;
+                  controller.enqueue({ type: "text-start", id });
+                  controller.enqueue({
+                    type: "text-delta",
+                    id,
+                    delta: contentPart.text
+                  });
+                  controller.enqueue({ type: "text-end", id });
+                  break;
+                }
+                case "reasoning": {
+                  const id = `reasoning-${reasoningIndex++}`;
+                  controller.enqueue({ type: "reasoning-start", id });
+                  controller.enqueue({
+                    type: "reasoning-delta",
+                    id,
+                    delta: contentPart.text,
+                    ...contentPart.providerMetadata != null ? { providerMetadata: contentPart.providerMetadata } : {}
+                  });
+                  controller.enqueue({ type: "reasoning-end", id });
+                  break;
+                }
+                case "tool-call": {
+                  controller.enqueue({
+                    type: "tool-input-start",
+                    id: contentPart.toolCallId,
+                    toolName: contentPart.toolName,
+                    ...contentPart.providerMetadata != null ? { providerMetadata: contentPart.providerMetadata } : {}
+                  });
+                  if (contentPart.input.length > 0) {
+                    controller.enqueue({
+                      type: "tool-input-delta",
+                      id: contentPart.toolCallId,
+                      delta: contentPart.input,
+                      ...contentPart.providerMetadata != null ? { providerMetadata: contentPart.providerMetadata } : {}
+                    });
+                  }
+                  controller.enqueue({
+                    type: "tool-input-end",
+                    id: contentPart.toolCallId,
+                    ...contentPart.providerMetadata != null ? { providerMetadata: contentPart.providerMetadata } : {}
+                  });
+                  controller.enqueue(contentPart);
+                  break;
+                }
+                case "tool-result":
+                case "tool-approval-request":
+                case "source":
+                case "file":
+                  controller.enqueue(contentPart);
+                  break;
+              }
+            }
+            controller.enqueue({
+              type: "finish",
+              finishReason: finishReason2,
+              usage: generateResult.usage,
+              ...generateResult.providerMetadata != null ? { providerMetadata: generateResult.providerMetadata } : {}
+            });
+            controller.close();
+          }
+        }),
+        request: generateResult.request,
+        response: generateResult.response == null ? void 0 : { headers: generateResult.response.headers }
+      };
+    }
     const { args, warnings } = await this.getArgs({ ...options });
     const body = this.transformRequestBody({
       ...args,
@@ -625,7 +715,7 @@ var OpenAICompatibleChatLanguageModel = class {
       // only include stream_options when in strict compatibility mode:
       stream_options: this.config.includeUsage ? { include_usage: true } : void 0
     });
-    const metadataExtractor = (_a = this.config.metadataExtractor) == null ? void 0 : _a.createStreamExtractor();
+    const metadataExtractor = (_b = this.config.metadataExtractor) == null ? void 0 : _b.createStreamExtractor();
     const { responseHeaders, value: response } = await (0, import_provider_utils2.postJsonToApi)({
       url: this.config.url({
         path: "/chat/completions",
@@ -648,12 +738,32 @@ 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");
+    const includeUsage = (_c = this.config.includeUsage) != null ? _c : false;
     let isActiveReasoning = false;
     let isActiveText = false;
     let hasFinished = false;
+    let hasSeenFinishReason = false;
+    let forcedFinishTimer;
+    const clearForcedFinishTimer = () => {
+      if (forcedFinishTimer == null) {
+        return;
+      }
+      clearTimeout(forcedFinishTimer);
+      forcedFinishTimer = void 0;
+    };
+    const scheduleForcedFinish = (controller) => {
+      clearForcedFinishTimer();
+      forcedFinishTimer = setTimeout(() => {
+        if (hasFinished) {
+          return;
+        }
+        emitFinish(controller);
+        controller.terminate();
+      }, 750);
+    };
     const emitFinish = (controller) => {
-      var _a2, _b, _c, _d, _e;
+      var _a2, _b2, _c2, _d, _e;
       if (hasFinished) {
         return;
       }
@@ -690,8 +800,8 @@ var OpenAICompatibleChatLanguageModel = class {
         [providerOptionsName]: {},
         ...metadataExtractor == null ? void 0 : metadataExtractor.buildMetadata()
       };
-      if (((_b = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _b.accepted_prediction_tokens) != null) {
-        providerMetadata[providerOptionsName].acceptedPredictionTokens = (_c = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _c.accepted_prediction_tokens;
+      if (((_b2 = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _b2.accepted_prediction_tokens) != null) {
+        providerMetadata[providerOptionsName].acceptedPredictionTokens = (_c2 = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _c2.accepted_prediction_tokens;
       }
       if (((_d = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _d.rejected_prediction_tokens) != null) {
         providerMetadata[providerOptionsName].rejectedPredictionTokens = (_e = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _e.rejected_prediction_tokens;
@@ -712,7 +822,7 @@ var OpenAICompatibleChatLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+            var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -740,17 +850,28 @@ var OpenAICompatibleChatLanguageModel = class {
             }
             if (value.usage != null) {
               usage = value.usage;
+              if (shouldTerminateOnFinishReason && hasSeenFinishReason && !hasFinished) {
+                clearForcedFinishTimer();
+                emitFinish(controller);
+                controller.terminate();
+                return;
+              }
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
+              hasSeenFinishReason = true;
               finishReason = {
                 unified: mapOpenAICompatibleFinishReason(choice.finish_reason),
                 raw: (_a2 = choice.finish_reason) != null ? _a2 : void 0
               };
               if (shouldTerminateOnFinishReason) {
-                emitFinish(controller);
-                controller.terminate();
-                return;
+                if (!includeUsage || usage != null) {
+                  clearForcedFinishTimer();
+                  emitFinish(controller);
+                  controller.terminate();
+                  return;
+                }
+                scheduleForcedFinish(controller);
               }
             }
             if ((choice == null ? void 0 : choice.delta) == null) {
@@ -799,7 +920,7 @@ var OpenAICompatibleChatLanguageModel = class {
                 isActiveReasoning = false;
               }
               for (const toolCallDelta of delta.tool_calls) {
-                const index = (_b = toolCallDelta.index) != null ? _b : toolCalls.length;
+                const index = (_b2 = toolCallDelta.index) != null ? _b2 : toolCalls.length;
                 if (toolCalls[index] == null) {
                   if (toolCallDelta.id == null) {
                     throw new import_provider3.InvalidResponseDataError({
@@ -807,7 +928,7 @@ var OpenAICompatibleChatLanguageModel = class {
                       message: `Expected 'id' to be a string.`
                     });
                   }
-                  if (((_c = toolCallDelta.function) == null ? void 0 : _c.name) == null) {
+                  if (((_c2 = toolCallDelta.function) == null ? void 0 : _c2.name) == null) {
                     throw new import_provider3.InvalidResponseDataError({
                       data: toolCallDelta,
                       message: `Expected 'function.name' to be a string.`
@@ -896,6 +1017,7 @@ var OpenAICompatibleChatLanguageModel = class {
             }
           },
           flush(controller) {
+            clearForcedFinishTimer();
             emitFinish(controller);
           }
         })
@@ -1705,7 +1827,7 @@ var import_provider_utils6 = require("@ai-sdk/provider-utils");
 var import_aws4fetch = require("aws4fetch");
 
 // src/version.ts
-var VERSION = true ? "2.0.30" : "0.0.0-test";
+var VERSION = true ? "2.0.32" : "0.0.0-test";
 
 // src/bedrock-mantle-sigv4-fetch.ts
 function createMantleSigV4FetchFunction(getCredentials, fetch = globalThis.fetch) {
@@ -1772,8 +1894,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 +2029,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 +2055,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"
       })