modelfusion 0.26.0 → 0.27.1

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -12,6 +12,7 @@ const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens
 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 CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereError_js_1 = require("./CohereError.cjs");
 const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");
 exports.COHERE_TEXT_GENERATION_MODELS = {
@@ -69,23 +70,13 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         this.contextWindowSize =
             exports.COHERE_TEXT_GENERATION_MODELS[this.settings.model].contextWindowSize;
         this.tokenizer = new CohereTokenizer_js_1.CohereTokenizer({
-            baseUrl: this.settings.baseUrl,
-            apiKey: this.settings.apiKey,
+            api: this.settings.api,
             model: this.settings.model,
-            retry: this.settings.tokenizerSettings?.retry,
-            throttle: this.settings.tokenizerSettings?.throttle,
         });
     }
     get modelName() {
         return this.settings.model;
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.COHERE_API_KEY;
-        if (apiKey == null) {
-            throw new Error("No Cohere API key provided. Pass an API key to the constructor or set the COHERE_API_KEY environment variable.");
-        }
-        return apiKey;
-    }
     async countPromptTokens(input) {
         return (0, countTokens_js_1.countTokens)(this.tokenizer, input);
     }
@@ -96,7 +87,6 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             settings,
         };
         const callSettings = {
-            apiKey: this.apiKey,
             ...combinedSettings,
             // use endSequences instead of stopSequences
             // to exclude stop tokens from the generated text
@@ -109,8 +99,8 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             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 () => callCohereTextGenerationAPI(callSettings),
         });
     }
@@ -118,7 +108,6 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         const eventSettingProperties = [
             "maxCompletionTokens",
             "stopSequences",
-            "baseUrl",
             "numGenerations",
             "temperature",
             "k",
@@ -179,28 +168,10 @@ const cohereTextGenerationResponseSchema = zod_1.z.object({
     })
         .optional(),
 });
