modelfusion 0.27.0 → 0.27.1

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

@@ -1,24 +1,24 @@
 /// <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 LmntSpeechSynthesisModelSettings extends SpeechSynthesisModelSettings {
-    baseUrl?: string;
-    apiKey?: string;
+    api?: ApiConfiguration;
     voice: string;
     speed?: number;
     seed?: number;
     length?: number;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
 }
+/**
+ * Synthesize speech using the LMNT API.
+ *
+ * @see https://www.lmnt.com/docs/rest/#synthesize-speech
+ */
 export declare class LmntSpeechSynthesisModel extends AbstractModel<LmntSpeechSynthesisModelSettings> implements SpeechSynthesisModel<LmntSpeechSynthesisModelSettings> {
     constructor(settings: LmntSpeechSynthesisModelSettings);
     readonly provider = "lmnt";
-    readonly modelName: null;
-    private get apiKey();
+    get modelName(): string;
     private callAPI;
     get settingsForEvent(): Partial<LmntSpeechSynthesisModelSettings>;
     generateSpeechResponse(text: string, options?: ModelFunctionOptions<LmntSpeechSynthesisModelSettings> | undefined): Promise<Buffer>;

package/model-provider/lmnt/LmntSpeechSynthesisModel.js

@@ -1,7 +1,13 @@
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { callWithRetryAndThrottle } from "../../util/api/callWithRetryAndThrottle.js";
 import { createAudioMpegResponseHandler, postToApi, } from "../../util/api/postToApi.js";
+import { LmntApiConfiguration } from "./LmntApiConfiguration.js";
 import { failedLmntCallResponseHandler } from "./LmntError.js";
+/**
+ * Synthesize speech using the LMNT API.
+ *
+ * @see https://www.lmnt.com/docs/rest/#synthesize-speech
+ */
 export class LmntSpeechSynthesisModel extends AbstractModel {
     constructor(settings) {
         super({ settings });
@@ -11,45 +17,28 @@ export class LmntSpeechSynthesisModel extends 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 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,
@@ -66,10 +55,7 @@ export class LmntSpeechSynthesisModel extends AbstractModel {
         });
     }
 }
-/**
- * @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(), abortSignal, text, voice, speed, seed, length, }) {
     const formData = new FormData();
     formData.append("text", text);
     formData.append("voice", voice);
@@ -81,10 +67,8 @@ async function callLmntTextToSpeechAPI({ baseUrl = "https://api.lmnt.com/speech/
     if (length != null)
         formData.append("length", length.toString());
     return postToApi({
-        url: `${baseUrl}/synthesize`,
-        headers: {
-            "X-API-Key": apiKey,
-        },
+        url: api.assembleUrl(`/synthesize`),
+        headers: api.headers,
         body: {
             content: formData,
             values: {

package/model-provider/lmnt/index.cjs

@@ -14,4 +14,5 @@ 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("./LmntApiConfiguration.cjs"), exports);
 __exportStar(require("./LmntSpeechSynthesisModel.cjs"), exports);

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

@@ -1 +1,2 @@
+export * from "./LmntApiConfiguration.js";
 export * from "./LmntSpeechSynthesisModel.js";

package/model-provider/lmnt/index.js

@@ -1 +1,2 @@
+export * from "./LmntApiConfiguration.js";
 export * from "./LmntSpeechSynthesisModel.js";

package/model-provider/openai/AzureOpenAIApiConfiguration.cjs

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AzureOpenAIApiConfiguration = void 0;
+const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
+/**
+ * Cconfiguration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
+ * It creates URLs of the form
+ * `https://[resourceName].openai.azure.com/openai/deployments/[deploymentId]/[path]?api-version=[apiVersion]`
+ *
+ * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
+ */
+class AzureOpenAIApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+    constructor({ resourceName, deploymentId, apiVersion, apiKey, retry, throttle, }) {
+        super({
+            baseUrl: `https://${resourceName}.openai.azure.com/openai/deployments/${deploymentId}`,
+            retry,
+            throttle,
+        });
+        Object.defineProperty(this, "resourceName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "deploymentId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "apiVersion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "apiKey", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.resourceName = resourceName;
+        this.deploymentId = deploymentId;
+        this.apiVersion = apiVersion;
+        this.apiKey = (0, loadApiKey_js_1.loadApiKey)({
+            apiKey,
+            environmentVariableName: "AZURE_OPENAI_API_KEY",
+            description: "Azure OpenAI",
+        });
+    }
+    assembleUrl(path) {
+        return `${this.baseUrl}${path}?api-version=${this.apiVersion}`;
+    }
+    get headers() {
+        return {
+            "api-key": this.apiKey,
+        };
+    }
+}
+exports.AzureOpenAIApiConfiguration = AzureOpenAIApiConfiguration;

