modelfusion 0.27.0 → 0.27.1

package/model-provider/huggingface/index.js

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

package/model-provider/llamacpp/LlamaCppApiConfiguration.cjs

@@ -0,0 +1,14 @@
+"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 {
+    constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
+        super({
+            baseUrl,
+            retry,
+            throttle,
+        });
+    }
+}
+exports.LlamaCppApiConfiguration = LlamaCppApiConfiguration;

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

@@ -0,0 +1,10 @@
+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 {
+    constructor({ baseUrl, retry, throttle, }?: {
+        baseUrl?: string;
+        retry?: RetryFunction;
+        throttle?: ThrottleFunction;
+    });
+}

package/model-provider/llamacpp/LlamaCppApiConfiguration.js

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

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.cjs

@@ -8,6 +8,7 @@ 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 LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");
 class LlamaCppTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
@@ -43,11 +44,7 @@ class LlamaCppTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
             writable: true,
             value: void 0
         });
-        this.tokenizer = new LlamaCppTokenizer_js_1.LlamaCppTokenizer({
-            baseUrl: this.settings.baseUrl,
-            retry: this.settings.tokenizerSettings?.retry,
-            throttle: this.settings.tokenizerSettings?.throttle,
-        });
+        this.tokenizer = new LlamaCppTokenizer_js_1.LlamaCppTokenizer(this.settings.api);
         this.embeddingDimensions = this.settings.embeddingDimensions;
     }
     get modelName() {
@@ -62,19 +59,20 @@ class LlamaCppTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         }
         const run = options?.run;
         const settings = options?.settings;
-        const callSettings = Object.assign({}, this.settings, settings, {
+        const callSettings = {
+            ...this.settings,
+            ...settings,
             abortSignal: run?.abortSignal,
             content: texts[0],
-        });
+        };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callLlamaCppEmbeddingAPI(callSettings),
         });
     }
     get settingsForEvent() {
         return {
-            baseUrl: this.settings.baseUrl,
             embeddingDimensions: this.settings.embeddingDimensions,
         };
     }
@@ -92,9 +90,10 @@ exports.LlamaCppTextEmbeddingModel = LlamaCppTextEmbeddingModel;
 const llamaCppTextEmbeddingResponseSchema = zod_1.default.object({
     embedding: zod_1.default.array(zod_1.default.number()),
 });
