modelfusion 0.110.0 → 0.111.0

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs

@@ -4,6 +4,7 @@ exports.Automatic1111ImageGenerationModel = void 0;
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateImageGenerationModel_js_1 = require("../../model-function/generate-image/PromptTemplateImageGenerationModel.cjs");
 const Automatic1111ApiConfiguration_js_1 = require("./Automatic1111ApiConfiguration.cjs");
@@ -51,18 +52,21 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
                     },
                 },
                 failedResponseHandler: Automatic1111Error_js_1.failedAutomatic1111CallResponseHandler,
-                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(Automatic1111ImageGenerationResponseSchema),
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(Automatic1111ImageGenerationResponseSchema)),
                 abortSignal,
             }),
         });
     }
     get settingsForEvent() {
-        return {
-            height: this.settings.height,
-            width: this.settings.width,
-            sampler: this.settings.sampler,
-            steps: this.settings.steps,
-        };
+        const eventSettingProperties = [
+            "height",
+            "width",
+            "sampler",
+            "steps",
+            "cfgScale",
+            "seed",
+        ];
+        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateImages(prompt, options) {
         const response = await this.callAPI(prompt, options);

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 import { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
@@ -48,18 +49,21 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
                     },
                 },
                 failedResponseHandler: failedAutomatic1111CallResponseHandler,
-                successfulResponseHandler: createJsonResponseHandler(Automatic1111ImageGenerationResponseSchema),
+                successfulResponseHandler: createJsonResponseHandler(zodSchema(Automatic1111ImageGenerationResponseSchema)),
                 abortSignal,
             }),
         });
     }
     get settingsForEvent() {
-        return {
-            height: this.settings.height,
-            width: this.settings.width,
-            sampler: this.settings.sampler,
-            steps: this.settings.steps,
-        };
+        const eventSettingProperties = [
+            "height",
+            "width",
+            "sampler",
+            "steps",
+            "cfgScale",
+            "seed",
+        ];
+        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateImages(prompt, options) {
         const response = await this.callAPI(prompt, options);

package/model-provider/cohere/CohereApiConfiguration.cjs

@@ -3,19 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CohereApiConfiguration = void 0;
 const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
 const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
-class CohereApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
-    constructor({ baseUrl = "https://api.cohere.ai/v1", apiKey, retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+class CohereApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
+            ...settings,
             headers: {
                 Authorization: `Bearer ${(0, loadApiKey_js_1.loadApiKey)({
-                    apiKey,
+                    apiKey: settings.apiKey,
                     environmentVariableName: "COHERE_API_KEY",
                     description: "Cohere",
                 })}`,
             },
-            retry,
-            throttle,
+            baseUrlDefaults: {
+                protocol: "https",
+                host: "api.cohere.ai",
+                port: "443",
+                path: "/v1",
+            },
         });
     }
 }

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

@@ -1,11 +1,10 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-import { RetryFunction } from "../../core/api/RetryFunction.js";
-import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
-export declare class CohereApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl, apiKey, retry, throttle, }?: {
-        baseUrl?: string;
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+export declare class CohereApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions & {
         apiKey?: string;
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
     });
 }

package/model-provider/cohere/CohereApiConfiguration.js

@@ -1,18 +1,26 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { BaseUrlApiConfigurationWithDefaults, } from "../../core/api/BaseUrlApiConfiguration.js";
 import { loadApiKey } from "../../core/api/loadApiKey.js";
-export class CohereApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl = "https://api.cohere.ai/v1", apiKey, retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+export class CohereApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
+            ...settings,
             headers: {
                 Authorization: `Bearer ${loadApiKey({
-                    apiKey,
+                    apiKey: settings.apiKey,
                     environmentVariableName: "COHERE_API_KEY",
                     description: "Cohere",
                 })}`,
             },
-            retry,
-            throttle,
+            baseUrlDefaults: {
+                protocol: "https",
+                host: "api.cohere.ai",
+                port: "443",
+                path: "/v1",
+            },
         });
     }
 }

package/model-provider/cohere/CohereError.cjs

@@ -1,48 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedCohereCallResponseHandler = exports.CohereError = exports.cohereErrorDataSchema = void 0;
+exports.failedCohereCallResponseHandler = void 0;
 const zod_1 = require("zod");
-const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
-exports.cohereErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const cohereErrorDataSchema = zod_1.z.object({
     message: zod_1.z.string(),
-}));
-class CohereError extends ApiCallError_js_1.ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-exports.CohereError = CohereError;
-const failedCohereCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    // For some errors, the body of Cohere responses is empty:
-    if (responseBody.trim() === "") {
-        return new CohereError({
-            url,
-            requestBodyValues,
-            statusCode: response.status,
-            data: {
-                message: response.statusText,
-            },
-        });
-    }
-    const parsedError = (0, parseJSON_js_1.parseJSON)({
-        text: responseBody,
-        schema: exports.cohereErrorDataSchema,
-    });
-    return new CohereError({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
-};
-exports.failedCohereCallResponseHandler = failedCohereCallResponseHandler;
+});
+exports.failedCohereCallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
+    errorSchema: (0, ZodSchema_js_1.zodSchema)(cohereErrorDataSchema),
+    errorToMessage: (error) => error.message,
+});

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

