openai 7.4.0 → 7.6.0

package/azure.js

@@ -5,32 +5,35 @@ const tslib_1 = require("./internal/tslib.js");
 const headers_1 = require("./internal/headers.js");
 const Errors = tslib_1.__importStar(require("./error.js"));
 const utils_1 = require("./internal/utils.js");
+const path_1 = require("./internal/utils/path.js");
 const client_1 = require("./client.js");
+const data_residency_1 = require("./internal/data-residency.js");
 /** API Client for interfacing with the Azure OpenAI API. */
 class AzureOpenAI extends client_1.OpenAI {
     /**
      * API Client for interfacing with the Azure OpenAI API.
      *
-     * @param {string | undefined} [opts.apiVersion=process.env['OPENAI_API_VERSION'] ?? undefined]
-     * @param {string | undefined} [opts.endpoint=process.env['AZURE_OPENAI_ENDPOINT'] ?? undefined] - Your Azure endpoint, including the resource, e.g. `https://example-resource.azure.openai.com/`
-     * @param {string | undefined} [opts.apiKey=process.env['AZURE_OPENAI_API_KEY'] ?? undefined]
-     * @param {string | undefined} opts.deployment - A model deployment, if given, sets the base client URL to include `/deployments/{deployment}`.
-     * @param {string | null | undefined} [opts.organization=process.env['OPENAI_ORG_ID'] ?? null]
-     * @param {string} [opts.baseURL=process.env['OPENAI_BASE_URL']] - Sets the base URL for the API, e.g. `https://example-resource.azure.openai.com/openai/`.
-     * @param {number} [opts.timeout=10 minutes] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out.
-     * @param {number} [opts.httpAgent] - An HTTP agent used to manage HTTP(s) connections.
+     * @param {string | undefined} [opts.apiVersion] - Defaults to `process.env['OPENAI_API_VERSION'] ?? undefined`.
+     * @param {string | undefined} [opts.endpoint] - Your Azure endpoint, including the resource, e.g. `https://example-resource.azure.openai.com/`. Defaults to `process.env['AZURE_OPENAI_ENDPOINT'] ?? undefined`.
+     * @param {string | undefined} [opts.apiKey] - Defaults to `process.env['AZURE_OPENAI_API_KEY'] ?? undefined`.
+     * @param {string | undefined} opts.deployment - Azure model deployment inserted into supported deployment-scoped request paths.
+     * @param {string | null | undefined} [opts.organization] - Defaults to `process.env['OPENAI_ORG_ID'] ?? null`.
+     * @param {string} [opts.baseURL] - Sets the base URL for the API, e.g. `https://example-resource.azure.openai.com/openai/`. Defaults to `process.env['OPENAI_BASE_URL']`.
+     * @param {number} [opts.timeout] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out. Defaults to 10 minutes.
+     * @param {() => Promise<string>} [opts.azureADTokenProvider] - Returns a fresh Microsoft Entra access token for each request; cannot be combined with `apiKey`.
      * @param {Fetch} [opts.fetch] - Specify a custom `fetch` function implementation.
-     * @param {number} [opts.maxRetries=2] - The maximum number of times the client will retry a request.
+     * @param {number} [opts.maxRetries] - The maximum number of times the client will retry a request. Defaults to `2`.
      * @param {Headers} opts.defaultHeaders - Default headers to include with every request to the API.
      * @param {DefaultQuery} opts.defaultQuery - Default query parameters to include with every request to the API.
-     * @param {boolean} [opts.dangerouslyAllowBrowser=false] - By default, client-side use of this library is not allowed, as it risks exposing your secret API credentials to attackers.
+     * @param {boolean} [opts.dangerouslyAllowBrowser] - By default, client-side use of this library is not allowed, as it risks exposing your secret API credentials to attackers. Defaults to `false`.
      */
-    constructor({ baseURL = (0, utils_1.readEnv)('OPENAI_BASE_URL'), apiKey = (0, utils_1.readEnv)('AZURE_OPENAI_API_KEY'), apiVersion = (0, utils_1.readEnv)('OPENAI_API_VERSION'), endpoint, deployment, azureADTokenProvider, dangerouslyAllowBrowser, ...opts } = {}) {
+    constructor({ baseURL = (0, utils_1.readEnv)('OPENAI_BASE_URL'), apiKey = (0, utils_1.readEnv)('AZURE_OPENAI_API_KEY'), apiVersion = (0, utils_1.readEnv)('OPENAI_API_VERSION'), endpoint, deployment, azureADTokenProvider, dangerouslyAllowBrowser, dataResidency, ...opts } = {}) {
+        (0, data_residency_1.assertNoDataResidency)(dataResidency, 'AzureOpenAI');
         if (!apiVersion) {
             throw new Errors.OpenAIError("The OPENAI_API_VERSION environment variable is missing or empty; either provide it, or instantiate the AzureOpenAI client with an apiVersion option, like new AzureOpenAI({ apiVersion: 'My API Version' }).");
         }
         if (typeof azureADTokenProvider === 'function') {
-            dangerouslyAllowBrowser = true;
+            dangerouslyAllowBrowser ?? (dangerouslyAllowBrowser = true);
         }
         if (!azureADTokenProvider && !apiKey) {
             throw new Errors.OpenAIError('Missing credentials. Please pass one of `apiKey` and `azureADTokenProvider`, or set the `AZURE_OPENAI_API_KEY` environment variable.');
@@ -52,21 +55,25 @@ class AzureOpenAI extends client_1.OpenAI {
             }
             baseURL = `${endpoint.slice(0, endpointEnd)}/openai`;
         }
-        else {
-            if (endpoint) {
-                throw new Errors.OpenAIError('baseURL and endpoint are mutually exclusive');
-            }
+        else if (endpoint) {
+            throw new Errors.OpenAIError('baseURL and endpoint are mutually exclusive');
         }
         super({
             apiKey: azureADTokenProvider ?? apiKey,
             baseURL,
             ...opts,
-            ...(dangerouslyAllowBrowser !== undefined ? { dangerouslyAllowBrowser } : {}),
+            ...(dangerouslyAllowBrowser === undefined ? {} : { dangerouslyAllowBrowser }),
         });
+        /** Azure OpenAI API version included in requests made by this client. */
         this.apiVersion = '';
         this.apiVersion = apiVersion;
         this.deploymentName = deployment;
     }
+    /** Clones this client with Azure options; OpenAI data residency remains unsupported. */
+    withOptions(options) {
+        return super.withOptions(options);
+    }
+    /** Builds an Azure request and inserts its deployment into model-scoped endpoint paths. */
     async buildRequest(options, props = {}) {
         if (_deployments_endpoints.has(options.path) && options.method === 'post' && options.body !== undefined) {
             if (!(0, utils_1.isObj)(options.body)) {
@@ -74,10 +81,20 @@ class AzureOpenAI extends client_1.OpenAI {
             }
             const model = this.deploymentName || options.body['model'] || options.__metadata?.['model'];
             if (model !== undefined && !this.baseURL.includes('/deployments')) {
-                options.path = `/deployments/${model}${options.path}`;
+                options.path = (0, path_1.path) `/deployments/${model}` + options.path;
             }
         }
-        return super.buildRequest(options, props);
+        const built = await super.buildRequest(options, props);
+        if (built.req.headers.has('api-key')) {
+            built.req.redirect = 'manual';
+        }
+        return built;
+    }
+    async fetchWithAuth(url, init, timeout, controller, schemes) {
+        if (new Headers(init.headers).has('api-key')) {
+            init.redirect = 'manual';
+        }
+        return super.fetchWithAuth(url, init, timeout, controller, schemes);
     }
     async authHeaders(opts, schemes) {
         const security = schemes ?? { bearerAuth: true, adminAPIKeyAuth: true };

package/azure.js.map

@@ -1 +1 @@
-{"version":3,"file":"azure.js","sourceRoot":"","sources":["src/azure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"azure.js","sourceRoot":"","sources":["src/azure.ts"],"names":[],"mappings":";;;;AAEA,mDAAkD;AAClD,2DAAkC;AAElC,+CAAkD;AAClD,mDAA6C;AAC7C,wCAAkC;AAGlC,iEAAkE;AAgDlE,4DAA4D;AAC5D,MAAa,WAAY,SAAQ,eAAM;IAMrC;;;;;;;;;;;;;;;;OAgBG;IACH,YAAY,EACV,OAAO,GAAG,IAAA,eAAO,EAAC,iBAAiB,CAAC,EACpC,MAAM,GAAG,IAAA,eAAO,EAAC,sBAAsB,CAAC,EACxC,UAAU,GAAG,IAAA,eAAO,EAAC,oBAAoB,CAAC,EAC1C,QAAQ,EACR,UAAU,EACV,oBAAoB,EACpB,uBAAuB,EACvB,aAAa,EACb,GAAG,IAAI,KACe,EAAE;QACxB,IAAA,sCAAqB,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,MAAM,CAAC,WAAW,CAC1B,8MAA8M,CAC/M,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,oBAAoB,KAAK,UAAU,EAAE,CAAC;YAC/C,uBAAuB,KAAvB,uBAAuB,GAAK,IAAI,EAAC;QACnC,CAAC;QAED,IAAI,CAAC,oBAAoB,IAAI,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,IAAI,MAAM,CAAC,WAAW,CAC1B,sIAAsI,CACvI,CAAC;QACJ,CAAC;QAED,IAAI,oBAAoB,IAAI,MAAM,EAAE,CAAC;YACnC,MAAM,IAAI,MAAM,CAAC,WAAW,CAC1B,6GAA6G,CAC9G,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;QAExE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YAClD,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,MAAM,CAAC,WAAW,CAC1B,gHAAgH,CACjH,CAAC;YACJ,CAAC;YAED,IAAI,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC;YAClC,OAAO,WAAW,GAAG,CAAC,IAAI,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC5D,WAAW,EAAE,CAAC;YAChB,CAAC;YACD,OAAO,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC;QACvD,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,MAAM,CAAC,WAAW,CAAC,6CAA6C,CAAC,CAAC;QAC9E,CAAC;QAED,KAAK,CAAC;YACJ,MAAM,EAAE,oBAAoB,IAAI,MAAM;YACtC,OAAO;YACP,GAAG,IAAI;YACP,GAAG,CAAC,uBAAuB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,uBAAuB,EAAE,CAAC;SAC9E,CAAC,CAAC;QAjFL,yEAAyE;QACzE,eAAU,GAAG,EAAE,CAAC;QAkFd,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;IACnC,CAAC;IAED,wFAAwF;IAC/E,WAAW,CAAC,OAAoC;QACvD,OAAO,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,2FAA2F;IAClF,KAAK,CAAC,YAAY,CACzB,OAA4B,EAC5B,QAGI,EAAE;QAYN,IAAI,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACxG,IAAI,CAAC,IAAA,aAAK,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC;YAC5F,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAClE,OAAO,CAAC,IAAI,GAAG,IAAA,WAAI,EAAA,gBAAgB,KAAK,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAC5D,CAAC;QACH,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACvD,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,KAAK,CAAC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEkB,KAAK,CAAC,aAAa,CACpC,GAAgB,EAChB,IAAiB,EACjB,OAAe,EACf,UAA2B,EAC3B,OAA6D;QAE7D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC3B,CAAC;QAED,OAAO,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IAEkB,KAAK,CAAC,WAAW,CAClC,IAAyB,EACzB,OAA6D;QAE7D,MAAM,QAAQ,GAAG,OAAO,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;QACxE,IAAI,QAAQ,CAAC,UAAU,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACpE,OAAO,IAAA,sBAAY,EAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;CACF;AAzJD,kCAyJC;AAED,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACrC,cAAc;IACd,mBAAmB;IACnB,aAAa;IACb,uBAAuB;IACvB,qBAAqB;IACrB,eAAe;IACf,qBAAqB;IACrB,UAAU;IACV,eAAe;CAChB,CAAC,CAAC"}

package/azure.mjs

@@ -1,32 +1,35 @@
 import { buildHeaders } from "./internal/headers.mjs";
 import * as Errors from "./error.mjs";
 import { isObj, readEnv } from "./internal/utils.mjs";
+import { path } from "./internal/utils/path.mjs";
 import { OpenAI } from "./client.mjs";
+import { assertNoDataResidency } from "./internal/data-residency.mjs";
 /** API Client for interfacing with the Azure OpenAI API. */
 export class AzureOpenAI extends OpenAI {
     /**
      * API Client for interfacing with the Azure OpenAI API.
      *
-     * @param {string | undefined} [opts.apiVersion=process.env['OPENAI_API_VERSION'] ?? undefined]
-     * @param {string | undefined} [opts.endpoint=process.env['AZURE_OPENAI_ENDPOINT'] ?? undefined] - Your Azure endpoint, including the resource, e.g. `https://example-resource.azure.openai.com/`
-     * @param {string | undefined} [opts.apiKey=process.env['AZURE_OPENAI_API_KEY'] ?? undefined]
-     * @param {string | undefined} opts.deployment - A model deployment, if given, sets the base client URL to include `/deployments/{deployment}`.
-     * @param {string | null | undefined} [opts.organization=process.env['OPENAI_ORG_ID'] ?? null]
-     * @param {string} [opts.baseURL=process.env['OPENAI_BASE_URL']] - Sets the base URL for the API, e.g. `https://example-resource.azure.openai.com/openai/`.
-     * @param {number} [opts.timeout=10 minutes] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out.
-     * @param {number} [opts.httpAgent] - An HTTP agent used to manage HTTP(s) connections.
+     * @param {string | undefined} [opts.apiVersion] - Defaults to `process.env['OPENAI_API_VERSION'] ?? undefined`.
+     * @param {string | undefined} [opts.endpoint] - Your Azure endpoint, including the resource, e.g. `https://example-resource.azure.openai.com/`. Defaults to `process.env['AZURE_OPENAI_ENDPOINT'] ?? undefined`.
+     * @param {string | undefined} [opts.apiKey] - Defaults to `process.env['AZURE_OPENAI_API_KEY'] ?? undefined`.
+     * @param {string | undefined} opts.deployment - Azure model deployment inserted into supported deployment-scoped request paths.
+     * @param {string | null | undefined} [opts.organization] - Defaults to `process.env['OPENAI_ORG_ID'] ?? null`.
+     * @param {string} [opts.baseURL] - Sets the base URL for the API, e.g. `https://example-resource.azure.openai.com/openai/`. Defaults to `process.env['OPENAI_BASE_URL']`.
+     * @param {number} [opts.timeout] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out. Defaults to 10 minutes.
+     * @param {() => Promise<string>} [opts.azureADTokenProvider] - Returns a fresh Microsoft Entra access token for each request; cannot be combined with `apiKey`.
      * @param {Fetch} [opts.fetch] - Specify a custom `fetch` function implementation.
-     * @param {number} [opts.maxRetries=2] - The maximum number of times the client will retry a request.
+     * @param {number} [opts.maxRetries] - The maximum number of times the client will retry a request. Defaults to `2`.
      * @param {Headers} opts.defaultHeaders - Default headers to include with every request to the API.
      * @param {DefaultQuery} opts.defaultQuery - Default query parameters to include with every request to the API.
-     * @param {boolean} [opts.dangerouslyAllowBrowser=false] - By default, client-side use of this library is not allowed, as it risks exposing your secret API credentials to attackers.
+     * @param {boolean} [opts.dangerouslyAllowBrowser] - By default, client-side use of this library is not allowed, as it risks exposing your secret API credentials to attackers. Defaults to `false`.
      */
-    constructor({ baseURL = readEnv('OPENAI_BASE_URL'), apiKey = readEnv('AZURE_OPENAI_API_KEY'), apiVersion = readEnv('OPENAI_API_VERSION'), endpoint, deployment, azureADTokenProvider, dangerouslyAllowBrowser, ...opts } = {}) {
+    constructor({ baseURL = readEnv('OPENAI_BASE_URL'), apiKey = readEnv('AZURE_OPENAI_API_KEY'), apiVersion = readEnv('OPENAI_API_VERSION'), endpoint, deployment, azureADTokenProvider, dangerouslyAllowBrowser, dataResidency, ...opts } = {}) {
+        assertNoDataResidency(dataResidency, 'AzureOpenAI');
         if (!apiVersion) {
             throw new Errors.OpenAIError("The OPENAI_API_VERSION environment variable is missing or empty; either provide it, or instantiate the AzureOpenAI client with an apiVersion option, like new AzureOpenAI({ apiVersion: 'My API Version' }).");
         }
         if (typeof azureADTokenProvider === 'function') {
-            dangerouslyAllowBrowser = true;
+            dangerouslyAllowBrowser ?? (dangerouslyAllowBrowser = true);
         }
         if (!azureADTokenProvider && !apiKey) {
             throw new Errors.OpenAIError('Missing credentials. Please pass one of `apiKey` and `azureADTokenProvider`, or set the `AZURE_OPENAI_API_KEY` environment variable.');
@@ -48,21 +51,25 @@ export class AzureOpenAI extends OpenAI {
             }
             baseURL = `${endpoint.slice(0, endpointEnd)}/openai`;
         }
-        else {
-            if (endpoint) {
-                throw new Errors.OpenAIError('baseURL and endpoint are mutually exclusive');
-            }
+        else if (endpoint) {
+            throw new Errors.OpenAIError('baseURL and endpoint are mutually exclusive');
         }
         super({
             apiKey: azureADTokenProvider ?? apiKey,
             baseURL,
             ...opts,
-            ...(dangerouslyAllowBrowser !== undefined ? { dangerouslyAllowBrowser } : {}),
+            ...(dangerouslyAllowBrowser === undefined ? {} : { dangerouslyAllowBrowser }),
         });
+        /** Azure OpenAI API version included in requests made by this client. */
         this.apiVersion = '';
         this.apiVersion = apiVersion;
         this.deploymentName = deployment;
     }
+    /** Clones this client with Azure options; OpenAI data residency remains unsupported. */
+    withOptions(options) {
+        return super.withOptions(options);
+    }
+    /** Builds an Azure request and inserts its deployment into model-scoped endpoint paths. */
     async buildRequest(options, props = {}) {
         if (_deployments_endpoints.has(options.path) && options.method === 'post' && options.body !== undefined) {
             if (!isObj(options.body)) {
@@ -70,10 +77,20 @@ export class AzureOpenAI extends OpenAI {
             }
             const model = this.deploymentName || options.body['model'] || options.__metadata?.['model'];
             if (model !== undefined && !this.baseURL.includes('/deployments')) {
-                options.path = `/deployments/${model}${options.path}`;
+                options.path = path `/deployments/${model}` + options.path;
             }
         }
-        return super.buildRequest(options, props);
+        const built = await super.buildRequest(options, props);
+        if (built.req.headers.has('api-key')) {
+            built.req.redirect = 'manual';
+        }
+        return built;
+    }
+    async fetchWithAuth(url, init, timeout, controller, schemes) {
+        if (new Headers(init.headers).has('api-key')) {
+            init.redirect = 'manual';
+        }
+        return super.fetchWithAuth(url, init, timeout, controller, schemes);
     }
     async authHeaders(opts, schemes) {
         const security = schemes ?? { bearerAuth: true, adminAPIKeyAuth: true };

package/azure.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"azure.mjs","sourceRoot":"","sources":["src/azure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"azure.mjs","sourceRoot":"","sources":["src/azure.ts"],"names":[],"mappings":"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"}

package/bedrock.d.mts

@@ -1,8 +1,11 @@
 import { OpenAI } from "./client.mjs";
 import type { ApiKeySetter, ClientOptions } from "./client.mjs";
+import { brand_privateBedrockClient } from "./internal/bedrock.mjs";
+import type { RequestInit } from "./internal/builtin-types.mjs";
 import type { NullableHeaders } from "./internal/headers.mjs";
 import type { FinalRequestOptions } from "./internal/request-options.mjs";
-export interface BedrockClientOptions extends Omit<ClientOptions, 'apiKey' | 'adminAPIKey' | 'baseURL' | 'workloadIdentity'> {
+/** Configures Amazon Bedrock's OpenAI-compatible endpoint and bearer-token authentication. */
+export interface BedrockClientOptions extends Omit<ClientOptions, 'apiKey' | 'adminAPIKey' | 'baseURL' | 'workloadIdentity' | 'x509Transport' | 'dataResidency'> {
     /**
      * Bedrock bearer token used for authentication.
      *
@@ -21,10 +24,14 @@ export interface BedrockClientOptions extends Omit<ClientOptions, 'apiKey' | 'ad
      * BedrockOpenAI only supports Bedrock bearer token authentication.
      */
     adminAPIKey?: never;
+    /** OpenAI data residency cannot be combined with Bedrock routing. */
+    dataResidency?: never;
     /**
      * BedrockOpenAI only supports Bedrock bearer token authentication.
      */
     workloadIdentity?: never;
+    /** Bedrock cannot receive OpenAI X.509 workload-identity certificate transports. */
+    x509Transport?: never;
     /**
      * AWS region used to derive the default Bedrock Mantle endpoint.
      *
@@ -38,21 +45,32 @@ export interface BedrockClientOptions extends Omit<ClientOptions, 'apiKey' | 'ad
 }
 /** API Client for interfacing with Amazon Bedrock's OpenAI-compatible endpoint. */
 export declare class BedrockOpenAI extends OpenAI {
+    /**
+     * Identifies this client to credential-bearing WebSocket helpers.
+     *
+     * @internal
+     */
+    readonly [brand_privateBedrockClient] = true;
     private readonly bedrockTokenProvider;
     /**
      * API Client for interfacing with Amazon Bedrock's OpenAI-compatible endpoint.
      *
-     * @param {string | null | undefined} [opts.apiKey=process.env['AWS_BEARER_TOKEN_BEDROCK'] ?? null]
-     * @param {string | null | undefined} [opts.baseURL=process.env['AWS_BEDROCK_BASE_URL'] ?? derived from opts.awsRegion or AWS_REGION/AWS_DEFAULT_REGION]
-     * @param {string | undefined} [opts.awsRegion=process.env['AWS_REGION'] ?? process.env['AWS_DEFAULT_REGION'] ?? undefined]
+     * @param {string | null | undefined} [opts.apiKey] - Defaults to `process.env['AWS_BEARER_TOKEN_BEDROCK'] ?? null`.
+     * @param {string | null | undefined} [opts.baseURL] - Defaults to `process.env['AWS_BEDROCK_BASE_URL']`, or is derived from `opts.awsRegion`, `AWS_REGION`, or `AWS_DEFAULT_REGION`.
+     * @param {string | undefined} [opts.awsRegion] - Defaults to `process.env['AWS_REGION'] ?? process.env['AWS_DEFAULT_REGION'] ?? undefined`.
      * @param {ApiKeySetter | undefined} opts.bedrockTokenProvider - A function that returns a Bedrock bearer token and is invoked before each request.
      */
-    constructor({ baseURL, apiKey, awsRegion, bedrockTokenProvider, adminAPIKey, workloadIdentity, ...opts }?: BedrockClientOptions);
+    constructor({ baseURL, apiKey, awsRegion, bedrockTokenProvider, adminAPIKey, workloadIdentity, x509Transport, dataResidency, ...opts }?: BedrockClientOptions);
     protected prepareOptions(options: FinalRequestOptions): Promise<void>;
+    protected prepareRequest(request: RequestInit, context: {
+        url: string;
+        options: FinalRequestOptions;
+    }): Promise<void>;
     protected authHeaders(opts: FinalRequestOptions, schemes?: {
         bearerAuth?: boolean;
         adminAPIKeyAuth?: boolean;
     }): Promise<NullableHeaders | undefined>;
+    /** Clones this client while preserving its refreshable Bedrock token provider when appropriate. */
     withOptions(options: Partial<BedrockClientOptions>): this;
 }
 //# sourceMappingURL=bedrock.d.mts.map

package/bedrock.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"bedrock.d.mts","sourceRoot":"","sources":["src/bedrock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,qBAAiB;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,qBAAiB;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,+BAA2B;AAE1D,OAAO,KAAK,EAAE,mBAAmB,EAAkB,uCAAmC;AAOtF,MAAM,WAAW,oBACf,SAAQ,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,aAAa,GAAG,SAAS,GAAG,kBAAkB,CAAC;IACtF;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAEnC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAEpC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC;IAEpB;;OAEG;IACH,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;OAEG;IACH,oBAAoB,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACjD;AAiDD,mFAAmF;AACnF,qBAAa,aAAc,SAAQ,MAAM;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA2B;IAEhE;;;;;;;OAOG;gBACS,EACV,OAAyC,EACzC,MAAM,EACN,SAAkE,EAClE,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,GAAG,IAAI,EACR,GAAE,oBAAyB;cAwCH,cAAc,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;cAS3D,WAAW,CAClC,IAAI,EAAE,mBAAmB,EACzB,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAC5D,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAS9B,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG,IAAI;CASnE"}
+{"version":3,"file":"bedrock.d.mts","sourceRoot":"","sources":["src/bedrock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,qBAAiB;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,qBAAiB;AAE5D,OAAO,EAGL,0BAA0B,EAC3B,+BAA2B;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,qCAAiC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,+BAA2B;AAE1D,OAAO,KAAK,EAAE,mBAAmB,EAAkB,uCAAmC;AAOtF,8FAA8F;AAC9F,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAChD,aAAa,EACb,QAAQ,GAAG,aAAa,GAAG,SAAS,GAAG,kBAAkB,GAAG,eAAe,GAAG,eAAe,CAC9F;IACC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAEnC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAEpC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC;IAEpB,qEAAqE;IACrE,aAAa,CAAC,EAAE,KAAK,CAAC;IAEtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAEzB,oFAAoF;IACpF,aAAa,CAAC,EAAE,KAAK,CAAC;IAEtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;OAEG;IACH,oBAAoB,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACjD;AAsDD,mFAAmF;AACnF,qBAAa,aAAc,SAAQ,MAAM;IACvC;;;;OAIG;IACH,QAAQ,CAAC,CAAC,0BAA0B,CAAC,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA2B;IAEhE;;;;;;;OAOG;gBACS,EACV,OAAyC,EACzC,MAAM,EACN,SAAkE,EAClE,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACR,GAAE,oBAAyB;cAsEH,cAAc,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;cAa3D,cAAc,CACrC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,mBAAmB,CAAA;KAAE,GACrD,OAAO,CAAC,IAAI,CAAC;cAMS,WAAW,CAClC,IAAI,EAAE,mBAAmB,EACzB,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAC5D,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAmBvC,mGAAmG;IAC1F,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG,IAAI;CASnE"}

package/bedrock.d.ts

@@ -1,8 +1,11 @@
 import { OpenAI } from "./client.js";
 import type { ApiKeySetter, ClientOptions } from "./client.js";
+import { brand_privateBedrockClient } from "./internal/bedrock.js";
+import type { RequestInit } from "./internal/builtin-types.js";
 import type { NullableHeaders } from "./internal/headers.js";
 import type { FinalRequestOptions } from "./internal/request-options.js";
-export interface BedrockClientOptions extends Omit<ClientOptions, 'apiKey' | 'adminAPIKey' | 'baseURL' | 'workloadIdentity'> {
+/** Configures Amazon Bedrock's OpenAI-compatible endpoint and bearer-token authentication. */
+export interface BedrockClientOptions extends Omit<ClientOptions, 'apiKey' | 'adminAPIKey' | 'baseURL' | 'workloadIdentity' | 'x509Transport' | 'dataResidency'> {
     /**
      * Bedrock bearer token used for authentication.
      *
@@ -21,10 +24,14 @@ export interface BedrockClientOptions extends Omit<ClientOptions, 'apiKey' | 'ad
      * BedrockOpenAI only supports Bedrock bearer token authentication.
      */
     adminAPIKey?: never;
+    /** OpenAI data residency cannot be combined with Bedrock routing. */
+    dataResidency?: never;
     /**
      * BedrockOpenAI only supports Bedrock bearer token authentication.
      */
     workloadIdentity?: never;
+    /** Bedrock cannot receive OpenAI X.509 workload-identity certificate transports. */
+    x509Transport?: never;
     /**
      * AWS region used to derive the default Bedrock Mantle endpoint.
      *
@@ -38,21 +45,32 @@ export interface BedrockClientOptions extends Omit<ClientOptions, 'apiKey' | 'ad
 }
 /** API Client for interfacing with Amazon Bedrock's OpenAI-compatible endpoint. */
 export declare class BedrockOpenAI extends OpenAI {
+    /**
+     * Identifies this client to credential-bearing WebSocket helpers.
+     *
+     * @internal
+     */
+    readonly [brand_privateBedrockClient] = true;
     private readonly bedrockTokenProvider;
     /**
      * API Client for interfacing with Amazon Bedrock's OpenAI-compatible endpoint.
      *
-     * @param {string | null | undefined} [opts.apiKey=process.env['AWS_BEARER_TOKEN_BEDROCK'] ?? null]
-     * @param {string | null | undefined} [opts.baseURL=process.env['AWS_BEDROCK_BASE_URL'] ?? derived from opts.awsRegion or AWS_REGION/AWS_DEFAULT_REGION]
-     * @param {string | undefined} [opts.awsRegion=process.env['AWS_REGION'] ?? process.env['AWS_DEFAULT_REGION'] ?? undefined]
+     * @param {string | null | undefined} [opts.apiKey] - Defaults to `process.env['AWS_BEARER_TOKEN_BEDROCK'] ?? null`.
+     * @param {string | null | undefined} [opts.baseURL] - Defaults to `process.env['AWS_BEDROCK_BASE_URL']`, or is derived from `opts.awsRegion`, `AWS_REGION`, or `AWS_DEFAULT_REGION`.
+     * @param {string | undefined} [opts.awsRegion] - Defaults to `process.env['AWS_REGION'] ?? process.env['AWS_DEFAULT_REGION'] ?? undefined`.
      * @param {ApiKeySetter | undefined} opts.bedrockTokenProvider - A function that returns a Bedrock bearer token and is invoked before each request.
      */
-    constructor({ baseURL, apiKey, awsRegion, bedrockTokenProvider, adminAPIKey, workloadIdentity, ...opts }?: BedrockClientOptions);
+    constructor({ baseURL, apiKey, awsRegion, bedrockTokenProvider, adminAPIKey, workloadIdentity, x509Transport, dataResidency, ...opts }?: BedrockClientOptions);
     protected prepareOptions(options: FinalRequestOptions): Promise<void>;
+    protected prepareRequest(request: RequestInit, context: {
+        url: string;
+        options: FinalRequestOptions;
+    }): Promise<void>;
     protected authHeaders(opts: FinalRequestOptions, schemes?: {
         bearerAuth?: boolean;
         adminAPIKeyAuth?: boolean;
     }): Promise<NullableHeaders | undefined>;
+    /** Clones this client while preserving its refreshable Bedrock token provider when appropriate. */
     withOptions(options: Partial<BedrockClientOptions>): this;
 }
 //# sourceMappingURL=bedrock.d.ts.map

package/bedrock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["src/bedrock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,oBAAiB;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,oBAAiB;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA2B;AAE1D,OAAO,KAAK,EAAE,mBAAmB,EAAkB,sCAAmC;AAOtF,MAAM,WAAW,oBACf,SAAQ,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,aAAa,GAAG,SAAS,GAAG,kBAAkB,CAAC;IACtF;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAEnC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAEpC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC;IAEpB;;OAEG;IACH,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;OAEG;IACH,oBAAoB,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACjD;AAiDD,mFAAmF;AACnF,qBAAa,aAAc,SAAQ,MAAM;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA2B;IAEhE;;;;;;;OAOG;gBACS,EACV,OAAyC,EACzC,MAAM,EACN,SAAkE,EAClE,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,GAAG,IAAI,EACR,GAAE,oBAAyB;cAwCH,cAAc,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;cAS3D,WAAW,CAClC,IAAI,EAAE,mBAAmB,EACzB,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAC5D,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAS9B,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG,IAAI;CASnE"}
+{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["src/bedrock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,oBAAiB;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,oBAAiB;AAE5D,OAAO,EAGL,0BAA0B,EAC3B,8BAA2B;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,oCAAiC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA2B;AAE1D,OAAO,KAAK,EAAE,mBAAmB,EAAkB,sCAAmC;AAOtF,8FAA8F;AAC9F,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAChD,aAAa,EACb,QAAQ,GAAG,aAAa,GAAG,SAAS,GAAG,kBAAkB,GAAG,eAAe,GAAG,eAAe,CAC9F;IACC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAEnC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAEpC;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC;IAEpB,qEAAqE;IACrE,aAAa,CAAC,EAAE,KAAK,CAAC;IAEtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAEzB,oFAAoF;IACpF,aAAa,CAAC,EAAE,KAAK,CAAC;IAEtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;OAEG;IACH,oBAAoB,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACjD;AAsDD,mFAAmF;AACnF,qBAAa,aAAc,SAAQ,MAAM;IACvC;;;;OAIG;IACH,QAAQ,CAAC,CAAC,0BAA0B,CAAC,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA2B;IAEhE;;;;;;;OAOG;gBACS,EACV,OAAyC,EACzC,MAAM,EACN,SAAkE,EAClE,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,GAAG,IAAI,EACR,GAAE,oBAAyB;cAsEH,cAAc,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;cAa3D,cAAc,CACrC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,mBAAmB,CAAA;KAAE,GACrD,OAAO,CAAC,IAAI,CAAC;cAMS,WAAW,CAClC,IAAI,EAAE,mBAAmB,EACzB,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAC5D,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAmBvC,mGAAmG;IAC1F,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG,IAAI;CASnE"}

package/bedrock.js

@@ -1,9 +1,12 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BedrockOpenAI = void 0;
 const tslib_1 = require("./internal/tslib.js");
 const Errors = tslib_1.__importStar(require("./error.js"));
 const client_1 = require("./client.js");
+const data_residency_1 = require("./internal/data-residency.js");
+const bedrock_1 = require("./internal/bedrock.js");
 const headers_1 = require("./internal/headers.js");
 const utils_1 = require("./internal/utils.js");
 const ResponsesParser_1 = require("./lib/ResponsesParser.js");
@@ -14,6 +17,9 @@ function deriveBedrockBaseURL(awsRegion) {
     if (!region) {
         throw new Errors.OpenAIError('Must provide one of the `baseURL` or `awsRegion` arguments, or set the `AWS_BEDROCK_BASE_URL`, `AWS_REGION`, or `AWS_DEFAULT_REGION` environment variable.');
     }
+    if (!/^[a-z]{2,8}(?:-[a-z0-9]+)+-\d+$/u.test(region)) {
+        throw new Errors.OpenAIError('The Bedrock AWS `region` is invalid. Use a standard AWS region such as `us-east-1`.');
+    }
     return `https://bedrock-mantle.${region}.api.aws/openai/v1`;
 }
 /** Normalize a Bedrock Responses URL variant back to the provider API root. */
@@ -48,13 +54,14 @@ class BedrockOpenAI extends client_1.OpenAI {
     /**
      * API Client for interfacing with Amazon Bedrock's OpenAI-compatible endpoint.
      *
-     * @param {string | null | undefined} [opts.apiKey=process.env['AWS_BEARER_TOKEN_BEDROCK'] ?? null]
-     * @param {string | null | undefined} [opts.baseURL=process.env['AWS_BEDROCK_BASE_URL'] ?? derived from opts.awsRegion or AWS_REGION/AWS_DEFAULT_REGION]
-     * @param {string | undefined} [opts.awsRegion=process.env['AWS_REGION'] ?? process.env['AWS_DEFAULT_REGION'] ?? undefined]
+     * @param {string | null | undefined} [opts.apiKey] - Defaults to `process.env['AWS_BEARER_TOKEN_BEDROCK'] ?? null`.
+     * @param {string | null | undefined} [opts.baseURL] - Defaults to `process.env['AWS_BEDROCK_BASE_URL']`, or is derived from `opts.awsRegion`, `AWS_REGION`, or `AWS_DEFAULT_REGION`.
+     * @param {string | undefined} [opts.awsRegion] - Defaults to `process.env['AWS_REGION'] ?? process.env['AWS_DEFAULT_REGION'] ?? undefined`.
      * @param {ApiKeySetter | undefined} opts.bedrockTokenProvider - A function that returns a Bedrock bearer token and is invoked before each request.
      */
-    constructor({ baseURL = (0, utils_1.readEnv)('AWS_BEDROCK_BASE_URL'), apiKey, awsRegion = (0, utils_1.readEnv)('AWS_REGION') ?? (0, utils_1.readEnv)('AWS_DEFAULT_REGION'), bedrockTokenProvider, adminAPIKey, workloadIdentity, ...opts } = {}) {
-        if (adminAPIKey || workloadIdentity) {
+    constructor({ baseURL = (0, utils_1.readEnv)('AWS_BEDROCK_BASE_URL'), apiKey, awsRegion = (0, utils_1.readEnv)('AWS_REGION') ?? (0, utils_1.readEnv)('AWS_DEFAULT_REGION'), bedrockTokenProvider, adminAPIKey, workloadIdentity, x509Transport, dataResidency, ...opts } = {}) {
+        (0, data_residency_1.assertNoDataResidency)(dataResidency, 'BedrockOpenAI');
+        if (adminAPIKey || workloadIdentity || x509Transport) {
             throw new Errors.OpenAIError('BedrockOpenAI only supports Bedrock bearer token authentication.');
         }
         if (apiKey === undefined && !bedrockTokenProvider) {
@@ -76,25 +83,78 @@ class BedrockOpenAI extends client_1.OpenAI {
             baseURL: normalizeBedrockBaseURL(configuredBaseURL),
             ...opts,
         });
+        /**
+         * Identifies this client to credential-bearing WebSocket helpers.
+         *
+         * @internal
+         */
+        this[_a] = true;
+        let currentApiKey = this.apiKey;
+        Object.defineProperty(this, 'apiKey', {
+            enumerable: true,
+            configurable: true,
+            get() {
+                if (currentApiKey !== null) {
+                    (0, bedrock_1.assertValidBedrockBearerCredential)(currentApiKey);
+                }
+                return currentApiKey;
+            },
+            set(nextApiKey) {
+                currentApiKey = nextApiKey;
+            },
+        });
+        const trustedBaseURL = this.baseURL;
+        let currentBaseURL = trustedBaseURL;
+        Object.defineProperty(this, 'baseURL', {
+            enumerable: true,
+            configurable: false,
+            get() {
+                return currentBaseURL;
+            },
+            set(nextBaseURL) {
+                (0, bedrock_1.assertBedrockRequestOrigin)(trustedBaseURL, nextBaseURL);
+                currentBaseURL = nextBaseURL;
+            },
+        });
         this.bedrockTokenProvider = bedrockTokenProvider;
         this.responses = restoreBedrockStreamOutputText(new API.Responses(this));
     }
     async prepareOptions(options) {
+        const configuredBaseURL = this._options.baseURL ?? this.baseURL;
+        (0, bedrock_1.assertBedrockRequestOrigin)(configuredBaseURL, this.buildURL(options.path, null, options.defaultBaseURL));
         const security = options.__security ?? { bearerAuth: true };
         if (security.adminAPIKeyAuth && !security.bearerAuth) {
             await this._callApiKey();
         }
         await super.prepareOptions(options);
+        (0, bedrock_1.assertBedrockRequestOrigin)(configuredBaseURL, this.buildURL(options.path, null, options.defaultBaseURL));
+    }
+    async prepareRequest(request, context) {
+        (0, bedrock_1.assertBedrockRequestOrigin)(this._options.baseURL ?? this.baseURL, context.url);
+        await super.prepareRequest(request, context);
+        request.redirect = 'manual';
     }
     async authHeaders(opts, schemes) {
         const security = schemes ?? { bearerAuth: true, adminAPIKeyAuth: true };
-        if ((security.bearerAuth || security.adminAPIKeyAuth) && this.apiKey !== null) {
-            return (0, headers_1.buildHeaders)([{ Authorization: `Bearer ${this.apiKey}` }]);
+        const credential = this.apiKey;
+        if ((security.bearerAuth || security.adminAPIKeyAuth) && credential !== null) {
+            (0, bedrock_1.assertValidBedrockBearerCredential)(credential);
+            try {
+                return (0, headers_1.buildHeaders)([{ Authorization: `Bearer ${credential}` }]);
+            }
+            catch (error) {
+                if (error instanceof TypeError) {
+                    // oxlint-disable-next-line eslint/preserve-caught-error -- The original error contains the bearer credential.
+                    throw new TypeError('Bedrock bearer credential contains an invalid HTTP header value.');
+                }
+                throw error;
+            }
         }
         return super.authHeaders(opts, security);
     }
+    /** Clones this client while preserving its refreshable Bedrock token provider when appropriate. */
     withOptions(options) {
-        const bedrockTokenProvider = options.apiKey !== undefined ? undefined : options.bedrockTokenProvider ?? this.bedrockTokenProvider;
+        const bedrockTokenProvider = options.apiKey === undefined ? (options.bedrockTokenProvider ?? this.bedrockTokenProvider) : undefined;
         return super.withOptions({
             ...options,
             ...(bedrockTokenProvider ? { apiKey: undefined, bedrockTokenProvider } : {}),
@@ -102,4 +162,5 @@ class BedrockOpenAI extends client_1.OpenAI {
     }
 }
 exports.BedrockOpenAI = BedrockOpenAI;
+_a = bedrock_1.brand_privateBedrockClient;
 //# sourceMappingURL=bedrock.js.map

package/bedrock.js.map

@@ -1 +1 @@
-{"version":3,"file":"bedrock.js","sourceRoot":"","sources":["src/bedrock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bedrock.js","sourceRoot":"","sources":["src/bedrock.ts"],"names":[],"mappings":"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"}