hume 0.15.9 → 0.15.10

package/dist/esm/api/resources/empathicVoice/types/WebSocketError.d.mts

@@ -1,7 +1,5 @@
 /**
- * **Indicates a disruption in the WebSocket connection**, such as an unexpected disconnection, protocol error, or data transmission issue.
- *
- * Contains an error code identifying the type of error encountered, a detailed description of the error, and a short, human-readable identifier and description (slug) for the error.
+ * When provided, the output is an error message.
  */
 export interface WebSocketError {
     /** Error code. Identifies the type of error encountered. */

package/dist/esm/api/resources/expressionMeasurement/client/Client.d.mts

@@ -1,12 +1,12 @@
 import type { BaseClientOptions } from "../../../../BaseClient.mjs";
-import { Batch } from "../resources/batch/client/Client.mjs";
-export declare namespace ExpressionMeasurement {
-    interface Options extends BaseClientOptions {
-    }
+import { type NormalizedClientOptionsWithAuth } from "../../../../BaseClient.mjs";
+import { BatchClient } from "../resources/batch/client/Client.mjs";
+export declare namespace ExpressionMeasurementClient {
+    type Options = BaseClientOptions;
 }
-export declare class ExpressionMeasurement {
-    protected readonly _options: ExpressionMeasurement.Options;
-    protected _batch: Batch | undefined;
-    constructor(_options?: ExpressionMeasurement.Options);
-    get batch(): Batch;
+export declare class ExpressionMeasurementClient {
+    protected readonly _options: NormalizedClientOptionsWithAuth<ExpressionMeasurementClient.Options>;
+    protected _batch: BatchClient | undefined;
+    constructor(options?: ExpressionMeasurementClient.Options);
+    get batch(): BatchClient;
 }

package/dist/esm/api/resources/expressionMeasurement/client/Client.mjs

@@ -1,11 +1,12 @@
 // This file was auto-generated by Fern from our API Definition.
-import { Batch } from "../resources/batch/client/Client.mjs";
-export class ExpressionMeasurement {
-    constructor(_options = {}) {
-        this._options = _options;
+import { normalizeClientOptionsWithAuth } from "../../../../BaseClient.mjs";
+import { BatchClient } from "../resources/batch/client/Client.mjs";
+export class ExpressionMeasurementClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     get batch() {
         var _a;
-        return ((_a = this._batch) !== null && _a !== void 0 ? _a : (this._batch = new Batch(this._options)));
+        return ((_a = this._batch) !== null && _a !== void 0 ? _a : (this._batch = new BatchClient(this._options)));
     }
 }

package/dist/esm/api/resources/expressionMeasurement/resources/batch/client/Client.d.mts

@@ -1,31 +1,31 @@
 import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.mjs";
+import { type NormalizedClientOptionsWithAuth } from "../../../../../../BaseClient.mjs";
 import * as core from "../../../../../../core/index.mjs";
 import type * as Hume from "../../../../../index.mjs";
-export declare namespace Batch {
-    interface Options extends BaseClientOptions {
-    }
+export declare namespace BatchClient {
+    type Options = BaseClientOptions;
     interface RequestOptions extends BaseRequestOptions {
     }
 }
-export declare class Batch {
-    protected readonly _options: Batch.Options;
-    constructor(_options?: Batch.Options);
+export declare class BatchClient {
+    protected readonly _options: NormalizedClientOptionsWithAuth<BatchClient.Options>;
+    constructor(options?: BatchClient.Options);
     /**
      * Sort and filter jobs.
      *
      * @param {Hume.expressionMeasurement.batch.BatchListJobsRequest} request
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.expressionMeasurement.batch.listJobs()
      */
-    listJobs(request?: Hume.expressionMeasurement.batch.BatchListJobsRequest, requestOptions?: Batch.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.UnionJob[]>;
+    listJobs(request?: Hume.expressionMeasurement.batch.BatchListJobsRequest, requestOptions?: BatchClient.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.UnionJob[]>;
     private __listJobs;
     /**
      * Start a new measurement inference job.
      *
      * @param {Hume.expressionMeasurement.batch.InferenceBaseRequest} request
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.expressionMeasurement.batch.startInferenceJob({
@@ -33,40 +33,40 @@ export declare class Batch {
      *         notify: true
      *     })
      */
-    startInferenceJob(request: Hume.expressionMeasurement.batch.InferenceBaseRequest, requestOptions?: Batch.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.JobId>;
+    startInferenceJob(request: Hume.expressionMeasurement.batch.InferenceBaseRequest, requestOptions?: BatchClient.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.JobId>;
     private __startInferenceJob;
     /**
      * Get the request details and state of a given job.
      *
      * @param {string} id - The unique identifier for the job.
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.expressionMeasurement.batch.getJobDetails("job_id")
      */
-    getJobDetails(id: string, requestOptions?: Batch.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.UnionJob>;
+    getJobDetails(id: string, requestOptions?: BatchClient.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.UnionJob>;
     private __getJobDetails;
     /**
      * Get the JSON predictions of a completed inference job.
      *
      * @param {string} id - The unique identifier for the job.
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.expressionMeasurement.batch.getJobPredictions("job_id")
      */
-    getJobPredictions(id: string, requestOptions?: Batch.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.UnionPredictResult[]>;
+    getJobPredictions(id: string, requestOptions?: BatchClient.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.UnionPredictResult[]>;
     private __getJobPredictions;
     /**
      * Get the artifacts ZIP of a completed inference job.
      */
-    getJobArtifacts(id: string, requestOptions?: Batch.RequestOptions): core.HttpResponsePromise<core.BinaryResponse>;
+    getJobArtifacts(id: string, requestOptions?: BatchClient.RequestOptions): core.HttpResponsePromise<core.BinaryResponse>;
     private __getJobArtifacts;
     /**
      * Start a new batch inference job.
      *
      * @param {Hume.expressionMeasurement.batch.BatchStartInferenceJobFromLocalFileRequest} request
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     import { createReadStream } from "fs";
@@ -74,7 +74,6 @@ export declare class Batch {
      *         file: [fs.createReadStream("/path/to/your/file")]
      *     })
      */
-    startInferenceJobFromLocalFile(request: Hume.expressionMeasurement.batch.BatchStartInferenceJobFromLocalFileRequest, requestOptions?: Batch.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.JobId>;
+    startInferenceJobFromLocalFile(request: Hume.expressionMeasurement.batch.BatchStartInferenceJobFromLocalFileRequest, requestOptions?: BatchClient.RequestOptions): core.HttpResponsePromise<Hume.expressionMeasurement.batch.JobId>;
     private __startInferenceJobFromLocalFile;
-    protected _getCustomAuthorizationHeaders(): Promise<Record<string, string | undefined>>;
 }

package/dist/esm/api/resources/expressionMeasurement/resources/batch/client/Client.mjs

@@ -8,21 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { normalizeClientOptionsWithAuth } from "../../../../../../BaseClient.mjs";
 import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../../../core/headers.mjs";
 import * as core from "../../../../../../core/index.mjs";
 import { toJson } from "../../../../../../core/json.mjs";
 import * as environments from "../../../../../../environments.mjs";
+import { handleNonStatusCodeError } from "../../../../../../errors/handleNonStatusCodeError.mjs";
 import * as errors from "../../../../../../errors/index.mjs";
 import * as serializers from "../../../../../../serialization/index.mjs";
-export class Batch {
-    constructor(_options = {}) {
-        this._options = _options;
+export class BatchClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     /**
      * Sort and filter jobs.
      *
      * @param {Hume.expressionMeasurement.batch.BatchListJobsRequest} request
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.expressionMeasurement.batch.listJobs()
@@ -34,46 +36,41 @@ export class Batch {
         return __awaiter(this, arguments, void 0, function* (request = {}, requestOptions) {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             const { limit, status, when, timestampMs, sortBy, direction } = request;
-            const _queryParams = {};
-            if (limit != null) {
-                _queryParams.limit = limit.toString();
-            }
-            if (status != null) {
-                if (Array.isArray(status)) {
-                    _queryParams.status = status.map((item) => serializers.expressionMeasurement.batch.Status.jsonOrThrow(item, {
+            const _queryParams = {
+                limit,
+                status: Array.isArray(status)
+                    ? status.map((item) => serializers.expressionMeasurement.batch.Status.jsonOrThrow(item, {
                         unrecognizedObjectKeys: "strip",
                         omitUndefined: true,
-                    }));
-                }
-                else {
-                    _queryParams.status = serializers.expressionMeasurement.batch.Status.jsonOrThrow(status, {
+                    }))
+                    : status != null
+                        ? serializers.expressionMeasurement.batch.Status.jsonOrThrow(status, {
+                            unrecognizedObjectKeys: "strip",
+                            omitUndefined: true,
+                        })
+                        : undefined,
+                when: when != null
+                    ? serializers.expressionMeasurement.batch.When.jsonOrThrow(when, {
                         unrecognizedObjectKeys: "strip",
                         omitUndefined: true,
-                    });
-                }
-            }
-            if (when != null) {
-                _queryParams.when = serializers.expressionMeasurement.batch.When.jsonOrThrow(when, {
-                    unrecognizedObjectKeys: "strip",
-                    omitUndefined: true,
-                });
-            }
-            if (timestampMs != null) {
-                _queryParams.timestamp_ms = timestampMs.toString();
-            }
-            if (sortBy != null) {
-                _queryParams.sort_by = serializers.expressionMeasurement.batch.SortBy.jsonOrThrow(sortBy, {
-                    unrecognizedObjectKeys: "strip",
-                    omitUndefined: true,
-                });
-            }
-            if (direction != null) {
-                _queryParams.direction = serializers.expressionMeasurement.batch.Direction.jsonOrThrow(direction, {
-                    unrecognizedObjectKeys: "strip",
-                    omitUndefined: true,
-                });
-            }
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+                    })
+                    : undefined,
+                timestamp_ms: timestampMs,
+                sort_by: sortBy != null
+                    ? serializers.expressionMeasurement.batch.SortBy.jsonOrThrow(sortBy, {
+                        unrecognizedObjectKeys: "strip",
+                        omitUndefined: true,
+                    })
+                    : undefined,
+                direction: direction != null
+                    ? serializers.expressionMeasurement.batch.Direction.jsonOrThrow(direction, {
+                        unrecognizedObjectKeys: "strip",
+                        omitUndefined: true,
+                    })
+                    : undefined,
+            };
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield ((_b = this._options.fetcher) !== null && _b !== void 0 ? _b : core.fetcher)({
                 url: core.url.join((_c = (yield core.Supplier.get(this._options.baseUrl))) !== null && _c !== void 0 ? _c : ((_d = (yield core.Supplier.get(this._options.environment))) !== null && _d !== void 0 ? _d : environments.HumeEnvironment.Prod).base, "v0/batch/jobs"),
                 method: "GET",
@@ -104,28 +101,14 @@ export class Batch {
                     rawResponse: _response.rawResponse,
                 });
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.HumeError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.HumeTimeoutError("Timeout exceeded when calling GET /v0/batch/jobs.");
-                case "unknown":
-                    throw new errors.HumeError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/v0/batch/jobs");
         });
     }
     /**
      * Start a new measurement inference job.
      *
      * @param {Hume.expressionMeasurement.batch.InferenceBaseRequest} request
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.expressionMeasurement.batch.startInferenceJob({
@@ -139,7 +122,8 @@ export class Batch {
     __startInferenceJob(request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield ((_b = this._options.fetcher) !== null && _b !== void 0 ? _b : core.fetcher)({
                 url: core.url.join((_c = (yield core.Supplier.get(this._options.baseUrl))) !== null && _c !== void 0 ? _c : ((_d = (yield core.Supplier.get(this._options.environment))) !== null && _d !== void 0 ? _d : environments.HumeEnvironment.Prod).base, "v0/batch/jobs"),
                 method: "POST",
@@ -176,28 +160,14 @@ export class Batch {
                     rawResponse: _response.rawResponse,
                 });
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.HumeError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.HumeTimeoutError("Timeout exceeded when calling POST /v0/batch/jobs.");
-                case "unknown":
-                    throw new errors.HumeError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/v0/batch/jobs");
         });
     }
     /**
      * Get the request details and state of a given job.
      *
      * @param {string} id - The unique identifier for the job.
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.expressionMeasurement.batch.getJobDetails("job_id")
@@ -208,7 +178,8 @@ export class Batch {
     __getJobDetails(id, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield ((_b = this._options.fetcher) !== null && _b !== void 0 ? _b : core.fetcher)({
                 url: core.url.join((_c = (yield core.Supplier.get(this._options.baseUrl))) !== null && _c !== void 0 ? _c : ((_d = (yield core.Supplier.get(this._options.environment))) !== null && _d !== void 0 ? _d : environments.HumeEnvironment.Prod).base, `v0/batch/jobs/${core.url.encodePathParam(id)}`),
                 method: "GET",
@@ -239,28 +210,14 @@ export class Batch {
                     rawResponse: _response.rawResponse,
                 });
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.HumeError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.HumeTimeoutError("Timeout exceeded when calling GET /v0/batch/jobs/{id}.");
-                case "unknown":
-                    throw new errors.HumeError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/v0/batch/jobs/{id}");
         });
     }
     /**
      * Get the JSON predictions of a completed inference job.
      *
      * @param {string} id - The unique identifier for the job.
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.expressionMeasurement.batch.getJobPredictions("job_id")
@@ -271,7 +228,8 @@ export class Batch {
     __getJobPredictions(id, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield ((_b = this._options.fetcher) !== null && _b !== void 0 ? _b : core.fetcher)({
                 url: core.url.join((_c = (yield core.Supplier.get(this._options.baseUrl))) !== null && _c !== void 0 ? _c : ((_d = (yield core.Supplier.get(this._options.environment))) !== null && _d !== void 0 ? _d : environments.HumeEnvironment.Prod).base, `v0/batch/jobs/${core.url.encodePathParam(id)}/predictions`),
                 method: "GET",
@@ -302,21 +260,7 @@ export class Batch {
                     rawResponse: _response.rawResponse,
                 });
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.HumeError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.HumeTimeoutError("Timeout exceeded when calling GET /v0/batch/jobs/{id}/predictions.");
-                case "unknown":
-                    throw new errors.HumeError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/v0/batch/jobs/{id}/predictions");
         });
     }
     /**
@@ -328,7 +272,8 @@ export class Batch {
     __getJobArtifacts(id, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, (yield this._getCustomAuthorizationHeaders()))), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield ((_b = this._options.fetcher) !== null && _b !== void 0 ? _b : core.fetcher)({
                 url: core.url.join((_c = (yield core.Supplier.get(this._options.baseUrl))) !== null && _c !== void 0 ? _c : ((_d = (yield core.Supplier.get(this._options.environment))) !== null && _d !== void 0 ? _d : environments.HumeEnvironment.Prod).base, `v0/batch/jobs/${core.url.encodePathParam(id)}/artifacts`),
                 method: "GET",
@@ -351,28 +296,14 @@ export class Batch {
                     rawResponse: _response.rawResponse,
                 });
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.HumeError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.HumeTimeoutError("Timeout exceeded when calling GET /v0/batch/jobs/{id}/artifacts.");
-                case "unknown":
-                    throw new errors.HumeError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/v0/batch/jobs/{id}/artifacts");
         });
     }
     /**
      * Start a new batch inference job.
      *
      * @param {Hume.expressionMeasurement.batch.BatchStartInferenceJobFromLocalFileRequest} request
-     * @param {Batch.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {BatchClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     import { createReadStream } from "fs";
@@ -386,18 +317,19 @@ export class Batch {
     __startInferenceJobFromLocalFile(request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-            const _request = yield core.newFormData();
+            const _body = yield core.newFormData();
             if (request.json != null) {
-                _request.append("json", toJson(serializers.expressionMeasurement.batch.InferenceBaseRequest.jsonOrThrow(request.json, {
+                _body.append("json", toJson(serializers.expressionMeasurement.batch.InferenceBaseRequest.jsonOrThrow(request.json, {
                     unrecognizedObjectKeys: "strip",
                     omitUndefined: true,
                 })));
             }
             for (const _file of request.file) {
-                yield _request.appendFile("file", _file);
+                yield _body.appendFile("file", _file);
             }
-            const _maybeEncodedRequest = yield _request.getRequest();
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign(Object.assign({}, (yield this._getCustomAuthorizationHeaders())), _maybeEncodedRequest.headers)), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _maybeEncodedRequest = yield _body.getRequest();
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders(Object.assign({}, _maybeEncodedRequest.headers)), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield ((_b = this._options.fetcher) !== null && _b !== void 0 ? _b : core.fetcher)({
                 url: core.url.join((_c = (yield core.Supplier.get(this._options.baseUrl))) !== null && _c !== void 0 ? _c : ((_d = (yield core.Supplier.get(this._options.environment))) !== null && _d !== void 0 ? _d : environments.HumeEnvironment.Prod).base, "v0/batch/jobs"),
                 method: "POST",
@@ -431,27 +363,7 @@ export class Batch {
                     rawResponse: _response.rawResponse,
                 });
             }
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.HumeError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                        rawResponse: _response.rawResponse,
-                    });
-                case "timeout":
-                    throw new errors.HumeTimeoutError("Timeout exceeded when calling POST /v0/batch/jobs.");
-                case "unknown":
-                    throw new errors.HumeError({
-                        message: _response.error.errorMessage,
-                        rawResponse: _response.rawResponse,
-                    });
-            }
-        });
-    }
-    _getCustomAuthorizationHeaders() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const apiKeyValue = yield core.Supplier.get(this._options.apiKey);
-            return { "X-Hume-Api-Key": apiKeyValue };
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/v0/batch/jobs");
         });
     }
 }

package/dist/esm/api/resources/expressionMeasurement/resources/stream/resources/stream/client/Client.d.mts

@@ -1,8 +1,8 @@
 import type { BaseClientOptions } from "../../../../../../../../BaseClient.mjs";
+import { type NormalizedClientOptions } from "../../../../../../../../BaseClient.mjs";
 import { StreamSocket } from "./Socket.mjs";
-export declare namespace Stream {
-    interface Options extends BaseClientOptions {
-    }
+export declare namespace StreamClient {
+    type Options = BaseClientOptions;
     interface ConnectArgs {
         "X-Hume-Api-Key": string;
         /** Arbitrary headers to send with the websocket connect request. */
@@ -13,9 +13,8 @@ export declare namespace Stream {
         reconnectAttempts?: number;
     }
 }
-export declare class Stream {
-    protected readonly _options: Stream.Options;
-    constructor(_options?: Stream.Options);
-    connect(args: Stream.ConnectArgs): Promise<StreamSocket>;
-    protected _getCustomAuthorizationHeaders(): Promise<Record<string, string | undefined>>;
+export declare class StreamClient {
+    protected readonly _options: NormalizedClientOptions<StreamClient.Options>;
+    constructor(options?: StreamClient.Options);
+    connect(args: StreamClient.ConnectArgs): Promise<StreamSocket>;
 }

package/dist/esm/api/resources/expressionMeasurement/resources/stream/resources/stream/client/Client.mjs

@@ -8,19 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { normalizeClientOptions } from "../../../../../../../../BaseClient.mjs";
 import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../../../../../core/headers.mjs";
 import * as core from "../../../../../../../../core/index.mjs";
 import * as environments from "../../../../../../../../environments.mjs";
 import { StreamSocket } from "./Socket.mjs";
-export class Stream {
-    constructor(_options = {}) {
-        this._options = _options;
+export class StreamClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptions(options);
     }
     connect(args) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const { headers, debug, reconnectAttempts } = args;
-            const _headers = mergeHeaders(mergeOnlyDefinedHeaders(Object.assign(Object.assign({}, (yield this._getCustomAuthorizationHeaders())), { "X-Hume-Api-Key": args["X-Hume-Api-Key"] })), headers);
+            const _headers = mergeHeaders(mergeOnlyDefinedHeaders({ "X-Hume-Api-Key": args["X-Hume-Api-Key"] }), headers);
             const socket = new core.ReconnectingWebSocket({
                 url: core.url.join((_a = (yield core.Supplier.get(this._options.baseUrl))) !== null && _a !== void 0 ? _a : ((_b = (yield core.Supplier.get(this._options.environment))) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Prod).stream, "/models"),
                 protocols: [],
@@ -31,10 +32,4 @@ export class Stream {
             return new StreamSocket({ socket });
         });
     }
-    _getCustomAuthorizationHeaders() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const apiKeyValue = yield core.Supplier.get(this._options.apiKey);
-            return { "X-Hume-Api-Key": apiKeyValue };
-        });
-    }
 }