-/**
- * Call the Cohere Co.Generate API to generate a text completion for the given prompt.
- *
- * @see https://docs.cohere.com/reference/generate
- *
- * @example
- * const response = await callCohereTextGenerationAPI({
- *   apiKey: COHERE_API_KEY,
- *   model: "command-nightly",
- *   prompt: "Write a short story about a robot learning to love:\n\n",
- *   temperature: 0.7,
- *   maxTokens: 500,
- * });
- *
- * console.log(response.generations[0].text);
- */
-async function callCohereTextGenerationAPI({ baseUrl = "https://api.cohere.ai/v1", abortSignal, responseFormat, apiKey, model, prompt, numGenerations, maxTokens, temperature, k, p, frequencyPenalty, presencePenalty, endSequences, stopSequences, returnLikelihoods, logitBias, truncate, }) {
+async function callCohereTextGenerationAPI({ api = new CohereApiConfiguration_js_1.CohereApiConfiguration(), abortSignal, responseFormat, model, prompt, numGenerations, maxTokens, temperature, k, p, frequencyPenalty, presencePenalty, endSequences, stopSequences, returnLikelihoods, logitBias, truncate, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/generate`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl(`/generate`),
+        headers: api.headers,
         body: {
             stream: responseFormat.stream,
             model,

package/model-provider/cohere/CohereTextGenerationModel.d.ts

@@ -1,12 +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 { 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 { CohereTokenizer } from "./CohereTokenizer.js";
 export declare const COHERE_TEXT_GENERATION_MODELS: {
@@ -25,15 +24,8 @@ export declare const COHERE_TEXT_GENERATION_MODELS: {
 };
 export type CohereTextGenerationModelType = keyof typeof COHERE_TEXT_GENERATION_MODELS;
 export interface CohereTextGenerationModelSettings extends TextGenerationModelSettings {
+    api?: ApiConfiguration;
     model: CohereTextGenerationModelType;
-    baseUrl?: string;
-    apiKey?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
-    tokenizerSettings?: {
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
-    };
     numGenerations?: number;
     temperature?: number;
     k?: number;
@@ -68,7 +60,6 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
     get modelName(): "command" | "command-nightly" | "command-light" | "command-light-nightly";
     readonly contextWindowSize: number;
     readonly tokenizer: CohereTokenizer;
-    private get apiKey();
     countPromptTokens(input: string): Promise<number>;
     callAPI<RESPONSE>(prompt: string, options: {
         responseFormat: CohereTextGenerationResponseFormatType<RESPONSE>;

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -6,6 +6,7 @@ import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { PromptFormatTextGenerationModel } from "../../prompt/PromptFormatTextGenerationModel.js";
 import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
+import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
 export const COHERE_TEXT_GENERATION_MODELS = {
@@ -63,23 +64,13 @@ export class CohereTextGenerationModel extends AbstractModel {
         this.contextWindowSize =
             COHERE_TEXT_GENERATION_MODELS[this.settings.model].contextWindowSize;
         this.tokenizer = new CohereTokenizer({
-            baseUrl: this.settings.baseUrl,
-            apiKey: this.settings.apiKey,
+            api: this.settings.api,
             model: this.settings.model,
-            retry: this.settings.tokenizerSettings?.retry,
-            throttle: this.settings.tokenizerSettings?.throttle,
         });
     }
     get modelName() {
         return this.settings.model;
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.COHERE_API_KEY;
-        if (apiKey == null) {
-            throw new Error("No Cohere API key provided. Pass an API key to the constructor or set the COHERE_API_KEY environment variable.");
-        }
-        return apiKey;
-    }
     async countPromptTokens(input) {
         return countTokens(this.tokenizer, input);
     }
@@ -90,7 +81,6 @@ export class CohereTextGenerationModel extends AbstractModel {
             settings,
         };
         const callSettings = {
-            apiKey: this.apiKey,
             ...combinedSettings,
             // use endSequences instead of stopSequences
             // to exclude stop tokens from the generated text
@@ -103,8 +93,8 @@ export class CohereTextGenerationModel extends AbstractModel {
             responseFormat,
         };
         return callWithRetryAndThrottle({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callCohereTextGenerationAPI(callSettings),
         });
     }
@@ -112,7 +102,6 @@ export class CohereTextGenerationModel extends AbstractModel {
         const eventSettingProperties = [
             "maxCompletionTokens",
             "stopSequences",
-            "baseUrl",
             "numGenerations",
             "temperature",
             "k",
@@ -172,28 +161,10 @@ const cohereTextGenerationResponseSchema = z.object({
     })
         .optional(),
 });
-/**
- * Call the Cohere Co.Generate API to generate a text completion for the given prompt.
- *
- * @see https://docs.cohere.com/reference/generate
- *
- * @example
- * const response = await callCohereTextGenerationAPI({
- *   apiKey: COHERE_API_KEY,
- *   model: "command-nightly",
- *   prompt: "Write a short story about a robot learning to love:\n\n",
- *   temperature: 0.7,
- *   maxTokens: 500,
- * });
- *
- * console.log(response.generations[0].text);
- */
-async function callCohereTextGenerationAPI({ baseUrl = "https://api.cohere.ai/v1", abortSignal, responseFormat, apiKey, model, prompt, numGenerations, maxTokens, temperature, k, p, frequencyPenalty, presencePenalty, endSequences, stopSequences, returnLikelihoods, logitBias, truncate, }) {
+async function callCohereTextGenerationAPI({ api = new CohereApiConfiguration(), abortSignal, responseFormat, model, prompt, numGenerations, maxTokens, temperature, k, p, frequencyPenalty, presencePenalty, endSequences, stopSequences, returnLikelihoods, logitBias, truncate, }) {
     return postJsonToApi({
-        url: `${baseUrl}/generate`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl(`/generate`),
+        headers: api.headers,
         body: {
             stream: responseFormat.stream,
             model,

package/model-provider/cohere/CohereTokenizer.cjs

@@ -8,6 +8,7 @@ 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 CohereError_js_1 = require("./CohereError.cjs");
+const CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 /**
  * Tokenizer for the Cohere models. It uses the Co.Tokenize and Co.Detokenize APIs.
  *
@@ -34,20 +35,12 @@ class CohereTokenizer {
         });
         this.settings = settings;
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.COHERE_API_KEY;
-        if (apiKey == null) {
-            throw new Error("No Cohere API key provided. Pass an API key to the constructor or set the COHERE_API_KEY environment variable.");
-        }
-        return apiKey;
-    }
     async callTokenizeAPI(text, context) {
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: this.settings.api?.retry,
+            throttle: this.settings.api?.throttle,
             call: async () => callCohereTokenizeAPI({
                 abortSignal: context?.abortSignal,
-                apiKey: this.apiKey,
                 text,
                 ...this.settings,
             }),
@@ -55,11 +48,10 @@ class CohereTokenizer {
     }
     async callDeTokenizeAPI(tokens, context) {
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: this.settings.api?.retry,
+            throttle: this.settings.api?.throttle,
             call: async () => callCohereDetokenizeAPI({
                 abortSignal: context?.abortSignal,
-                apiKey: this.apiKey,
                 tokens,
                 ...this.settings,
             }),
@@ -89,17 +81,10 @@ const cohereDetokenizationResponseSchema = zod_1.default.object({
         }),
     }),
 });
-/**
- * Call the Cohere Co.Detokenize API to detokenize a text.
- *
- * https://docs.cohere.com/reference/detokenize-1
- */
-async function callCohereDetokenizeAPI({ baseUrl = "https://api.cohere.ai/v1", abortSignal, apiKey, model, tokens, }) {
+async function callCohereDetokenizeAPI({ api = new CohereApiConfiguration_js_1.CohereApiConfiguration(), abortSignal, model, tokens, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/detokenize`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl(`/detokenize`),
+        headers: api.headers,
         body: {
             model,
             tokens,
@@ -118,17 +103,10 @@ const cohereTokenizationResponseSchema = zod_1.default.object({
         }),
     }),
 });