package/model-provider/openai/AzureOpenAIApiConfiguration.d.ts

@@ -0,0 +1,26 @@
+import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
+import { RetryFunction } from "../../util/api/RetryFunction.js";
+import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
+/**
+ * Cconfiguration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
+ * It creates URLs of the form
+ * `https://[resourceName].openai.azure.com/openai/deployments/[deploymentId]/[path]?api-version=[apiVersion]`
+ *
+ * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
+ */
+export declare class AzureOpenAIApiConfiguration extends BasicApiConfiguration {
+    readonly resourceName: string;
+    readonly deploymentId: string;
+    readonly apiVersion: string;
+    readonly apiKey: string;
+    constructor({ resourceName, deploymentId, apiVersion, apiKey, retry, throttle, }: {
+        resourceName: string;
+        deploymentId: string;
+        apiVersion: string;
+        apiKey?: string;
+        retry?: RetryFunction;
+        throttle?: ThrottleFunction;
+    });
+    assembleUrl(path: string): string;
+    get headers(): Record<string, string>;
+}

package/model-provider/openai/AzureOpenAIApiConfiguration.js

@@ -0,0 +1,58 @@
+import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
+import { loadApiKey } from "../../util/api/loadApiKey.js";
+/**
+ * Cconfiguration for the Azure OpenAI API. This class is responsible for constructing URLs specific to the Azure OpenAI deployment.
+ * It creates URLs of the form
+ * `https://[resourceName].openai.azure.com/openai/deployments/[deploymentId]/[path]?api-version=[apiVersion]`
+ *
+ * @see https://learn.microsoft.com/en-us/azure/ai-services/openai/reference
+ */
+export class AzureOpenAIApiConfiguration extends BasicApiConfiguration {
+    constructor({ resourceName, deploymentId, apiVersion, apiKey, retry, throttle, }) {
+        super({
+            baseUrl: `https://${resourceName}.openai.azure.com/openai/deployments/${deploymentId}`,
+            retry,
+            throttle,
+        });
+        Object.defineProperty(this, "resourceName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "deploymentId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "apiVersion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "apiKey", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.resourceName = resourceName;
+        this.deploymentId = deploymentId;
+        this.apiVersion = apiVersion;
+        this.apiKey = loadApiKey({
+            apiKey,
+            environmentVariableName: "AZURE_OPENAI_API_KEY",
+            description: "Azure OpenAI",
+        });
+    }
+    assembleUrl(path) {
+        return `${this.baseUrl}${path}?api-version=${this.apiVersion}`;
+    }
+    get headers() {
+        return {
+            "api-key": this.apiKey,
+        };
+    }
+}

package/model-provider/openai/OpenAIApiConfiguration.cjs

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenAIApiConfiguration = void 0;
+const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
+const loadApiKey_js_1 = require("../../util/api/loadApiKey.cjs");
+class OpenAIApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+    constructor({ baseUrl = "https://api.openai.com/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: "OPENAI_API_KEY",
+            description: "OpenAI",
+        });
+    }
+    get headers() {
+        return {
+            Authorization: `Bearer ${this.apiKey}`,
+        };
+    }
+}
+exports.OpenAIApiConfiguration = OpenAIApiConfiguration;

package/model-provider/openai/OpenAIApiConfiguration.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 OpenAIApiConfiguration 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/openai/OpenAIApiConfiguration.js

