modelfusion 0.27.0 → 0.27.2

package/index.cjs

@@ -19,6 +19,7 @@ __exportStar(require("./core/index.cjs"), exports);
 __exportStar(require("./cost/index.cjs"), exports);
 __exportStar(require("./model-function/index.cjs"), exports);
 __exportStar(require("./model-provider/index.cjs"), exports);
+__exportStar(require("./observability/index.cjs"), exports);
 __exportStar(require("./prompt/index.cjs"), exports);
 __exportStar(require("./text-chunk/index.cjs"), exports);
 __exportStar(require("./tool/index.cjs"), exports);

package/index.d.ts

@@ -3,6 +3,7 @@ export * from "./core/index.js";
 export * from "./cost/index.js";
 export * from "./model-function/index.js";
 export * from "./model-provider/index.js";
+export * from "./observability/index.js";
 export * from "./prompt/index.js";
 export * from "./text-chunk/index.js";
 export * from "./tool/index.js";

package/index.js

@@ -3,6 +3,7 @@ export * from "./core/index.js";
 export * from "./cost/index.js";
 export * from "./model-function/index.js";
 export * from "./model-provider/index.js";
+export * from "./observability/index.js";
 export * from "./prompt/index.js";
 export * from "./text-chunk/index.js";
 export * from "./tool/index.js";

package/model-function/ApiConfiguration.d.ts

@@ -0,0 +1,14 @@
+import { RetryFunction } from "../util/api/RetryFunction.js";
+import { ThrottleFunction } from "../util/api/ThrottleFunction.js";
+/**
+ * Settings for a REST provider, e.g. OpenAI or Lmnt.
+ */
+export interface ApiConfiguration {
+    /**
+     * Creates a full URL given a inner path.
+     */
+    assembleUrl(path: string): string;
+    readonly headers: Record<string, string>;
+    readonly retry?: RetryFunction;
+    readonly throttle?: ThrottleFunction;
+}

package/model-function/BasicApiConfiguration.cjs

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasicApiConfiguration = void 0;
+class BasicApiConfiguration {
+    constructor({ baseUrl, retry, throttle, }) {
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "retry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "throttle", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.baseUrl = baseUrl;
+        this.retry = retry;
+        this.throttle = throttle;
+    }
+    get headers() {
+        return {};
+    }
+    assembleUrl(path) {
+        return `${this.baseUrl}${path}`;
+    }
+}
+exports.BasicApiConfiguration = BasicApiConfiguration;

package/model-function/BasicApiConfiguration.d.ts

@@ -0,0 +1,15 @@
+import { RetryFunction } from "../util/api/RetryFunction.js";
+import { ThrottleFunction } from "../util/api/ThrottleFunction.js";
+import { ApiConfiguration } from "./ApiConfiguration.js";
+export declare class BasicApiConfiguration implements ApiConfiguration {
+    readonly baseUrl: string;
+    readonly retry?: RetryFunction;
+    readonly throttle?: ThrottleFunction;
+    constructor({ baseUrl, retry, throttle, }: {
+        baseUrl: string;
+        retry?: RetryFunction;
+        throttle?: ThrottleFunction;
+    });
+    get headers(): Record<string, string>;
+    assembleUrl(path: string): string;
+}

package/model-function/BasicApiConfiguration.js

@@ -0,0 +1,31 @@
+export class BasicApiConfiguration {
+    constructor({ baseUrl, retry, throttle, }) {
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "retry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "throttle", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.baseUrl = baseUrl;
+        this.retry = retry;
+        this.throttle = throttle;
+    }
+    get headers() {
+        return {};
+    }
+    assembleUrl(path) {
+        return `${this.baseUrl}${path}`;
+    }
+}

package/model-function/index.cjs

@@ -14,6 +14,8 @@ 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("./ApiConfiguration.cjs"), exports);
+__exportStar(require("./BasicApiConfiguration.cjs"), exports);
 __exportStar(require("./Model.cjs"), exports);
 __exportStar(require("./ModelCallEvent.cjs"), exports);
 __exportStar(require("./ModelFunctionOptions.cjs"), exports);

package/model-function/index.d.ts

@@ -1,3 +1,5 @@
+export * from "./ApiConfiguration.js";
+export * from "./BasicApiConfiguration.js";
 export * from "./Model.js";
 export * from "./ModelCallEvent.js";
 export * from "./ModelFunctionOptions.js";