-/**
- * Call the Cohere Co.Tokenize API to tokenize a text.
- *
- * https://docs.cohere.com/reference/tokenize
- */
-async function callCohereTokenizeAPI({ baseUrl = "https://api.cohere.ai/v1", abortSignal, apiKey, model, text, }) {
+async function callCohereTokenizeAPI({ api = new CohereApiConfiguration_js_1.CohereApiConfiguration(), abortSignal, model, text, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/tokenize`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl(`/tokenize`),
+        headers: api.headers,
         body: {
             model,
             text,

package/model-provider/cohere/CohereTokenizer.d.ts

@@ -1,17 +1,13 @@
 import z from "zod";
-import { FullTokenizer } 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";
-import { CohereTextGenerationModelType } from "./CohereTextGenerationModel.js";
+import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
+import { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 import { CohereTextEmbeddingModelType } from "./CohereTextEmbeddingModel.js";
+import { CohereTextGenerationModelType } from "./CohereTextGenerationModel.js";
 export type CohereTokenizerModelType = CohereTextGenerationModelType | CohereTextEmbeddingModelType;
 export interface CohereTokenizerSettings {
+    api?: ApiConfiguration;
     model: CohereTokenizerModelType;
-    baseUrl?: string;
-    apiKey?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
 }
 /**
  * Tokenizer for the Cohere models. It uses the Co.Tokenize and Co.Detokenize APIs.
@@ -32,7 +28,6 @@ export interface CohereTokenizerSettings {
 export declare class CohereTokenizer implements FullTokenizer {
     readonly settings: CohereTokenizerSettings;
     constructor(settings: CohereTokenizerSettings);
-    private get apiKey();
     callTokenizeAPI(text: string, context?: Run): Promise<CohereTokenizationResponse>;
     callDeTokenizeAPI(tokens: number[], context?: Run): Promise<CohereDetokenizationResponse>;
     tokenize(text: string): Promise<number[]>;

package/model-provider/cohere/CohereTokenizer.js

@@ -2,6 +2,7 @@ import z from "zod";
 import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../util/api/postToApi.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
+import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 /**
  * Tokenizer for the Cohere models. It uses the Co.Tokenize and Co.Detokenize APIs.
  *
@@ -28,20 +29,12 @@ export class CohereTokenizer {
         });
         this.settings = settings;
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.COHERE_API_KEY;
-        if (apiKey == null) {
-            throw new Error("No Cohere API key provided. Pass an API key to the constructor or set the COHERE_API_KEY environment variable.");
-        }
-        return apiKey;
-    }
     async callTokenizeAPI(text, context) {
         return callWithRetryAndThrottle({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: this.settings.api?.retry,
+            throttle: this.settings.api?.throttle,
             call: async () => callCohereTokenizeAPI({
                 abortSignal: context?.abortSignal,
-                apiKey: this.apiKey,
                 text,
                 ...this.settings,
             }),
@@ -49,11 +42,10 @@ export class CohereTokenizer {
     }
     async callDeTokenizeAPI(tokens, context) {
         return callWithRetryAndThrottle({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: this.settings.api?.retry,
+            throttle: this.settings.api?.throttle,
             call: async () => callCohereDetokenizeAPI({
                 abortSignal: context?.abortSignal,
-                apiKey: this.apiKey,
                 tokens,
                 ...this.settings,
             }),
@@ -82,17 +74,10 @@ const cohereDetokenizationResponseSchema = z.object({
         }),
     }),
 });
-/**
- * Call the Cohere Co.Detokenize API to detokenize a text.
- *
- * https://docs.cohere.com/reference/detokenize-1
- */
-async function callCohereDetokenizeAPI({ baseUrl = "https://api.cohere.ai/v1", abortSignal, apiKey, model, tokens, }) {
+async function callCohereDetokenizeAPI({ api = new CohereApiConfiguration(), abortSignal, model, tokens, }) {
     return postJsonToApi({
-        url: `${baseUrl}/detokenize`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl(`/detokenize`),
+        headers: api.headers,
         body: {
             model,
             tokens,
@@ -111,17 +96,10 @@ const cohereTokenizationResponseSchema = z.object({
         }),
     }),
 });
-/**
- * Call the Cohere Co.Tokenize API to tokenize a text.
- *
- * https://docs.cohere.com/reference/tokenize
- */
-async function callCohereTokenizeAPI({ baseUrl = "https://api.cohere.ai/v1", abortSignal, apiKey, model, text, }) {
+async function callCohereTokenizeAPI({ api = new CohereApiConfiguration(), abortSignal, model, text, }) {
     return postJsonToApi({
-        url: `${baseUrl}/tokenize`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl(`/tokenize`),
+        headers: api.headers,
         body: {
             model,
             text,

package/model-provider/cohere/index.cjs

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

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

@@ -1,3 +1,4 @@
+export * from "./CohereApiConfiguration.js";
 export { CohereError, CohereErrorData } from "./CohereError.js";
 export * from "./CohereTextEmbeddingModel.js";
 export * from "./CohereTextGenerationModel.js";

package/model-provider/cohere/index.js

@@ -1,3 +1,4 @@
+export * from "./CohereApiConfiguration.js";
 export { CohereError } from "./CohereError.js";
 export * from "./CohereTextEmbeddingModel.js";
 export * from "./CohereTextGenerationModel.js";

package/model-provider/elevenlabs/ElevenLabsApiConfiguration.cjs

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ElevenLabsApiConfiguration = void 0;
+const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
+class ElevenLabsApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+    constructor({ baseUrl = "https://api.elevenlabs.io/v1", 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: "ELEVENLABS_API_KEY",
+            description: "ElevenLabs",
+        });
+    }
+    get headers() {
+        return { "xi-api-key": this.apiKey };
+    }
+}
+exports.ElevenLabsApiConfiguration = ElevenLabsApiConfiguration;

package/model-provider/elevenlabs/ElevenLabsApiConfiguration.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 ElevenLabsApiConfiguration 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/elevenlabs/ElevenLabsApiConfiguration.js

@@ -0,0 +1,25 @@
+import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
+import { loadApiKey } from "../../util/api/loadApiKey.js";
+export class ElevenLabsApiConfiguration extends BasicApiConfiguration {
+    constructor({ baseUrl = "https://api.elevenlabs.io/v1", 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: "ELEVENLABS_API_KEY",
+            description: "ElevenLabs",
+        });
+    }
+    get headers() {
+        return { "xi-api-key": this.apiKey };
+    }
+}

package/model-provider/elevenlabs/ElevenLabsSpeechSynthesisModel.cjs

@@ -4,7 +4,13 @@ exports.ElevenLabsSpeechSynthesisModel = 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 ElevenLabsApiConfiguration_js_1 = require("./ElevenLabsApiConfiguration.cjs");
 const ElevenLabsError_js_1 = require("./ElevenLabsError.cjs");
+/**
+ * Synthesize speech using the ElevenLabs Text to Speech API.
+ *
+ * @see https://api.elevenlabs.io/docs#/text-to-speech/Text_to_speech_v1_text_to_speech__voice_id__post
+ */
 class ElevenLabsSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
         super({ settings });
@@ -14,19 +20,9 @@ class ElevenLabsSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
             writable: true,
             value: "elevenlabs"
         });
-        Object.defineProperty(this, "modelName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: null
-        });
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.ELEVENLABS_API_KEY;
-        if (apiKey == null) {
-            throw new Error("No ElevenLabs API key provided. Pass it in the constructor or set the ELEVENLABS_API_KEY environment variable.");
-        }
-        return apiKey;
+    get modelName() {
+        return this.settings.voice;
     }
     async callAPI(text, options) {
         const run = options?.run;
@@ -35,23 +31,22 @@ class ElevenLabsSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
             ...this.settings,
             ...settings,
         };
+        const callSettings = {
+            api: combinedSettings.api,
+            abortSignal: run?.abortSignal,
+            text,
+            voiceId: combinedSettings.voice,
+            modelId: combinedSettings.model,
+            voiceSettings: combinedSettings.voiceSettings,
+        };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
-            call: async () => callElevenLabsTextToSpeechAPI({
-                baseUrl: combinedSettings.baseUrl,
-                abortSignal: run?.abortSignal,
-                apiKey: this.apiKey,
-                text,
-                voiceId: combinedSettings.voice,
-                modelId: combinedSettings.model,
-                voiceSettings: combinedSettings.voiceSettings,
-            }),
+            retry: combinedSettings.api?.retry,
+            throttle: combinedSettings.api?.throttle,
+            call: async () => callElevenLabsTextToSpeechAPI(callSettings),
         });
     }
     get settingsForEvent() {
         return {
-            baseUrl: this.settings.baseUrl,
             model: this.settings.model,
             voice: this.settings.voice,
             voiceSettings: this.settings.voiceSettings,
@@ -68,15 +63,10 @@ class ElevenLabsSpeechSynthesisModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.ElevenLabsSpeechSynthesisModel = ElevenLabsSpeechSynthesisModel;
-/**
- * @see https://api.elevenlabs.io/docs#/text-to-speech/Text_to_speech_v1_text_to_speech__voice_id__post
- */
-async function callElevenLabsTextToSpeechAPI({ baseUrl = "https://api.elevenlabs.io/v1", abortSignal, apiKey, text, voiceId, modelId, voiceSettings, }) {
+async function callElevenLabsTextToSpeechAPI({ api = new ElevenLabsApiConfiguration_js_1.ElevenLabsApiConfiguration(), abortSignal, text, voiceId, modelId, voiceSettings, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/text-to-speech/${voiceId}`,
-        headers: {
-            "xi-api-key": apiKey,
-        },
+        url: api.assembleUrl(`/text-to-speech/${voiceId}`),
+        headers: api.headers,
         body: {
             text,
             model_id: modelId,

package/model-provider/elevenlabs/ElevenLabsSpeechSynthesisModel.d.ts

@@ -1,13 +1,11 @@
 /// <reference types="node" resolution-mode="require"/>
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
 import { SpeechSynthesisModel, SpeechSynthesisModelSettings } from "../../model-function/synthesize-speech/SpeechSynthesisModel.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
 export interface ElevenLabsSpeechSynthesisModelSettings extends SpeechSynthesisModelSettings {
+    api?: ApiConfiguration;
     voice: string;
-    baseUrl?: string;
-    apiKey?: string;
     model?: string;
     voiceSettings?: {
         stability: number;
@@ -15,14 +13,16 @@ export interface ElevenLabsSpeechSynthesisModelSettings extends SpeechSynthesisM
         style?: number;
         useSpeakerBoost?: boolean;
     };
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
 }
+/**
+ * Synthesize speech using the ElevenLabs Text to Speech API.
+ *
+ * @see https://api.elevenlabs.io/docs#/text-to-speech/Text_to_speech_v1_text_to_speech__voice_id__post
+ */
 export declare class ElevenLabsSpeechSynthesisModel extends AbstractModel<ElevenLabsSpeechSynthesisModelSettings> implements SpeechSynthesisModel<ElevenLabsSpeechSynthesisModelSettings> {
     constructor(settings: ElevenLabsSpeechSynthesisModelSettings);
     readonly provider = "elevenlabs";
-    readonly modelName: null;
-    private get apiKey();
+    get modelName(): string;
     private callAPI;
     get settingsForEvent(): Partial<ElevenLabsSpeechSynthesisModelSettings>;
     generateSpeechResponse(text: string, options?: ModelFunctionOptions<ElevenLabsSpeechSynthesisModelSettings> | undefined): Promise<Buffer>;