modelfusion 0.27.3 → 0.29.0

package/model-provider/huggingface/HuggingFaceImageDescriptionModel.cjs

@@ -0,0 +1,81 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HuggingFaceImageDescriptionModel = void 0;
+const zod_1 = __importDefault(require("zod"));
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const HuggingFaceApiConfiguration_js_1 = require("./HuggingFaceApiConfiguration.cjs");
+const HuggingFaceError_js_1 = require("./HuggingFaceError.cjs");
+/**
+ * Create an image to text model that calls a Hugging Face Image-to-Text Inference API.
+ *
+ * @see https://huggingface.co/tasks/image-to-text
+ */
+class HuggingFaceImageDescriptionModel extends AbstractModel_js_1.AbstractModel {
+    constructor(settings) {
+        super({ settings });
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "huggingface"
+        });
+        Object.defineProperty(this, "countPromptTokens", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
+    }
+    get modelName() {
+        return this.settings.model;
+    }
+    async callAPI(data, options) {
+        const run = options?.run;
+        const settings = options?.settings;
+        const callSettings = {
+            ...this.settings,
+            ...settings,
+            abortSignal: run?.abortSignal,
+            data,
+        };
+        return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
+            call: async () => callHuggingFaceImageDescriptionAPI(callSettings),
+        });
+    }
+    get settingsForEvent() {
+        return {};
+    }
+    generateImageDescriptionResponse(data, options) {
+        return this.callAPI(data, options);
+    }
+    extractImageDescription(response) {
+        return response[0].generated_text;
+    }
+    withSettings(additionalSettings) {
+        return new HuggingFaceImageDescriptionModel(Object.assign({}, this.settings, additionalSettings));
+    }
+}
+exports.HuggingFaceImageDescriptionModel = HuggingFaceImageDescriptionModel;
+const huggingFaceImageDescriptionResponseSchema = zod_1.default.array(zod_1.default.object({
+    generated_text: zod_1.default.string(),
+}));
+async function callHuggingFaceImageDescriptionAPI({ api = new HuggingFaceApiConfiguration_js_1.HuggingFaceApiConfiguration(), abortSignal, model, data, }) {
+    return (0, postToApi_js_1.postToApi)({
+        url: api.assembleUrl(`/${model}`),
+        headers: api.headers,
+        body: {
+            content: data,
+            values: {},
+        },
+        failedResponseHandler: HuggingFaceError_js_1.failedHuggingFaceCallResponseHandler,
+        successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(huggingFaceImageDescriptionResponseSchema),
+        abortSignal,
+    });
+}

package/model-provider/huggingface/HuggingFaceImageDescriptionModel.d.ts

@@ -0,0 +1,37 @@
+/// <reference types="node" resolution-mode="require"/>
+import z from "zod";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
+import { ImageDescriptionModel, ImageDescriptionModelSettings } from "../../model-function/describe-image/ImageDescriptionModel.js";
+export interface HuggingFaceImageDescriptionModelSettings extends ImageDescriptionModelSettings {
+    api?: ApiConfiguration;
+    model: string;
+}
+/**
+ * Create an image to text model that calls a Hugging Face Image-to-Text Inference API.
+ *
+ * @see https://huggingface.co/tasks/image-to-text
+ */
+export declare class HuggingFaceImageDescriptionModel extends AbstractModel<HuggingFaceImageDescriptionModelSettings> implements ImageDescriptionModel<Buffer, HuggingFaceImageDescriptionResponse, HuggingFaceImageDescriptionModelSettings> {
+    constructor(settings: HuggingFaceImageDescriptionModelSettings);
+    readonly provider = "huggingface";
+    get modelName(): string;
+    callAPI(data: Buffer, options?: ModelFunctionOptions<HuggingFaceImageDescriptionModelSettings>): Promise<HuggingFaceImageDescriptionResponse>;
+    get settingsForEvent(): Partial<HuggingFaceImageDescriptionModelSettings>;
+    readonly countPromptTokens: undefined;
+    generateImageDescriptionResponse(data: Buffer, options?: ModelFunctionOptions<HuggingFaceImageDescriptionModelSettings>): Promise<{
+        generated_text: string;
+    }[]>;
+    extractImageDescription(response: HuggingFaceImageDescriptionResponse): string;
+    withSettings(additionalSettings: Partial<HuggingFaceImageDescriptionModelSettings>): this;
+}
+declare const huggingFaceImageDescriptionResponseSchema: z.ZodArray<z.ZodObject<{
+    generated_text: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    generated_text: string;
+}, {
+    generated_text: string;
+}>, "many">;
+export type HuggingFaceImageDescriptionResponse = z.infer<typeof huggingFaceImageDescriptionResponseSchema>;
+export {};

package/model-provider/huggingface/HuggingFaceImageDescriptionModel.js