package/model-function/index.js

@@ -1,3 +1,5 @@
+export * from "./ApiConfiguration.js";
+export * from "./BasicApiConfiguration.js";
 export * from "./Model.js";
 export * from "./ModelCallEvent.js";
 export * from "./ModelFunctionOptions.js";

package/model-provider/automatic1111/Automatic1111ApiConfiguration.cjs

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Automatic1111ApiConfiguration = void 0;
+const BasicApiConfiguration_js_1 = require("../../model-function/BasicApiConfiguration.cjs");
+class Automatic1111ApiConfiguration extends BasicApiConfiguration_js_1.BasicApiConfiguration {
+    constructor({ baseUrl = "http://127.0.0.1:7860/sdapi/v1", retry, throttle, } = {}) {
+        super({
+            baseUrl,
+            retry,
+            throttle,
+        });
+    }
+}
+exports.Automatic1111ApiConfiguration = Automatic1111ApiConfiguration;

package/model-provider/automatic1111/Automatic1111ApiConfiguration.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 Automatic1111ApiConfiguration extends BasicApiConfiguration {
+    constructor({ baseUrl, retry, throttle, }?: {
+        baseUrl?: string;
+        retry?: RetryFunction;
+        throttle?: ThrottleFunction;
+    });
+}

package/model-provider/automatic1111/Automatic1111ApiConfiguration.js

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

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.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 Automatic1111ApiConfiguration_js_1 = require("./Automatic1111ApiConfiguration.cjs");
 const Automatic1111Error_js_1 = require("./Automatic1111Error.cjs");
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
@@ -27,20 +28,21 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
     async callAPI(input, options) {
         const run = options?.run;
         const settings = options?.settings;
-        const callSettings = Object.assign(this.settings, settings, {
+        const callSettings = {
+            ...this.settings,
+            ...settings,
             abortSignal: run?.abortSignal,
             engineId: this.settings.model,
             prompt: input.prompt,
-        });
+        };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callAutomatic1111ImageGenerationAPI(callSettings),
         });
     }
     get settingsForEvent() {
         return {
-            baseUrl: this.settings.baseUrl,
             height: this.settings.height,
             width: this.settings.width,
             sampler: this.settings.sampler,
@@ -63,9 +65,10 @@ const Automatic1111ImageGenerationResponseSchema = zod_1.z.object({
     parameters: zod_1.z.object({}),
     info: zod_1.z.string(),
 });
-async function callAutomatic1111ImageGenerationAPI({ baseUrl = "http://127.0.0.1:7860", abortSignal, height, width, prompt, negativePrompt, sampler, steps, seed, model, }) {
+async function callAutomatic1111ImageGenerationAPI({ api = new Automatic1111ApiConfiguration_js_1.Automatic1111ApiConfiguration(), abortSignal, height, width, prompt, negativePrompt, sampler, steps, seed, model, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/sdapi/v1/txt2img`,
+        url: api.assembleUrl(`/txt2img`),
+        headers: api.headers,
         body: {
             height,
             width,

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.d.ts

@@ -1,9 +1,8 @@
 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 { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
  *
@@ -24,9 +23,7 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     withSettings(additionalSettings: Automatic1111ImageGenerationModelSettings): this;
 }
 export interface Automatic1111ImageGenerationModelSettings extends ImageGenerationModelSettings {
-    baseUrl?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
+    api?: ApiConfiguration;
     model: string;
     height?: number;
     width?: number;

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.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 { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
 import { failedAutomatic1111CallResponseHandler } from "./Automatic1111Error.js";
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
@@ -24,20 +25,21 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
     async callAPI(input, options) {
         const run = options?.run;
         const settings = options?.settings;
-        const callSettings = Object.assign(this.settings, settings, {
+        const callSettings = {
+            ...this.settings,
+            ...settings,
             abortSignal: run?.abortSignal,
             engineId: this.settings.model,
             prompt: input.prompt,
-        });
+        };
         return callWithRetryAndThrottle({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callAutomatic1111ImageGenerationAPI(callSettings),
         });
     }
     get settingsForEvent() {
         return {
-            baseUrl: this.settings.baseUrl,
             height: this.settings.height,
             width: this.settings.width,
             sampler: this.settings.sampler,
@@ -59,9 +61,10 @@ const Automatic1111ImageGenerationResponseSchema = z.object({
     parameters: z.object({}),
     info: z.string(),
 });
-async function callAutomatic1111ImageGenerationAPI({ baseUrl = "http://127.0.0.1:7860", abortSignal, height, width, prompt, negativePrompt, sampler, steps, seed, model, }) {
+async function callAutomatic1111ImageGenerationAPI({ api = new Automatic1111ApiConfiguration(), abortSignal, height, width, prompt, negativePrompt, sampler, steps, seed, model, }) {
     return postJsonToApi({
-        url: `${baseUrl}/sdapi/v1/txt2img`,
+        url: api.assembleUrl(`/txt2img`),
+        headers: api.headers,
         body: {
             height,
             width,

package/model-provider/automatic1111/index.cjs

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

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

@@ -1,2 +1,3 @@
+export * from "./Automatic1111ApiConfiguration.js";
 export { Automatic1111Error, Automatic1111ErrorData, } from "./Automatic1111Error.js";
 export * from "./Automatic1111ImageGenerationModel.js";

package/model-provider/automatic1111/index.js

@@ -1,2 +1,3 @@
+export * from "./Automatic1111ApiConfiguration.js";
 export { Automatic1111Error, } from "./Automatic1111Error.js";
 export * from "./Automatic1111ImageGenerationModel.js";

package/model-provider/cohere/CohereApiConfiguration.cjs

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

package/model-provider/cohere/CohereApiConfiguration.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 CohereApiConfiguration 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/cohere/CohereApiConfiguration.js

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

package/model-provider/cohere/CohereTextEmbeddingModel.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 CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereError_js_1 = require("./CohereError.cjs");
 const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");
 exports.COHERE_TEXT_EMBEDDING_MODELS = {
@@ -74,11 +75,8 @@ class CohereTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         this.contextWindowSize =
             exports.COHERE_TEXT_EMBEDDING_MODELS[this.modelName].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,
         });
         this.embeddingDimensions =
             exports.COHERE_TEXT_EMBEDDING_MODELS[this.modelName].embeddingDimensions;
@@ -95,34 +93,26 @@ class CohereTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     async detokenize(tokens) {
         return this.tokenizer.detokenize(tokens);
     }
-    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 callAPI(texts, options) {
         if (texts.length > this.maxTextsPerCall) {
             throw new Error(`The Cohere embedding API only supports ${this.maxTextsPerCall} texts per API call.`);
         }
         const run = options?.run;
         const settings = options?.settings;
-        const callSettings = Object.assign({
-            apiKey: this.apiKey,
-        }, this.settings, settings, {
+        const callSettings = {
+            ...this.settings,
+            ...settings,
             abortSignal: run?.abortSignal,
             texts,
-        });
+        };
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callCohereEmbeddingAPI(callSettings),
         });
     }
     get settingsForEvent() {
         return {
-            baseUrl: this.settings.baseUrl,
             truncate: this.settings.truncate,
         };
     }
@@ -147,27 +137,10 @@ const cohereTextEmbeddingResponseSchema = zod_1.default.object({
         }),
     }),
 });
-/**
- * Call the Cohere Co.Embed API to generate an embedding for the given input.
- *
- * @see https://docs.cohere.com/reference/embed
- *
- * @example
- * const response = await callCohereEmbeddingAPI({
- *   apiKey: COHERE_API_KEY,
- *   model: "embed-english-light-v2.0",
- *   texts: [
- *     "At first, Nox didn't know what to do with the pup.",
- *     "He keenly observed and absorbed everything around him, from the birds in the sky to the trees in the forest.",
- *   ],
- * });
- */
-async function callCohereEmbeddingAPI({ baseUrl = "https://api.cohere.ai/v1", abortSignal, apiKey, model, texts, truncate, }) {
+async function callCohereEmbeddingAPI({ api = new CohereApiConfiguration_js_1.CohereApiConfiguration(), abortSignal, model, texts, truncate, }) {
     return (0, postToApi_js_1.postJsonToApi)({
-        url: `${baseUrl}/embed`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl(`/embed`),
+        headers: api.headers,
         body: {
             model,
             texts,

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

@@ -1,10 +1,9 @@
 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 { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
-import { RetryFunction } from "../../util/api/RetryFunction.js";
-import { ThrottleFunction } from "../../util/api/ThrottleFunction.js";
 export declare const COHERE_TEXT_EMBEDDING_MODELS: {
     "embed-english-light-v2.0": {
         contextWindowSize: number;
@@ -21,15 +20,8 @@ export declare const COHERE_TEXT_EMBEDDING_MODELS: {
 };
 export type CohereTextEmbeddingModelType = keyof typeof COHERE_TEXT_EMBEDDING_MODELS;
 export interface CohereTextEmbeddingModelSettings extends TextEmbeddingModelSettings {
+    api?: ApiConfiguration;
     model: CohereTextEmbeddingModelType;
-    baseUrl?: string;
-    apiKey?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
-    tokenizerSettings?: {
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
-    };
     truncate?: "NONE" | "START" | "END";
 }
 /**
@@ -60,7 +52,6 @@ export declare class CohereTextEmbeddingModel extends AbstractModel<CohereTextEm
         tokenTexts: string[];
     }>;
     detokenize(tokens: number[]): Promise<string>;
-    private get apiKey();
     callAPI(texts: Array<string>, options?: ModelFunctionOptions<CohereTextEmbeddingModelSettings>): Promise<CohereTextEmbeddingResponse>;
     get settingsForEvent(): Partial<CohereTextEmbeddingModelSettings>;
     generateEmbeddingResponse(texts: string[], options?: ModelFunctionOptions<CohereTextEmbeddingModelSettings>): Promise<{

package/model-provider/cohere/CohereTextEmbeddingModel.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 { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
 export const COHERE_TEXT_EMBEDDING_MODELS = {
@@ -68,11 +69,8 @@ export class CohereTextEmbeddingModel extends AbstractModel {
         this.contextWindowSize =
             COHERE_TEXT_EMBEDDING_MODELS[this.modelName].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,
         });
         this.embeddingDimensions =
             COHERE_TEXT_EMBEDDING_MODELS[this.modelName].embeddingDimensions;
@@ -89,34 +87,26 @@ export class CohereTextEmbeddingModel extends AbstractModel {
     async detokenize(tokens) {
         return this.tokenizer.detokenize(tokens);
     }
-    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 callAPI(texts, options) {
         if (texts.length > this.maxTextsPerCall) {
             throw new Error(`The Cohere embedding API only supports ${this.maxTextsPerCall} texts per API call.`);
         }
         const run = options?.run;
         const settings = options?.settings;
-        const callSettings = Object.assign({
-            apiKey: this.apiKey,
-        }, this.settings, settings, {
+        const callSettings = {
+            ...this.settings,
+            ...settings,
             abortSignal: run?.abortSignal,
             texts,
-        });
+        };
         return callWithRetryAndThrottle({
-            retry: this.settings.retry,
-            throttle: this.settings.throttle,
+            retry: callSettings.api?.retry,
+            throttle: callSettings.api?.throttle,
             call: async () => callCohereEmbeddingAPI(callSettings),
         });
     }
     get settingsForEvent() {
         return {
-            baseUrl: this.settings.baseUrl,
             truncate: this.settings.truncate,
         };
     }
@@ -140,27 +130,10 @@ const cohereTextEmbeddingResponseSchema = z.object({
         }),
     }),
 });
-/**
- * Call the Cohere Co.Embed API to generate an embedding for the given input.
- *
- * @see https://docs.cohere.com/reference/embed
- *
- * @example
- * const response = await callCohereEmbeddingAPI({
- *   apiKey: COHERE_API_KEY,
- *   model: "embed-english-light-v2.0",
- *   texts: [
- *     "At first, Nox didn't know what to do with the pup.",
- *     "He keenly observed and absorbed everything around him, from the birds in the sky to the trees in the forest.",
- *   ],
- * });
- */
-async function callCohereEmbeddingAPI({ baseUrl = "https://api.cohere.ai/v1", abortSignal, apiKey, model, texts, truncate, }) {
+async function callCohereEmbeddingAPI({ api = new CohereApiConfiguration(), abortSignal, model, texts, truncate, }) {
     return postJsonToApi({
-        url: `${baseUrl}/embed`,
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
+        url: api.assembleUrl(`/embed`),
+        headers: api.headers,
         body: {
             model,
             texts,