@@ -1,18 +1,11 @@
-import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { ResponseHandler } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-export declare const cohereErrorDataSchema: ZodSchema<{
+import { z } from "zod";
+declare const cohereErrorDataSchema: z.ZodObject<{
+    message: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    message: string;
+}, {
     message: string;
 }>;
-export type CohereErrorData = (typeof cohereErrorDataSchema)["_type"];
-export declare class CohereError extends ApiCallError {
-    readonly data: CohereErrorData;
-    constructor({ data, statusCode, url, requestBodyValues, message, }: {
-        message?: string;
-        statusCode: number;
-        url: string;
-        requestBodyValues: unknown;
-        data: CohereErrorData;
-    });
-}
-export declare const failedCohereCallResponseHandler: ResponseHandler<ApiCallError>;
+export type CohereErrorData = z.infer<typeof cohereErrorDataSchema>;
+export declare const failedCohereCallResponseHandler: import("../../core/api/postToApi.js").ResponseHandler<import("../../index.js").ApiCallError>;
+export {};

package/model-provider/cohere/CohereError.js

@@ -1,43 +1,10 @@
 import { z } from "zod";
-import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-import { parseJSON } from "../../core/schema/parseJSON.js";
-export const cohereErrorDataSchema = new ZodSchema(z.object({
+import { createJsonErrorResponseHandler } from "../../core/api/postToApi.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
+const cohereErrorDataSchema = z.object({
     message: z.string(),
-}));
-export class CohereError extends ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-export const failedCohereCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    // For some errors, the body of Cohere responses is empty:
-    if (responseBody.trim() === "") {
-        return new CohereError({
-            url,
-            requestBodyValues,
-            statusCode: response.status,
-            data: {
-                message: response.statusText,
-            },
-        });
-    }
-    const parsedError = parseJSON({
-        text: responseBody,
-        schema: cohereErrorDataSchema,
-    });
-    return new CohereError({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
-};
+});
+export const failedCohereCallResponseHandler = createJsonErrorResponseHandler({
+    errorSchema: zodSchema(cohereErrorDataSchema),
+    errorToMessage: (error) => error.message,
+});

package/model-provider/cohere/CohereFacade.cjs

@@ -1,9 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tokenizer = exports.TextEmbedder = exports.TextGenerator = void 0;
+exports.Tokenizer = exports.TextEmbedder = exports.TextGenerator = exports.Api = void 0;
+const CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereTextEmbeddingModel_js_1 = require("./CohereTextEmbeddingModel.cjs");
 const CohereTextGenerationModel_js_1 = require("./CohereTextGenerationModel.cjs");
 const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+function Api(settings) {
+    return new CohereApiConfiguration_js_1.CohereApiConfiguration(settings);
+}
+exports.Api = Api;
 /**
  * Create a text generation model that calls the Cohere Co.Generate API.
  *
@@ -11,7 +20,7 @@ const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");
  *
  * @example
  * const model = cohere.TextGenerator({
- *   model: "command-nightly",
+ *   model: "command",
  *   temperature: 0.7,
  *   maxGenerationTokens: 500,
  * });
@@ -54,7 +63,7 @@ exports.TextEmbedder = TextEmbedder;
  * @see https://docs.cohere.com/reference/detokenize-1
  *
  * @example
- * const tokenizer = cohere.Tokenizer({ model: "command-nightly" });
+ * const tokenizer = cohere.Tokenizer({ model: "command" });
  *
  * const text = "At first, Nox didn't know what to do with the pup.";
  *

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

@@ -1,6 +1,15 @@
+import { PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { CohereTextEmbeddingModel, CohereTextEmbeddingModelSettings } from "./CohereTextEmbeddingModel.js";
 import { CohereTextGenerationModel, CohereTextGenerationModelSettings } from "./CohereTextGenerationModel.js";
 import { CohereTokenizer, CohereTokenizerSettings } from "./CohereTokenizer.js";
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+export declare function Api(settings: PartialBaseUrlPartsApiConfigurationOptions & {
+    apiKey?: string;
+}): CohereApiConfiguration;
 /**
  * Create a text generation model that calls the Cohere Co.Generate API.
  *
@@ -8,7 +17,7 @@ import { CohereTokenizer, CohereTokenizerSettings } from "./CohereTokenizer.js";
  *
  * @example
  * const model = cohere.TextGenerator({
- *   model: "command-nightly",
+ *   model: "command",
  *   temperature: 0.7,
  *   maxGenerationTokens: 500,
  * });
@@ -45,7 +54,7 @@ export declare function TextEmbedder(settings: CohereTextEmbeddingModelSettings)
  * @see https://docs.cohere.com/reference/detokenize-1
  *
  * @example
- * const tokenizer = cohere.Tokenizer({ model: "command-nightly" });
+ * const tokenizer = cohere.Tokenizer({ model: "command" });
  *
  * const text = "At first, Nox didn't know what to do with the pup.";
  *

package/model-provider/cohere/CohereFacade.js

@@ -1,6 +1,14 @@
+import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { CohereTextEmbeddingModel, } from "./CohereTextEmbeddingModel.js";
 import { CohereTextGenerationModel, } from "./CohereTextGenerationModel.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+export function Api(settings) {
+    return new CohereApiConfiguration(settings);
+}
 /**
  * Create a text generation model that calls the Cohere Co.Generate API.
  *
@@ -8,7 +16,7 @@ import { CohereTokenizer } from "./CohereTokenizer.js";
  *
  * @example
  * const model = cohere.TextGenerator({
- *   model: "command-nightly",
+ *   model: "command",
  *   temperature: 0.7,
  *   maxGenerationTokens: 500,
  * });
@@ -49,7 +57,7 @@ export function TextEmbedder(settings) {
  * @see https://docs.cohere.com/reference/detokenize-1
  *
  * @example
- * const tokenizer = cohere.Tokenizer({ model: "command-nightly" });
+ * const tokenizer = cohere.Tokenizer({ model: "command" });
  *
  * const text = "At first, Nox didn't know what to do with the pup.";
  *

package/model-provider/cohere/CohereTextEmbeddingModel.cjs

@@ -4,6 +4,7 @@ exports.CohereTextEmbeddingModel = exports.COHERE_TEXT_EMBEDDING_MODELS = void 0
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereError_js_1 = require("./CohereError.cjs");
@@ -18,7 +19,7 @@ exports.COHERE_TEXT_EMBEDDING_MODELS = {
         embeddingDimensions: 4096,
     },
     "embed-multilingual-v2.0": {
-        contextWindowSize: 512,
+        contextWindowSize: 256,
         embeddingDimensions: 768,
     },
     "embed-english-v3.0": {
@@ -116,13 +117,23 @@ class CohereTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The Cohere embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
+        const api = this.settings.api ?? new CohereApiConfiguration_js_1.CohereApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callCohereEmbeddingAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                texts,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => (0, postToApi_js_1.postJsonToApi)({
+                url: api.assembleUrl(`/embed`),
+                headers: api.headers,
+                body: {
+                    model: this.settings.model,
+                    texts,
+                    input_type: this.settings.inputType,
+                    truncate: this.settings.truncate,
+                },
+                failedResponseHandler: CohereError_js_1.failedCohereCallResponseHandler,
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(cohereTextEmbeddingResponseSchema)),
+                abortSignal,
             }),
         });
     }
@@ -153,18 +164,3 @@ const cohereTextEmbeddingResponseSchema = zod_1.z.object({
         }),
     }),
 });
-async function callCohereEmbeddingAPI({ api = new CohereApiConfiguration_js_1.CohereApiConfiguration(), abortSignal, model, texts, inputType, truncate, }) {
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl(`/embed`),
-        headers: api.headers,
-        body: {
-            model,
-            texts,
-            input_type: inputType,
-            truncate,
-        },
-        failedResponseHandler: CohereError_js_1.failedCohereCallResponseHandler,
-        successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(cohereTextEmbeddingResponseSchema),
-        abortSignal,
-    });
-}

package/model-provider/cohere/CohereTextEmbeddingModel.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
@@ -15,7 +16,7 @@ export const COHERE_TEXT_EMBEDDING_MODELS = {
         embeddingDimensions: 4096,
     },
     "embed-multilingual-v2.0": {
-        contextWindowSize: 512,
+        contextWindowSize: 256,
         embeddingDimensions: 768,
     },
     "embed-english-v3.0": {
@@ -113,13 +114,23 @@ export class CohereTextEmbeddingModel extends AbstractModel {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The Cohere embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
+        const api = this.settings.api ?? new CohereApiConfiguration();
+        const abortSignal = options?.run?.abortSignal;
         return callWithRetryAndThrottle({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callCohereEmbeddingAPI({
-                ...this.settings,
-                abortSignal: options?.run?.abortSignal,
-                texts,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl(`/embed`),
+                headers: api.headers,
+                body: {
+                    model: this.settings.model,
+                    texts,
+                    input_type: this.settings.inputType,
+                    truncate: this.settings.truncate,
+                },
+                failedResponseHandler: failedCohereCallResponseHandler,
+                successfulResponseHandler: createJsonResponseHandler(zodSchema(cohereTextEmbeddingResponseSchema)),
+                abortSignal,
             }),
         });
     }
@@ -149,18 +160,3 @@ const cohereTextEmbeddingResponseSchema = z.object({
         }),
     }),
 });
-async function callCohereEmbeddingAPI({ api = new CohereApiConfiguration(), abortSignal, model, texts, inputType, truncate, }) {
-    return postJsonToApi({
-        url: api.assembleUrl(`/embed`),
-        headers: api.headers,
-        body: {
-            model,
-            texts,
-            input_type: inputType,
-            truncate,
-        },
-        failedResponseHandler: failedCohereCallResponseHandler,
-        successfulResponseHandler: createJsonResponseHandler(cohereTextEmbeddingResponseSchema),
-        abortSignal,
-    });
-}