@@ -0,0 +1,74 @@
+import z from "zod";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postToApi, } from "../../core/api/postToApi.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { HuggingFaceApiConfiguration } from "./HuggingFaceApiConfiguration.js";
+import { failedHuggingFaceCallResponseHandler } from "./HuggingFaceError.js";
+/**
+ * Create an image to text model that calls a Hugging Face Image-to-Text Inference API.
+ *
+ * @see https://huggingface.co/tasks/image-to-text
+ */
+export class HuggingFaceImageDescriptionModel extends AbstractModel {
+    constructor(settings) {
+        super({ settings });
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "huggingface"
+        });
+        Object.defineProperty(this, "countPromptTokens", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
+    }
+    get modelName() {
+        return this.settings.model;
+    }
+    async callAPI(data, options) {
+        const run = options?.run;
+        const settings = options?.settings;
+        const callSettings = {
+            ...this.settings,
+            ...settings,
+            abortSignal: run?.abortSignal,
+            data,
+        };
+        return callWithRetryAndThrottle({
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
+            call: async () => callHuggingFaceImageDescriptionAPI(callSettings),
+        });
+    }
+    get settingsForEvent() {
+        return {};
+    }
+    generateImageDescriptionResponse(data, options) {
+        return this.callAPI(data, options);
+    }
+    extractImageDescription(response) {
+        return response[0].generated_text;
+    }
+    withSettings(additionalSettings) {
+        return new HuggingFaceImageDescriptionModel(Object.assign({}, this.settings, additionalSettings));
+    }
+}
+const huggingFaceImageDescriptionResponseSchema = z.array(z.object({
+    generated_text: z.string(),
+}));
+async function callHuggingFaceImageDescriptionAPI({ api = new HuggingFaceApiConfiguration(), abortSignal, model, data, }) {
+    return postToApi({
+        url: api.assembleUrl(`/${model}`),
+        headers: api.headers,
+        body: {
+            content: data,
+            values: {},
+        },
+        failedResponseHandler: failedHuggingFaceCallResponseHandler,
+        successfulResponseHandler: createJsonResponseHandler(huggingFaceImageDescriptionResponseSchema),
+        abortSignal,
+    });
+}

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.cjs

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HuggingFaceTextEmbeddingModel = void 0;
 const zod_1 = __importDefault(require("zod"));
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const HuggingFaceError_js_1 = require("./HuggingFaceError.cjs");
 const HuggingFaceApiConfiguration_js_1 = require("./HuggingFaceApiConfiguration.cjs");
 /**

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { TextEmbeddingModel, TextEmbeddingModelSettings } from "../../model-function/embed-text/TextEmbeddingModel.js";
 export interface HuggingFaceTextEmbeddingModelSettings extends TextEmbeddingModelSettings {

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.js

@@ -1,7 +1,7 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { failedHuggingFaceCallResponseHandler } from "./HuggingFaceError.js";
 import { HuggingFaceApiConfiguration } from "./HuggingFaceApiConfiguration.js";
 /**

package/model-provider/huggingface/HuggingFaceTextGenerationModel.cjs

@@ -7,8 +7,8 @@ exports.HuggingFaceTextGenerationModel = void 0;
 const zod_1 = __importDefault(require("zod"));
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptFormatTextGenerationModel_js_1 = require("../../prompt/PromptFormatTextGenerationModel.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const HuggingFaceApiConfiguration_js_1 = require("./HuggingFaceApiConfiguration.cjs");
 const HuggingFaceError_js_1 = require("./HuggingFaceError.cjs");
 /**

package/model-provider/huggingface/HuggingFaceTextGenerationModel.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "../../model-function/generate-text/TextGenerationModel.js";
 import { PromptFormat } from "../../prompt/PromptFormat.js";

package/model-provider/huggingface/HuggingFaceTextGenerationModel.js

@@ -1,8 +1,8 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextGenerationModel } from "../../prompt/PromptFormatTextGenerationModel.js";
-import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { HuggingFaceApiConfiguration } from "./HuggingFaceApiConfiguration.js";
 import { failedHuggingFaceCallResponseHandler } from "./HuggingFaceError.js";
 /**

package/model-provider/huggingface/index.cjs

@@ -18,5 +18,6 @@ exports.HuggingFaceError = void 0;
 __exportStar(require("./HuggingFaceApiConfiguration.cjs"), exports);
 var HuggingFaceError_js_1 = require("./HuggingFaceError.cjs");
 Object.defineProperty(exports, "HuggingFaceError", { enumerable: true, get: function () { return HuggingFaceError_js_1.HuggingFaceError; } });
+__exportStar(require("./HuggingFaceImageDescriptionModel.cjs"), exports);
 __exportStar(require("./HuggingFaceTextEmbeddingModel.cjs"), exports);
 __exportStar(require("./HuggingFaceTextGenerationModel.cjs"), exports);

package/model-provider/huggingface/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./HuggingFaceApiConfiguration.js";
 export { HuggingFaceError, HuggingFaceErrorData } from "./HuggingFaceError.js";
+export * from "./HuggingFaceImageDescriptionModel.js";
 export * from "./HuggingFaceTextEmbeddingModel.js";
 export * from "./HuggingFaceTextGenerationModel.js";

package/model-provider/huggingface/index.js

@@ -1,4 +1,5 @@
 export * from "./HuggingFaceApiConfiguration.js";
 export { HuggingFaceError } from "./HuggingFaceError.js";
+export * from "./HuggingFaceImageDescriptionModel.js";
 export * from "./HuggingFaceTextEmbeddingModel.js";
 export * from "./HuggingFaceTextGenerationModel.js";

package/model-provider/llamacpp/LlamaCppApiConfiguration.cjs

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppApiConfiguration = void 0;
-const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
-class LlamaCppApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
+class LlamaCppApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
     constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {},
             retry,
             throttle,
         });

package/model-provider/llamacpp/LlamaCppApiConfiguration.d.ts

@@ -1,7 +1,7 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
-export declare class LlamaCppApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { RetryFunction } from "../../core/api/RetryFunction.js";
+import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
+export declare class LlamaCppApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl, retry, throttle, }?: {
         baseUrl?: string;
         retry?: RetryFunction;

package/model-provider/llamacpp/LlamaCppApiConfiguration.js

@@ -1,8 +1,9 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-export class LlamaCppApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+export class LlamaCppApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {},
             retry,
             throttle,
         });

package/model-provider/llamacpp/LlamaCppError.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedLlamaCppCallResponseHandler = exports.LlamaCppError = exports.llamaCppErrorDataSchema = void 0;
 const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
 const zod_1 = require("zod");
-const ApiCallError_js_1 = require("../../util/api/ApiCallError.cjs");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 exports.llamaCppErrorDataSchema = zod_1.z.object({
     error: zod_1.z.string(),
 });

package/model-provider/llamacpp/LlamaCppError.d.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { ApiCallError } from "../../util/api/ApiCallError.js";
-import { ResponseHandler } from "../../util/api/postToApi.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { ResponseHandler } from "../../core/api/postToApi.js";
 export declare const llamaCppErrorDataSchema: z.ZodObject<{
     error: z.ZodString;
 }, "strip", z.ZodTypeAny, {

package/model-provider/llamacpp/LlamaCppError.js

@@ -1,6 +1,6 @@
 import SecureJSON from "secure-json-parse";
 import { z } from "zod";
-import { ApiCallError } from "../../util/api/ApiCallError.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
 export const llamaCppErrorDataSchema = z.object({
     error: z.string(),
 });

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.cjs

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppTextEmbeddingModel = void 0;
 const zod_1 = __importDefault(require("zod"));
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { TextEmbeddingModel, TextEmbeddingModelSettings } from "../../model-function/embed-text/TextEmbeddingModel.js";
 export interface LlamaCppTextEmbeddingModelSettings extends TextEmbeddingModelSettings {

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.js

@@ -1,7 +1,7 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";

package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs

@@ -10,8 +10,8 @@ const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const AsyncQueue_js_1 = require("../../model-function/generate-text/AsyncQueue.cjs");
 const parseEventSourceReadableStream_js_1 = require("../../model-function/generate-text/parseEventSourceReadableStream.cjs");
 const PromptFormatTextGenerationModel_js_1 = require("../../prompt/PromptFormatTextGenerationModel.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");

package/model-provider/llamacpp/LlamaCppTextGenerationModel.d.ts

@@ -1,12 +1,12 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { DeltaEvent } from "../../model-function/generate-text/DeltaEvent.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "../../model-function/generate-text/TextGenerationModel.js";
 import { PromptFormat } from "../../prompt/PromptFormat.js";
 import { PromptFormatTextGenerationModel } from "../../prompt/PromptFormatTextGenerationModel.js";
-import { ResponseHandler } from "../../util/api/postToApi.js";
+import { ResponseHandler } from "../../core/api/postToApi.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export interface LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE extends number | undefined> extends TextGenerationModelSettings {
     api?: ApiConfiguration;

package/model-provider/llamacpp/LlamaCppTextGenerationModel.js

@@ -4,8 +4,8 @@ import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { AsyncQueue } from "../../model-function/generate-text/AsyncQueue.js";
 import { parseEventSourceReadableStream } from "../../model-function/generate-text/parseEventSourceReadableStream.js";
 import { PromptFormatTextGenerationModel } from "../../prompt/PromptFormatTextGenerationModel.js";
-import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";

package/model-provider/llamacpp/LlamaCppTokenizer.cjs

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppTokenizer = void 0;
 const zod_1 = __importDefault(require("zod"));
-const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 /**

package/model-provider/llamacpp/LlamaCppTokenizer.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { Run } from "../../core/Run.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { BasicTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 /**
  * Tokenizer for LlamaCpp.

package/model-provider/llamacpp/LlamaCppTokenizer.js

@@ -1,6 +1,6 @@
 import z from "zod";
-import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 /**

package/model-provider/lmnt/LmntApiConfiguration.cjs

@@ -1,29 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LmntApiConfiguration = void 0;
-const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
-const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
-class LmntApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
+class LmntApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://api.lmnt.com/speech/beta", apiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                "X-API-Key": (0, loadApiKey_js_1.loadApiKey)({
+                    apiKey,
+                    environmentVariableName: "LMNT_API_KEY",
+                    description: "LMNT",
+                }),
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "apiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.apiKey = (0, loadApiKey_js_1.loadApiKey)({
-            apiKey,
-            environmentVariableName: "LMNT_API_KEY",
-            description: "LMNT",
-        });
-    }
-    get headers() {
-        return { "X-API-Key": this.apiKey };
     }
 }
 exports.LmntApiConfiguration = LmntApiConfiguration;

package/model-provider/lmnt/LmntApiConfiguration.d.ts

@@ -1,13 +1,11 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
-export declare class LmntApiConfiguration extends BasicApiConfiguration {
-    readonly apiKey: string;
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { RetryFunction } from "../../core/api/RetryFunction.js";
+import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
+export declare class LmntApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl, apiKey, retry, throttle, }?: {
         baseUrl?: string;
         apiKey?: string;
         retry?: RetryFunction;
         throttle?: ThrottleFunction;
     });
-    get headers(): Record<string, string>;
 }

package/model-provider/lmnt/LmntApiConfiguration.js

@@ -1,25 +1,18 @@
-import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
-import { loadApiKey } from "../../util/api/loadApiKey.js";
-export class LmntApiConfiguration extends BasicApiConfiguration {
+import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { loadApiKey } from "../../core/api/loadApiKey.js";
+export class LmntApiConfiguration extends BaseUrlApiConfiguration {
     constructor({ baseUrl = "https://api.lmnt.com/speech/beta", apiKey, retry, throttle, } = {}) {
         super({
             baseUrl,
+            headers: {
+                "X-API-Key": loadApiKey({
+                    apiKey,
+                    environmentVariableName: "LMNT_API_KEY",
+                    description: "LMNT",
+                }),
+            },
             retry,
             throttle,
         });
-        Object.defineProperty(this, "apiKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.apiKey = loadApiKey({
-            apiKey,
-            environmentVariableName: "LMNT_API_KEY",
-            description: "LMNT",
-        });
-    }
-    get headers() {
-        return { "X-API-Key": this.apiKey };
     }
 }

package/model-provider/lmnt/LmntError.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedLmntCallResponseHandler = void 0;
-const ApiCallError_js_1 = require("../../util/api/ApiCallError.cjs");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 const failedLmntCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     try {

package/model-provider/lmnt/LmntError.d.ts

@@ -1,3 +1,3 @@
-import { ApiCallError } from "../../util/api/ApiCallError.js";
-import { ResponseHandler } from "../../util/api/postToApi.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { ResponseHandler } from "../../core/api/postToApi.js";
 export declare const failedLmntCallResponseHandler: ResponseHandler<ApiCallError>;

package/model-provider/lmnt/LmntError.js

@@ -1,4 +1,4 @@
-import { ApiCallError } from "../../util/api/ApiCallError.js";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
 export const failedLmntCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     try {

package/model-provider/lmnt/LmntSpeechSynthesisModel.cjs

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LmntSpeechSynthesisModel = void 0;
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const LmntApiConfiguration_js_1 = require("./LmntApiConfiguration.cjs");
 const LmntError_js_1 = require("./LmntError.cjs");
 /**

package/model-provider/lmnt/LmntSpeechSynthesisModel.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { SpeechSynthesisModel, SpeechSynthesisModelSettings } from "../../model-function/synthesize-speech/SpeechSynthesisModel.js";
 export interface LmntSpeechSynthesisModelSettings extends SpeechSynthesisModelSettings {

package/model-provider/lmnt/LmntSpeechSynthesisModel.js

@@ -1,6 +1,6 @@
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
-import { createAudioMpegResponseHandler, postToApi, } from "../../util/api/postToApi.js";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createAudioMpegResponseHandler, postToApi, } from "../../core/api/postToApi.js";
 import { LmntApiConfiguration } from "./LmntApiConfiguration.js";
 import { failedLmntCallResponseHandler } from "./LmntError.js";
 /**