-async function callLlamaCppEmbeddingAPI({ baseUrl = "http://127.0.0.1:8080", abortSignal, content, }) {
+async function callLlamaCppEmbeddingAPI({ api = new LlamaCppApiConfiguration_js_1.LlamaCppApiConfiguration(), abortSignal, content, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/embedding`,
+        url: api.assembleUrl(`/embedding`),
+        headers: api.headers,
         body: { content },
         failedResponseHandler: LlamaCppError_js_1.failedLlamaCppCallResponseHandler,
         successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(llamaCppTextEmbeddingResponseSchema),

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

@@ -1,18 +1,11 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { TextEmbeddingModel, TextEmbeddingModelSettings } from "../../model-function/embed-text/TextEmbeddingModel.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
 export interface LlamaCppTextEmbeddingModelSettings extends TextEmbeddingModelSettings {
-    baseUrl?: string;
+    api?: ApiConfiguration;
     embeddingDimensions?: number;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
-    tokenizerSettings?: {
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
-    };
 }
 export declare class LlamaCppTextEmbeddingModel extends AbstractModel<LlamaCppTextEmbeddingModelSettings> implements TextEmbeddingModel<LlamaCppTextEmbeddingResponse, LlamaCppTextEmbeddingModelSettings> {
     constructor(settings?: LlamaCppTextEmbeddingModelSettings);

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.js

@@ -2,6 +2,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 { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export class LlamaCppTextEmbeddingModel extends AbstractModel {
@@ -37,11 +38,7 @@ export class LlamaCppTextEmbeddingModel extends AbstractModel {
             writable: true,
             value: void 0
         });
-        this.tokenizer = new LlamaCppTokenizer({
-            baseUrl: this.settings.baseUrl,
-            retry: this.settings.tokenizerSettings?.retry,
-            throttle: this.settings.tokenizerSettings?.throttle,
-        });
+        this.tokenizer = new LlamaCppTokenizer(this.settings.api);
         this.embeddingDimensions = this.settings.embeddingDimensions;
     }
     get modelName() {
@@ -56,19 +53,20 @@ export class LlamaCppTextEmbeddingModel extends AbstractModel {
         }
         const run = options?.run;
         const settings = options?.settings;
-        const callSettings = Object.assign({}, this.settings, settings, {
+        const callSettings = {
+            ...this.settings,
+            ...settings,
             abortSignal: run?.abortSignal,
             content: texts[0],
-        });
+        };
         return callWithRetryAndThrottle({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callLlamaCppEmbeddingAPI(callSettings),
         });
     }
     get settingsForEvent() {
         return {
-            baseUrl: this.settings.baseUrl,
             embeddingDimensions: this.settings.embeddingDimensions,
         };
     }
@@ -85,9 +83,10 @@ export class LlamaCppTextEmbeddingModel extends AbstractModel {
 const llamaCppTextEmbeddingResponseSchema = z.object({
     embedding: z.array(z.number()),
 });
-async function callLlamaCppEmbeddingAPI({ baseUrl = "http://127.0.0.1:8080", abortSignal, content, }) {
+async function callLlamaCppEmbeddingAPI({ api = new LlamaCppApiConfiguration(), abortSignal, content, }) {
     return postJsonToApi({
-        url: `${baseUrl}/embedding`,
+        url: api.assembleUrl(`/embedding`),
+        headers: api.headers,
         body: { content },
         failedResponseHandler: failedLlamaCppCallResponseHandler,
         successfulResponseHandler: createJsonResponseHandler(llamaCppTextEmbeddingResponseSchema),

package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs

@@ -12,6 +12,7 @@ const parseEventSourceReadableStream_js_1 = require("../../model-function/genera
 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 LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");
 class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
@@ -29,11 +30,7 @@ class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             writable: true,
             value: void 0
         });
-        this.tokenizer = new LlamaCppTokenizer_js_1.LlamaCppTokenizer({
-            baseUrl: this.settings.baseUrl,
-            retry: this.settings.tokenizerSettings?.retry,
-            throttle: this.settings.tokenizerSettings?.throttle,
-        });
+        this.tokenizer = new LlamaCppTokenizer_js_1.LlamaCppTokenizer(this.settings.api);
     }
     get modelName() {
         return null;
@@ -49,15 +46,17 @@ class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         };
         const callSettings = {
             ...combinedSettings,
+            // mapping
             nPredict: combinedSettings.maxCompletionTokens,
             stop: combinedSettings.stopSequences,
+            // other
             abortSignal: run?.abortSignal,
             prompt,
             responseFormat,
         };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callLlamaCppTextGenerationAPI(callSettings),
         });
     }
@@ -65,7 +64,6 @@ class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         const eventSettingProperties = [
             "maxCompletionTokens",
             "stopSequences",
-            "baseUrl",
             "contextWindowSize",
             "temperature",
             "topK",
@@ -183,9 +181,10 @@ const llamaCppTextStreamingResponseSchema = zod_1.default.discriminatedUnion("st
     }),
     llamaCppTextGenerationResponseSchema,
 ]);
-async function callLlamaCppTextGenerationAPI({ baseUrl = "http://127.0.0.1:8080", abortSignal, responseFormat, prompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
+async function callLlamaCppTextGenerationAPI({ api = new LlamaCppApiConfiguration_js_1.LlamaCppApiConfiguration(), abortSignal, responseFormat, prompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/completion`,
+        url: api.assembleUrl(`/completion`),
+        headers: api.headers,
         body: {
             stream: responseFormat.stream,
             prompt,

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

@@ -1,22 +1,15 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { ApiConfiguration } from "../../model-function/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 { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
 import { ResponseHandler } from "../../util/api/postToApi.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export interface LlamaCppTextGenerationModelSettings<CONTEXT_WINDOW_SIZE extends number | undefined> extends TextGenerationModelSettings {
-    baseUrl?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
-    tokenizerSettings?: {
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
-    };
+    api?: ApiConfiguration;
     /**
      * Specify the context window size of the model that you have loaded in your
      * Llama.cpp server.

package/model-provider/llamacpp/LlamaCppTextGenerationModel.js

@@ -6,6 +6,7 @@ import { parseEventSourceReadableStream } from "../../model-function/generate-te
 import { PromptFormatTextGenerationModel } from "../../prompt/PromptFormatTextGenerationModel.js";
 import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export class LlamaCppTextGenerationModel extends AbstractModel {
@@ -23,11 +24,7 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
             writable: true,
             value: void 0
         });
-        this.tokenizer = new LlamaCppTokenizer({
-            baseUrl: this.settings.baseUrl,
-            retry: this.settings.tokenizerSettings?.retry,
-            throttle: this.settings.tokenizerSettings?.throttle,
-        });
+        this.tokenizer = new LlamaCppTokenizer(this.settings.api);
     }
     get modelName() {
         return null;
@@ -43,15 +40,17 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
         };
         const callSettings = {
             ...combinedSettings,
+            // mapping
             nPredict: combinedSettings.maxCompletionTokens,
             stop: combinedSettings.stopSequences,
+            // other
             abortSignal: run?.abortSignal,
             prompt,
             responseFormat,
         };
         return callWithRetryAndThrottle({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callLlamaCppTextGenerationAPI(callSettings),
         });
     }
@@ -59,7 +58,6 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
         const eventSettingProperties = [
             "maxCompletionTokens",
             "stopSequences",
-            "baseUrl",
             "contextWindowSize",
             "temperature",
             "topK",
@@ -176,9 +174,10 @@ const llamaCppTextStreamingResponseSchema = z.discriminatedUnion("stop", [
     }),
     llamaCppTextGenerationResponseSchema,
 ]);
-async function callLlamaCppTextGenerationAPI({ baseUrl = "http://127.0.0.1:8080", abortSignal, responseFormat, prompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
+async function callLlamaCppTextGenerationAPI({ api = new LlamaCppApiConfiguration(), abortSignal, responseFormat, prompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
     return postJsonToApi({
-        url: `${baseUrl}/completion`,
+        url: api.assembleUrl(`/completion`),
+        headers: api.headers,
         body: {
             stream: responseFormat.stream,
             prompt,

package/model-provider/llamacpp/LlamaCppTokenizer.cjs

@@ -7,6 +7,7 @@ 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 LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 /**
  * Tokenizer for LlamaCpp.
@@ -22,23 +23,23 @@ const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
  * const reconstructedText = await tokenizer.detokenize(tokens);
  */
 class LlamaCppTokenizer {
-    constructor(settings = {}) {
-        Object.defineProperty(this, "settings", {
+    constructor(api = new LlamaCppApiConfiguration_js_1.LlamaCppApiConfiguration()) {
+        Object.defineProperty(this, "api", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        this.settings = settings;
+        this.api = api;
     }
     async callTokenizeAPI(text, context) {
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: this.api.retry,
+            throttle: this.api.throttle,
             call: async () => callLlamaCppTokenizeAPI({
+                api: this.api,
                 abortSignal: context?.abortSignal,
                 text,
-                ...this.settings,
             }),
         });
     }
@@ -51,9 +52,10 @@ exports.LlamaCppTokenizer = LlamaCppTokenizer;
 const llamaCppTokenizationResponseSchema = zod_1.default.object({
     tokens: zod_1.default.array(zod_1.default.number()),
 });
-async function callLlamaCppTokenizeAPI({ baseUrl = "http://127.0.0.1:8080", abortSignal, text, }) {
+async function callLlamaCppTokenizeAPI({ api, abortSignal, text, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/tokenize`,
+        url: api.assembleUrl(`/tokenize`),
+        headers: api.headers,
         body: {
             content: text,
         },

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

@@ -1,13 +1,7 @@
 import z from "zod";
-import { BasicTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 import { Run } from "../../core/Run.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
-export interface LlamaCppTokenizerSettings {
-    baseUrl?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
-}
+import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { BasicTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 /**
  * Tokenizer for LlamaCpp.
 
@@ -22,8 +16,8 @@ export interface LlamaCppTokenizerSettings {
  * const reconstructedText = await tokenizer.detokenize(tokens);
  */
 export declare class LlamaCppTokenizer implements BasicTokenizer {
-    readonly settings: LlamaCppTokenizerSettings;
-    constructor(settings?: LlamaCppTokenizerSettings);
+    readonly api: ApiConfiguration;
+    constructor(api?: ApiConfiguration);
     callTokenizeAPI(text: string, context?: Run): Promise<LlamaCppTokenizationResponse>;
     tokenize(text: string): Promise<number[]>;
 }

package/model-provider/llamacpp/LlamaCppTokenizer.js

@@ -1,6 +1,7 @@
 import z from "zod";
 import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 /**
  * Tokenizer for LlamaCpp.
@@ -16,23 +17,23 @@ import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
  * const reconstructedText = await tokenizer.detokenize(tokens);
  */
 export class LlamaCppTokenizer {
-    constructor(settings = {}) {
-        Object.defineProperty(this, "settings", {
+    constructor(api = new LlamaCppApiConfiguration()) {
+        Object.defineProperty(this, "api", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        this.settings = settings;
+        this.api = api;
     }
     async callTokenizeAPI(text, context) {
         return callWithRetryAndThrottle({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: this.api.retry,
+            throttle: this.api.throttle,
             call: async () => callLlamaCppTokenizeAPI({
+                api: this.api,
                 abortSignal: context?.abortSignal,
                 text,
-                ...this.settings,
             }),
         });
     }
@@ -44,9 +45,10 @@ export class LlamaCppTokenizer {
 const llamaCppTokenizationResponseSchema = z.object({
     tokens: z.array(z.number()),
 });
-async function callLlamaCppTokenizeAPI({ baseUrl = "http://127.0.0.1:8080", abortSignal, text, }) {
+async function callLlamaCppTokenizeAPI({ api, abortSignal, text, }) {
     return postJsonToApi({
-        url: `${baseUrl}/tokenize`,
+        url: api.assembleUrl(`/tokenize`),
+        headers: api.headers,
         body: {
             content: text,
         },

package/model-provider/llamacpp/index.cjs

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppError = void 0;
+__exportStar(require("./LlamaCppApiConfiguration.cjs"), exports);
 var LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 Object.defineProperty(exports, "LlamaCppError", { enumerable: true, get: function () { return LlamaCppError_js_1.LlamaCppError; } });
 __exportStar(require("./LlamaCppTextEmbeddingModel.cjs"), exports);

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

@@ -1,3 +1,4 @@
+export * from "./LlamaCppApiConfiguration.js";
 export { LlamaCppError, LlamaCppErrorData } from "./LlamaCppError.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
 export * from "./LlamaCppTextGenerationModel.js";

package/model-provider/llamacpp/index.js

@@ -1,3 +1,4 @@
+export * from "./LlamaCppApiConfiguration.js";
 export { LlamaCppError } from "./LlamaCppError.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
 export * from "./LlamaCppTextGenerationModel.js";

package/model-provider/lmnt/LmntApiConfiguration.cjs

@@ -0,0 +1,29 @@
+"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 {
+    constructor({ baseUrl = "https://api.lmnt.com/speech/beta", apiKey, retry, throttle, } = {}) {
+        super({
+            baseUrl,
+            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

@@ -0,0 +1,13 @@
+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;
+    constructor({ baseUrl, apiKey, retry, throttle, }?: {
+        baseUrl?: string;
+        apiKey?: string;
+        retry?: RetryFunction;
+        throttle?: ThrottleFunction;
+    });
+    get headers(): Record<string, string>;
+}

package/model-provider/lmnt/LmntApiConfiguration.js

@@ -0,0 +1,25 @@
+import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
+import { loadApiKey } from "../../util/api/loadApiKey.js";
+export class LmntApiConfiguration extends BasicApiConfiguration {
+    constructor({ baseUrl = "https://api.lmnt.com/speech/beta", apiKey, retry, throttle, } = {}) {
+        super({
+            baseUrl,
+            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/LmntSpeechSynthesisModel.cjs

@@ -4,7 +4,13 @@ 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 LmntApiConfiguration_js_1 = require("./LmntApiConfiguration.cjs");
 const LmntError_js_1 = require("./LmntError.cjs");
+/**
+ * Synthesize speech using the LMNT API.
+ *
+ * @see https://www.lmnt.com/docs/rest/#synthesize-speech
+ */
 class LmntSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
         super({ settings });
@@ -14,45 +20,28 @@ class LmntSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
             writable: true,
             value: "lmnt"
         });
-        Object.defineProperty(this, "modelName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: null
-        });
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.LMNT_API_KEY;
-        if (apiKey == null) {
-            throw new Error("No LMNT API key provided. Pass it in the constructor or set the LMNT_API_KEY environment variable.");
-        }
-        return apiKey;
+    get modelName() {
+        return this.settings.voice;
     }
     async callAPI(text, options) {
         const run = options?.run;
         const settings = options?.settings;
-        const combinedSettings = {
+        const callSettings = {
+            // copied settings:
             ...this.settings,
             ...settings,
+            abortSignal: run?.abortSignal,
+            text,
         };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
-            call: async () => callLmntTextToSpeechAPI({
-                baseUrl: combinedSettings.baseUrl,
-                abortSignal: run?.abortSignal,
-                apiKey: this.apiKey,
-                text,
-                voice: combinedSettings.voice,
-                speed: combinedSettings.speed,
-                seed: combinedSettings.seed,
-                length: combinedSettings.length,
-            }),
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
+            call: async () => callLmntTextToSpeechAPI(callSettings),
         });
     }
     get settingsForEvent() {
         return {
-            baseUrl: this.settings.baseUrl,
             voice: this.settings.voice,
             speed: this.settings.speed,
             seed: this.settings.seed,
@@ -70,10 +59,7 @@ class LmntSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.LmntSpeechSynthesisModel = LmntSpeechSynthesisModel;
-/**
- * @see https://www.lmnt.com/docs/rest/#synthesize-speech
- */
-async function callLmntTextToSpeechAPI({ baseUrl = "https://api.lmnt.com/speech/beta", abortSignal, apiKey, text, voice, speed, seed, length, }) {
+async function callLmntTextToSpeechAPI({ api = new LmntApiConfiguration_js_1.LmntApiConfiguration(), abortSignal, text, voice, speed, seed, length, }) {
     const formData = new FormData();
     formData.append("text", text);
     formData.append("voice", voice);
@@ -85,10 +71,8 @@ async function callLmntTextToSpeechAPI({ baseUrl = "https://api.lmnt.com/speech/
     if (length != null)
         formData.append("length", length.toString());
     return (0, postToApi_js_1.postToApi)({
-        url: `${baseUrl}/synthesize`,
-        headers: {
-            "X-API-Key": apiKey,
-        },
+        url: api.assembleUrl(`/synthesize`),
+        headers: api.headers,
         body: {
             content: formData,
             values: {