hume 0.5.17 → 0.6.0

package/api/resources/expressionMeasurement/resources/batch/client/Client.js

@@ -44,7 +44,6 @@ const core = __importStar(require("../../../../../../core"));
 const url_join_1 = __importDefault(require("url-join"));
 const serializers = __importStar(require("../../../../../../serialization/index"));
 const errors = __importStar(require("../../../../../../errors/index"));
-const form_data_1 = __importDefault(require("form-data"));
 class Batch {
     constructor(_options = {}) {
         this._options = _options;
@@ -97,11 +96,12 @@ class Batch {
             const _response = yield ((_a = this._options.fetcher) !== null && _a !== void 0 ? _a : core.fetcher)({
                 url: (0, url_join_1.default)((_b = (yield core.Supplier.get(this._options.environment))) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Production, "v0/batch/jobs"),
                 method: "GET",
-                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.5.17", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
+                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.6.0", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
                 contentType: "application/json",
                 queryParameters: _queryParams,
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
                 maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
             });
             if (_response.ok) {
                 return yield serializers.expressionMeasurement.batch.listJobs.Response.parseOrThrow(_response.body, {
@@ -151,13 +151,14 @@ class Batch {
             const _response = yield ((_a = this._options.fetcher) !== null && _a !== void 0 ? _a : core.fetcher)({
                 url: (0, url_join_1.default)((_b = (yield core.Supplier.get(this._options.environment))) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Production, "v0/batch/jobs"),
                 method: "POST",
-                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.5.17", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
+                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.6.0", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
                 contentType: "application/json",
                 body: yield serializers.expressionMeasurement.InferenceBaseRequest.jsonOrThrow(request, {
                     unrecognizedObjectKeys: "strip",
                 }),
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
                 maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
             });
             if (_response.ok) {
                 return yield serializers.expressionMeasurement.JobId.parseOrThrow(_response.body, {
@@ -204,10 +205,11 @@ class Batch {
             const _response = yield ((_a = this._options.fetcher) !== null && _a !== void 0 ? _a : core.fetcher)({
                 url: (0, url_join_1.default)((_b = (yield core.Supplier.get(this._options.environment))) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Production, `v0/batch/jobs/${encodeURIComponent(id)}`),
                 method: "GET",
-                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.5.17", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
+                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.6.0", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
                 contentType: "application/json",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
                 maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
             });
             if (_response.ok) {
                 return yield serializers.expressionMeasurement.UnionJob.parseOrThrow(_response.body, {
@@ -254,10 +256,11 @@ class Batch {
             const _response = yield ((_a = this._options.fetcher) !== null && _a !== void 0 ? _a : core.fetcher)({
                 url: (0, url_join_1.default)((_b = (yield core.Supplier.get(this._options.environment))) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Production, `v0/batch/jobs/${encodeURIComponent(id)}/predictions`),
                 method: "GET",
-                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.5.17", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
+                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.6.0", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
                 contentType: "application/json",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
                 maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
             });
             if (_response.ok) {
                 return yield serializers.expressionMeasurement.batch.getJobPredictions.Response.parseOrThrow(_response.body, {
@@ -298,11 +301,12 @@ class Batch {
             const _response = yield ((_a = this._options.fetcher) !== null && _a !== void 0 ? _a : core.fetcher)({
                 url: (0, url_join_1.default)((_b = (yield core.Supplier.get(this._options.environment))) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Production, `v0/batch/jobs/${encodeURIComponent(id)}/artifacts`),
                 method: "GET",
-                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.5.17", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
+                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.6.0", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
                 contentType: "application/json",
                 responseType: "streaming",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
                 maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
             });
             if (_response.ok) {
                 return _response.body;
@@ -341,21 +345,22 @@ class Batch {
     startInferenceJobFromLocalFile(file, request, requestOptions) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const _request = new form_data_1.default();
+            const _request = new core.FormDataWrapper();
             if (request.json != null) {
-                _request.append("json", JSON.stringify(request.json));
+                yield _request.append("json", JSON.stringify(request.json));
             }
             for (const _file of file) {
-                _request.append("file", _file);
+                yield _request.append("file", _file);
             }
+            const _maybeEncodedRequest = _request.getRequest();
             const _response = yield ((_a = this._options.fetcher) !== null && _a !== void 0 ? _a : core.fetcher)({
                 url: (0, url_join_1.default)((_b = (yield core.Supplier.get(this._options.environment))) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Production, "v0/batch/jobs"),
                 method: "POST",
-                headers: Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.5.17", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())),
-                contentType: "multipart/form-data; boundary=" + _request.getBoundary(),
-                body: _request,
+                headers: Object.assign(Object.assign({ "X-Fern-Language": "JavaScript", "X-Fern-SDK-Name": "hume", "X-Fern-SDK-Version": "0.6.0", "X-Fern-Runtime": core.RUNTIME.type, "X-Fern-Runtime-Version": core.RUNTIME.version }, (yield this._getCustomAuthorizationHeaders())), (yield _maybeEncodedRequest.getHeaders())),
+                body: yield _maybeEncodedRequest.getBody(),
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
                 maxRetries: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries,
+                abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
             });
             if (_response.ok) {
                 return yield serializers.expressionMeasurement.JobId.parseOrThrow(_response.body, {

package/api/resources/index.d.ts

@@ -1,3 +1,3 @@
-export * as customModels from "./customModels";
 export * as empathicVoice from "./empathicVoice";
+export * as customModels from "./customModels";
 export * as expressionMeasurement from "./expressionMeasurement";

package/api/resources/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressionMeasurement = exports.empathicVoice = exports.customModels = void 0;
-exports.customModels = __importStar(require("./customModels"));
+exports.expressionMeasurement = exports.customModels = exports.empathicVoice = void 0;
 exports.empathicVoice = __importStar(require("./empathicVoice"));
+exports.customModels = __importStar(require("./customModels"));
 exports.expressionMeasurement = __importStar(require("./expressionMeasurement"));

package/core/fetcher/Fetcher.d.ts

@@ -11,6 +11,7 @@ export declare namespace Fetcher {
         timeoutMs?: number;
         maxRetries?: number;
         withCredentials?: boolean;
+        abortSignal?: AbortSignal;
         responseType?: "json" | "blob" | "streaming" | "text";
     }
     type Error = FailedStatusCodeError | NonJsonError | TimeoutError | UnknownError;

package/core/fetcher/Fetcher.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -13,7 +36,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetcher = void 0;
-const form_data_1 = __importDefault(require("form-data"));
 const qs_1 = __importDefault(require("qs"));
 const runtime_1 = require("../runtime");
 const INITIAL_RETRY_DELAY = 1;
@@ -37,18 +59,34 @@ function fetcherImpl(args) {
             ? `${args.url}?${qs_1.default.stringify(args.queryParameters, { arrayFormat: "repeat" })}`
             : args.url;
         let body = undefined;
-        if (args.body instanceof form_data_1.default) {
-            // @ts-expect-error
-            body = args.body;
-        }
-        else if (args.body instanceof Uint8Array) {
-            body = args.body;
-        }
-        else if (args.contentType === "application/x-www-form-urlencoded" && typeof args.body === "string") {
-            body = args.body;
+        const maybeStringifyBody = (body) => {
+            if (body instanceof Uint8Array) {
+                return body;
+            }
+            else if (args.contentType === "application/x-www-form-urlencoded" && typeof args.body === "string") {
+                return args.body;
+            }
+            else {
+                return JSON.stringify(body);
+            }
+        };
+        if (runtime_1.RUNTIME.type === "node") {
+            if (args.body instanceof (yield Promise.resolve().then(() => __importStar(require("formdata-node")))).FormData) {
+                // @ts-expect-error
+                body = args.body;
+            }
+            else {
+                body = maybeStringifyBody(args.body);
+            }
         }
         else {
-            body = JSON.stringify(args.body);
+            if (args.body instanceof (yield Promise.resolve().then(() => __importStar(require("form-data")))).default) {
+                // @ts-expect-error
+                body = args.body;
+            }
+            else {
+                body = maybeStringifyBody(args.body);
+            }
         }
         // In Node.js environments, the SDK always uses`node-fetch`.
         // If not in Node.js the SDK uses global fetch if available,
@@ -56,25 +94,32 @@ function fetcherImpl(args) {
         const fetchFn = runtime_1.RUNTIME.type === "node"
             ? // `.default` is required due to this issue:
                 // https://github.com/node-fetch/node-fetch/issues/450#issuecomment-387045223
-                require("node-fetch").default
+                (yield Promise.resolve().then(() => __importStar(require("node-fetch")))).default
             : typeof fetch == "function"
                 ? fetch
-                : require("node-fetch").default;
+                : (yield Promise.resolve().then(() => __importStar(require("node-fetch")))).default;
         const makeRequest = () => __awaiter(this, void 0, void 0, function* () {
-            const controller = new AbortController();
-            let abortId = undefined;
+            const signals = [];
+            // Add timeout signal
+            let timeoutAbortId = undefined;
             if (args.timeoutMs != null) {
-                abortId = setTimeout(() => controller.abort(), args.timeoutMs);
+                const { signal, abortId } = getTimeoutSignal(args.timeoutMs);
+                timeoutAbortId = abortId;
+                signals.push(signal);
+            }
+            // Add arbitrary signal
+            if (args.abortSignal != null) {
+                signals.push(args.abortSignal);
             }
             const response = yield fetchFn(url, {
                 method: args.method,
                 headers,
                 body,
-                signal: controller.signal,
+                signal: anySignal(signals),
                 credentials: args.withCredentials ? "include" : undefined,
             });
-            if (abortId != null) {
-                clearTimeout(abortId);
+            if (timeoutAbortId != null) {
+                clearTimeout(timeoutAbortId);
             }
             return response;
         });
@@ -140,7 +185,16 @@ function fetcherImpl(args) {
             }
         }
         catch (error) {
-            if (error instanceof Error && error.name === "AbortError") {
+            if (args.abortSignal != null && args.abortSignal.aborted) {
+                return {
+                    ok: false,
+                    error: {
+                        reason: "unknown",
+                        errorMessage: "The user aborted a request",
+                    },
+                };
+            }
+            else if (error instanceof Error && error.name === "AbortError") {
                 return {
                     ok: false,
                     error: {
@@ -167,4 +221,36 @@ function fetcherImpl(args) {
         }
     });
 }
+const TIMEOUT = "timeout";
+function getTimeoutSignal(timeoutMs) {
+    const controller = new AbortController();
+    const abortId = setTimeout(() => controller.abort(TIMEOUT), timeoutMs);
+    return { signal: controller.signal, abortId };
+}
+/**
+ * Returns an abort signal that is getting aborted when
+ * at least one of the specified abort signals is aborted.
+ *
+ * Requires at least node.js 18.
+ */
+function anySignal(...args) {
+    // Allowing signals to be passed either as array
+    // of signals or as multiple arguments.
+    const signals = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args);
+    const controller = new AbortController();
+    for (const signal of signals) {
+        if (signal.aborted) {
+            // Exiting early if one of the signals
+            // is already aborted.
+            controller.abort(signal === null || signal === void 0 ? void 0 : signal.reason);
+            break;
+        }
+        // Listening for signals and removing the listeners
+        // when at least one symbol is aborted.
+        signal.addEventListener("abort", () => controller.abort(signal === null || signal === void 0 ? void 0 : signal.reason), {
+            signal: controller.signal,
+        });
+    }
+    return controller.signal;
+}
 exports.fetcher = fetcherImpl;

package/core/form-data-utils/FormDataWrapper.d.ts

@@ -0,0 +1,24 @@
+declare class FormDataRequestBody {
+    private fd;
+    private encoder;
+    constructor(fd: any);
+    setup(): Promise<void>;
+    /**
+     * @returns the multipart form data request
+     */
+    getBody(): Promise<any>;
+    /**
+     * @returns headers that need to be added to the multipart form data request
+     */
+    getHeaders(): Promise<Record<string, string>>;
+}
+/**
+ * FormDataWrapper is a utility to make form data
+ * requests across both Browser and Node.js runtimes.
+ */
+export declare class FormDataWrapper {
+    private fd;
+    append(name: string, value: any): Promise<void>;
+    getRequest(): FormDataRequestBody;
+}
+export {};

package/core/form-data-utils/FormDataWrapper.js

@@ -0,0 +1,105 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormDataWrapper = void 0;
+const runtime_1 = require("../runtime");
+class FormDataRequestBody {
+    constructor(fd) {
+        this.fd = fd;
+    }
+    setup() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.encoder == null && runtime_1.RUNTIME.type === "node") {
+                this.encoder = new (yield Promise.resolve().then(() => __importStar(require("form-data-encoder")))).FormDataEncoder(this.fd);
+            }
+        });
+    }
+    /**
+     * @returns the multipart form data request
+     */
+    getBody() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (runtime_1.RUNTIME.type !== "node") {
+                return this.fd;
+            }
+            else {
+                if (this.encoder == null) {
+                    yield this.setup();
+                }
+                return (yield Promise.resolve().then(() => __importStar(require("node:stream")))).Readable.from(this.encoder);
+            }
+        });
+    }
+    /**
+     * @returns headers that need to be added to the multipart form data request
+     */
+    getHeaders() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (runtime_1.RUNTIME.type !== "node") {
+                return {};
+            }
+            else {
+                if (this.encoder == null) {
+                    yield this.setup();
+                }
+                return {
+                    "Content-Length": this.encoder.length,
+                };
+            }
+        });
+    }
+}
+/**
+ * FormDataWrapper is a utility to make form data
+ * requests across both Browser and Node.js runtimes.
+ */
+class FormDataWrapper {
+    append(name, value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.fd == null) {
+                if (runtime_1.RUNTIME.type === "node") {
+                    this.fd = new (yield Promise.resolve().then(() => __importStar(require("formdata-node")))).FormData();
+                }
+                else {
+                    this.fd = new (yield Promise.resolve().then(() => __importStar(require("form-data")))).default();
+                }
+            }
+            this.fd.append(name, value);
+        });
+    }
+    getRequest() {
+        return new FormDataRequestBody(this.fd);
+    }
+}
+exports.FormDataWrapper = FormDataWrapper;

package/core/form-data-utils/index.d.ts

@@ -0,0 +1 @@
+export * from "./FormDataWrapper";

package/core/form-data-utils/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./FormDataWrapper"), exports);

package/core/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./fetcher";
 export * from "./runtime";
+export * from "./form-data-utils";
 export * from "./websocket";
 export * as serialization from "./schemas";

package/core/index.js

@@ -29,5 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serialization = void 0;
 __exportStar(require("./fetcher"), exports);
 __exportStar(require("./runtime"), exports);
+__exportStar(require("./form-data-utils"), exports);
 __exportStar(require("./websocket"), exports);
 exports.serialization = __importStar(require("./schemas"));

package/dist/Client.d.ts

@@ -3,8 +3,8 @@
  */
 import * as environments from "./environments";
 import * as core from "./core";
-import { CustomModels } from "./api/resources/customModels/client/Client";
 import { EmpathicVoice } from "./api/resources/empathicVoice/client/Client";
+import { CustomModels } from "./api/resources/customModels/client/Client";
 import { ExpressionMeasurement } from "./api/resources/expressionMeasurement/client/Client";
 export declare namespace HumeClient {
     interface Options {
@@ -15,15 +15,16 @@ export declare namespace HumeClient {
     interface RequestOptions {
         timeoutInSeconds?: number;
         maxRetries?: number;
+        abortSignal?: AbortSignal;
     }
 }
 export declare class HumeClient {
     protected readonly _options: HumeClient.Options;
     constructor(_options?: HumeClient.Options);
-    protected _customModels: CustomModels | undefined;
-    get customModels(): CustomModels;
     protected _empathicVoice: EmpathicVoice | undefined;
     get empathicVoice(): EmpathicVoice;
+    protected _customModels: CustomModels | undefined;
+    get customModels(): CustomModels;
     protected _expressionMeasurement: ExpressionMeasurement | undefined;
     get expressionMeasurement(): ExpressionMeasurement;
 }

package/dist/Client.js

@@ -4,20 +4,20 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HumeClient = void 0;
-const Client_1 = require("./api/resources/customModels/client/Client");
-const Client_2 = require("./api/resources/empathicVoice/client/Client");
+const Client_1 = require("./api/resources/empathicVoice/client/Client");
+const Client_2 = require("./api/resources/customModels/client/Client");
 const Client_3 = require("./api/resources/expressionMeasurement/client/Client");
 class HumeClient {
     constructor(_options = {}) {
         this._options = _options;
     }
-    get customModels() {
+    get empathicVoice() {
         var _a;
-        return ((_a = this._customModels) !== null && _a !== void 0 ? _a : (this._customModels = new Client_1.CustomModels(this._options)));
+        return ((_a = this._empathicVoice) !== null && _a !== void 0 ? _a : (this._empathicVoice = new Client_1.EmpathicVoice(this._options)));
     }
-    get empathicVoice() {
+    get customModels() {
         var _a;
-        return ((_a = this._empathicVoice) !== null && _a !== void 0 ? _a : (this._empathicVoice = new Client_2.EmpathicVoice(this._options)));
+        return ((_a = this._customModels) !== null && _a !== void 0 ? _a : (this._customModels = new Client_2.CustomModels(this._options)));
     }
     get expressionMeasurement() {
         var _a;

package/dist/api/resources/customModels/client/Client.d.ts

@@ -16,6 +16,7 @@ export declare namespace CustomModels {
     interface RequestOptions {
         timeoutInSeconds?: number;
         maxRetries?: number;
+        abortSignal?: AbortSignal;
     }
 }
 export declare class CustomModels {

package/dist/api/resources/customModels/resources/datasets/client/Client.d.ts

@@ -15,6 +15,7 @@ export declare namespace Datasets {
     interface RequestOptions {
         timeoutInSeconds?: number;
         maxRetries?: number;
+        abortSignal?: AbortSignal;
     }
 }
 export declare class Datasets {