@@ -0,0 +1,27 @@
+import { BasicApiConfiguration } from "../../model-function/BasicApiConfiguration.js";
+import { loadApiKey } from "../../util/api/loadApiKey.js";
+export class OpenAIApiConfiguration extends BasicApiConfiguration {
+    constructor({ baseUrl = "https://api.openai.com/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: "OPENAI_API_KEY",
+            description: "OpenAI",
+        });
+    }
+    get headers() {
+        return {
+            Authorization: `Bearer ${this.apiKey}`,
+        };
+    }
+}

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -5,6 +5,7 @@ const zod_1 = 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 OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 /**
  * @see https://openai.com/pricing
@@ -43,34 +44,31 @@ class OpenAIImageGenerationModel extends AbstractModel_js_1.AbstractModel {
             value: null
         });
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.OPENAI_API_KEY;
-        if (apiKey == null) {
-            throw new Error(`OpenAI API key is missing. Pass it as an argument to the constructor or set it as an environment variable named OPENAI_API_KEY.`);
-        }
-        return apiKey;
-    }
     async callAPI(prompt, options) {
         const run = options?.run;
         const settings = options?.settings;
         const responseFormat = options?.responseFormat;
-        const callSettings = Object.assign({
-            apiKey: this.apiKey,
+        const combinedSettings = {
+            ...this.settings,
+            ...settings,
+        };
+        const callSettings = {
             user: this.settings.isUserIdForwardingEnabled ? run?.userId : undefined,
-        }, this.settings, settings, {
+            // Copied settings:
+            ...combinedSettings,
+            // other settings:
             abortSignal: run?.abortSignal,
-            prompt,
             responseFormat,
-        });
+            prompt,
+        };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: callSettings.retry,
-            throttle: callSettings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callOpenAIImageGenerationAPI(callSettings),
         });
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "baseUrl",
             "n",
             "size",
         ];
@@ -114,12 +112,10 @@ exports.OpenAIImageGenerationResponseFormat = {
         handler: (0, postToApi_js_1.createJsonResponseHandler)(openAIImageGenerationBase64JsonSchema),
     },
 };
-async function callOpenAIImageGenerationAPI({ baseUrl = "https://api.openai.com/v1", abortSignal, apiKey, prompt, n, size, responseFormat, user, }) {
+async function callOpenAIImageGenerationAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, prompt, n, size, responseFormat, user, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/images/generations`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl("/images/generations"),
+        headers: api.headers,
         body: {
             prompt,
             n,

package/model-provider/openai/OpenAIImageGenerationModel.d.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
+import { ApiConfiguration } from "../../model-function/ApiConfiguration.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
 import { ResponseHandler } from "../../util/api/postToApi.js";
-import { OpenAIModelSettings } from "./OpenAIModelSettings.js";
 export interface OpenAIImageGenerationCallSettings {
     n?: number;
     size?: "256x256" | "512x512" | "1024x1024";
@@ -11,7 +11,8 @@ export interface OpenAIImageGenerationCallSettings {
 export declare const calculateOpenAIImageGenerationCostInMillicents: ({ settings, }: {
     settings: OpenAIImageGenerationSettings;
 }) => number;
-export interface OpenAIImageGenerationSettings extends ImageGenerationModelSettings, OpenAIImageGenerationCallSettings, OpenAIModelSettings {
+export interface OpenAIImageGenerationSettings extends ImageGenerationModelSettings, OpenAIImageGenerationCallSettings {
+    api?: ApiConfiguration;
     isUserIdForwardingEnabled?: boolean;
 }
 /**
@@ -29,10 +30,9 @@ export declare class OpenAIImageGenerationModel extends AbstractModel<OpenAIImag
     constructor(settings: OpenAIImageGenerationSettings);
     readonly provider: "openai";
     readonly modelName: null;
-    private get apiKey();
     callAPI<RESULT>(prompt: string, options: {
         responseFormat: OpenAIImageGenerationResponseFormatType<RESULT>;
-    } & ModelFunctionOptions<Partial<OpenAIImageGenerationCallSettings & OpenAIModelSettings & {
+    } & ModelFunctionOptions<Partial<OpenAIImageGenerationCallSettings & {
         user?: string;
     }>>): Promise<RESULT>;
     get settingsForEvent(): Partial<OpenAIImageGenerationSettings>;

package/model-provider/openai/OpenAIImageGenerationModel.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 { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 /**
  * @see https://openai.com/pricing
@@ -39,34 +40,31 @@ export class OpenAIImageGenerationModel extends AbstractModel {
             value: null
         });
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.OPENAI_API_KEY;
-        if (apiKey == null) {
-            throw new Error(`OpenAI API key is missing. Pass it as an argument to the constructor or set it as an environment variable named OPENAI_API_KEY.`);
-        }
-        return apiKey;
-    }
     async callAPI(prompt, options) {
         const run = options?.run;
         const settings = options?.settings;
         const responseFormat = options?.responseFormat;
-        const callSettings = Object.assign({
-            apiKey: this.apiKey,
+        const combinedSettings = {
+            ...this.settings,
+            ...settings,
+        };
+        const callSettings = {
             user: this.settings.isUserIdForwardingEnabled ? run?.userId : undefined,
-        }, this.settings, settings, {
+            // Copied settings:
+            ...combinedSettings,
+            // other settings:
             abortSignal: run?.abortSignal,
-            prompt,
             responseFormat,
-        });
+            prompt,
+        };
         return callWithRetryAndThrottle({
-            retry: callSettings.retry,
-            throttle: callSettings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callOpenAIImageGenerationAPI(callSettings),
         });
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "baseUrl",
             "n",
             "size",
         ];
@@ -109,12 +107,10 @@ export const OpenAIImageGenerationResponseFormat = {
         handler: createJsonResponseHandler(openAIImageGenerationBase64JsonSchema),
     },
 };
-async function callOpenAIImageGenerationAPI({ baseUrl = "https://api.openai.com/v1", abortSignal, apiKey, prompt, n, size, responseFormat, user, }) {
+async function callOpenAIImageGenerationAPI({ api = new OpenAIApiConfiguration(), abortSignal, prompt, n, size, responseFormat, user, }) {
     return postJsonToApi({
-        url: `${baseUrl}/images/generations`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl("/images/generations"),
+        headers: api.headers,
         body: {
             prompt,
             n,

package/model-provider/openai/OpenAITextEmbeddingModel.cjs

@@ -9,6 +9,7 @@ const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const callWithRetryAndThrottle_js_1 = require("../../util/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../util/api/postToApi.cjs");
+const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");
 exports.OPENAI_TEXT_EMBEDDING_MODELS = {
@@ -86,36 +87,32 @@ class OpenAITextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    get apiKey() {
-        const apiKey = this.settings.apiKey ?? process.env.OPENAI_API_KEY;
-        if (apiKey == null) {
-            throw new Error(`OpenAI API key is missing. Pass it as an argument to the constructor or set it as an environment variable named OPENAI_API_KEY.`);
-        }
-        return apiKey;
-    }
     async countTokens(input) {
         return (0, countTokens_js_1.countTokens)(this.tokenizer, input);
     }
     async callAPI(text, options) {
         const run = options?.run;
         const settings = options?.settings;
-        const callSettings = Object.assign({
-            apiKey: this.apiKey,
+        const combinedSettings = {
+            ...this.settings,
+            ...settings,
+        };
+        const callSettings = {
             user: this.settings.isUserIdForwardingEnabled ? run?.userId : undefined,
-        }, this.settings, settings, {
+            // Copied settings:
+            ...combinedSettings,
+            // other settings:
             abortSignal: run?.abortSignal,
             input: text,
-        });
+        };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callOpenAITextEmbeddingAPI(callSettings),
         });
     }
     get settingsForEvent() {
-        return {
-            baseUrl: this.settings.baseUrl,
-        };
+        return {};
     }
     generateEmbeddingResponse(texts, options) {
         if (texts.length > this.maxTextsPerCall) {
@@ -146,26 +143,10 @@ const openAITextEmbeddingResponseSchema = zod_1.default.object({
         total_tokens: zod_1.default.number(),
     }),
 });
-/**
- * Call the OpenAI Embedding API to generate an embedding for the given input.
- *
- * @see https://platform.openai.com/docs/api-reference/embeddings
- *
- * @example
- * const response = await callOpenAITextEmbeddingAPI({
- *   apiKey: OPENAI_API_KEY,
- *   model: "text-embedding-ada-002",
- *   input: "At first, Nox didn't know what to do with the pup.",
- * });
- *
- * console.log(response.data[0].embedding);
- */
-async function callOpenAITextEmbeddingAPI({ baseUrl = "https://api.openai.com/v1", abortSignal, apiKey, model, input, user, }) {
+async function callOpenAITextEmbeddingAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, model, input, user, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/embeddings`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl("/embeddings"),
+        headers: api.headers,
         body: {
             model,
             input,

package/model-provider/openai/OpenAITextEmbeddingModel.d.ts

@@ -1,9 +1,8 @@
 import z from "zod";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { ModelFunctionOptions } from "../../model-function/ModelFunctionOptions.js";
+import { ApiConfiguration } from "../../model-function/ApiConfiguration.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";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 export declare const OPENAI_TEXT_EMBEDDING_MODELS: {
     "text-embedding-ada-002": {
@@ -19,11 +18,8 @@ export declare const calculateOpenAIEmbeddingCostInMillicents: ({ model, respons
     responses: OpenAITextEmbeddingResponse[];
 }) => number;
 export interface OpenAITextEmbeddingModelSettings extends TextEmbeddingModelSettings {
+    api?: ApiConfiguration;
     model: OpenAITextEmbeddingModelType;
-    baseUrl?: string;
-    apiKey?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
     isUserIdForwardingEnabled?: boolean;
 }
 /**
@@ -48,7 +44,6 @@ export declare class OpenAITextEmbeddingModel extends AbstractModel<OpenAITextEm
     readonly embeddingDimensions: number;
     readonly tokenizer: TikTokenTokenizer;
     readonly contextWindowSize: number;
-    private get apiKey();
     countTokens(input: string): Promise<number>;
     callAPI(text: string, options?: ModelFunctionOptions<OpenAITextEmbeddingModelSettings>): Promise<OpenAITextEmbeddingResponse>;
     get settingsForEvent(): Partial<OpenAITextEmbeddingModelSettings>;