modelfusion 0.46.0 → 0.47.1

package/model-provider/stability/StabilityImageGenerationModel.js

@@ -2,8 +2,10 @@ import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
 import { StabilityApiConfiguration } from "./StabilityApiConfiguration.js";
 import { failedStabilityCallResponseHandler } from "./StabilityError.js";
+import { mapBasicPromptToStabilityFormat, } from "./StabilityImageGenerationPrompt.js";
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -73,6 +75,15 @@ export class StabilityImageGenerationModel extends AbstractModel {
             base64Image: response.artifacts[0].base64,
         };
     }
+    withBasicPrompt() {
+        return this.withPromptFormat(mapBasicPromptToStabilityFormat());
+    }
+    withPromptFormat(promptFormat) {
+        return new PromptFormatImageGenerationModel({
+            model: this,
+            promptFormat,
+        });
+    }
     withSettings(additionalSettings) {
         return new StabilityImageGenerationModel(Object.assign({}, this.settings, additionalSettings));
     }

package/model-provider/stability/StabilityImageGenerationPrompt.cjs

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapBasicPromptToStabilityFormat = void 0;
+/**
+ * Formats a basic text prompt as a Stability prompt.
+ */
+function mapBasicPromptToStabilityFormat() {
+    return {
+        format: (description) => [{ text: description }],
+    };
+}
+exports.mapBasicPromptToStabilityFormat = mapBasicPromptToStabilityFormat;

package/model-provider/stability/StabilityImageGenerationPrompt.d.ts

@@ -0,0 +1,9 @@
+import { PromptFormat } from "../../model-function/PromptFormat.js";
+export type StabilityImageGenerationPrompt = Array<{
+    text: string;
+    weight?: number;
+}>;
+/**
+ * Formats a basic text prompt as a Stability prompt.
+ */
+export declare function mapBasicPromptToStabilityFormat(): PromptFormat<string, StabilityImageGenerationPrompt>;

package/model-provider/stability/StabilityImageGenerationPrompt.js

@@ -0,0 +1,8 @@
+/**
+ * Formats a basic text prompt as a Stability prompt.
+ */
+export function mapBasicPromptToStabilityFormat() {
+    return {
+        format: (description) => [{ text: description }],
+    };
+}

package/model-provider/stability/index.cjs

@@ -19,3 +19,4 @@ __exportStar(require("./StabilityApiConfiguration.cjs"), exports);
 var StabilityError_js_1 = require("./StabilityError.cjs");
 Object.defineProperty(exports, "StabilityError", { enumerable: true, get: function () { return StabilityError_js_1.StabilityError; } });
 __exportStar(require("./StabilityImageGenerationModel.cjs"), exports);
+__exportStar(require("./StabilityImageGenerationPrompt.cjs"), exports);

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

@@ -1,3 +1,4 @@
 export * from "./StabilityApiConfiguration.js";
 export { StabilityError, StabilityErrorData } from "./StabilityError.js";
 export * from "./StabilityImageGenerationModel.js";
+export * from "./StabilityImageGenerationPrompt.js";

package/model-provider/stability/index.js

@@ -1,3 +1,4 @@
 export * from "./StabilityApiConfiguration.js";
 export { StabilityError } from "./StabilityError.js";
 export * from "./StabilityImageGenerationModel.js";
+export * from "./StabilityImageGenerationPrompt.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "Build multimodal applications, chatbots, and agents with JavaScript and TypeScript.",
-  "version": "0.46.0",
+  "version": "0.47.1",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [
@@ -47,12 +47,12 @@
     "build": "npm run build:esm && npm run build:cjs",
     "build:esm": "tsc --outDir dist/",
     "build:cjs": "tsc --outDir build/cjs/ -p tsconfig.cjs.json && node bin/prepare-cjs.js",
-    "test": "vitest",
-    "dist": "npm run clean && npm run lint && npm run build && npm run dist:copy-files",
+    "test": "vitest run src",
+    "test-interactive": "vitest run",
+    "dist": "npm run clean && npm run lint && npm run test && npm run build && npm run dist:copy-files",
     "dist:copy-files": "copyfiles package.json README.md LICENSE dist"
   },
   "dependencies": {
-    "deep-equal": "2.2.2",
     "eventsource-parser": "1.1.1",
     "js-tiktoken": "1.0.7",
     "nanoid": "3.3.6",

package/util/isDeepEqualData.cjs

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDeepEqualData = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
+ * Performs a deep-equal comparison of two parsed JSON structures.
+ *
+ * @param {any} obj1 - The first object to compare.
+ * @param {any} obj2 - The second object to compare.
+ * @returns {boolean} - Returns true if the two objects are deeply equal, false otherwise.
+ */
+function isDeepEqualData(obj1, obj2) {
+    // Check for strict equality first
+    if (obj1 === obj2)
+        return true;
+    // Check if either is null or undefined
+    if (obj1 == null || obj2 == null)
+        return false;
+    // Check if both are objects
+    if (typeof obj1 !== "object" && typeof obj2 !== "object")
+        return obj1 === obj2;
+    // If they are not strictly equal, they both need to be Objects
+    if (obj1.constructor !== obj2.constructor)
+        return false;
+    // Special handling for Date objects
+    if (obj1 instanceof Date && obj2 instanceof Date) {
+        return obj1.getTime() === obj2.getTime();
+    }
+    // Handle arrays: compare length and then perform a recursive deep comparison on each item
+    if (Array.isArray(obj1)) {
+        if (obj1.length !== obj2.length)
+            return false;
+        for (let i = 0; i < obj1.length; i++) {
+            if (!isDeepEqualData(obj1[i], obj2[i]))
+                return false;
+        }
+        return true; // All array elements matched
+    }
+    // Compare the set of keys in each object
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
+    if (keys1.length !== keys2.length)
+        return false;
+    // Check each key-value pair recursively
+    for (const key of keys1) {
+        if (!keys2.includes(key))
+            return false;
+        if (!isDeepEqualData(obj1[key], obj2[key]))
+            return false;
+    }
+    return true; // All keys and values matched
+}
+exports.isDeepEqualData = isDeepEqualData;

package/util/isDeepEqualData.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Performs a deep-equal comparison of two parsed JSON structures.
+ *
+ * @param {any} obj1 - The first object to compare.
+ * @param {any} obj2 - The second object to compare.
+ * @returns {boolean} - Returns true if the two objects are deeply equal, false otherwise.
+ */
+export declare function isDeepEqualData(obj1: any, obj2: any): boolean;

package/util/isDeepEqualData.js

@@ -0,0 +1,49 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
+ * Performs a deep-equal comparison of two parsed JSON structures.
+ *
+ * @param {any} obj1 - The first object to compare.
+ * @param {any} obj2 - The second object to compare.
+ * @returns {boolean} - Returns true if the two objects are deeply equal, false otherwise.
+ */
+export function isDeepEqualData(obj1, obj2) {
+    // Check for strict equality first
+    if (obj1 === obj2)
+        return true;
+    // Check if either is null or undefined
+    if (obj1 == null || obj2 == null)
+        return false;
+    // Check if both are objects
+    if (typeof obj1 !== "object" && typeof obj2 !== "object")
+        return obj1 === obj2;
+    // If they are not strictly equal, they both need to be Objects
+    if (obj1.constructor !== obj2.constructor)
+        return false;
+    // Special handling for Date objects
+    if (obj1 instanceof Date && obj2 instanceof Date) {
+        return obj1.getTime() === obj2.getTime();
+    }
+    // Handle arrays: compare length and then perform a recursive deep comparison on each item
+    if (Array.isArray(obj1)) {
+        if (obj1.length !== obj2.length)
+            return false;
+        for (let i = 0; i < obj1.length; i++) {
+            if (!isDeepEqualData(obj1[i], obj2[i]))
+                return false;
+        }
+        return true; // All array elements matched
+    }
+    // Compare the set of keys in each object
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
+    if (keys1.length !== keys2.length)
+        return false;
+    // Check each key-value pair recursively
+    for (const key of keys1) {
+        if (!keys2.includes(key))
+            return false;
+        if (!isDeepEqualData(obj1[key], obj2[key]))
+            return false;
+    }
+    return true; // All keys and values matched
+}

package/util/isDeepEqualData.test.cjs

@@ -0,0 +1,108 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const vitest_1 = require("vitest");
+const isDeepEqualData_js_1 = require("./isDeepEqualData.cjs");
+(0, vitest_1.test)("checks if two primitives are equal", async () => {
+    let x = 1;
+    let y = 1;
+    let result = (0, isDeepEqualData_js_1.isDeepEqualData)(x, y);
+    node_assert_1.default.equal(result, true);
+    x = 1;
+    y = 2;
+    result = (0, isDeepEqualData_js_1.isDeepEqualData)(x, y);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("returns false for different types", async () => {
+    const obj = { a: 1 };
+    const num = 1;
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj, num);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("returns false for null values compared with objects", async () => {
+    const obj = { a: 1 };
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj, null);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("identifies two equal objects", async () => {
+    const obj1 = { a: 1, b: 2 };
+    const obj2 = { a: 1, b: 2 };
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj1, obj2);
+    node_assert_1.default.equal(result, true);
+});
+(0, vitest_1.test)("identifies two objects with different values", async () => {
+    const obj1 = { a: 1, b: 2 };
+    const obj2 = { a: 1, b: 3 };
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj1, obj2);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("identifies two objects with different number of keys", async () => {
+    const obj1 = { a: 1, b: 2 };
+    const obj2 = { a: 1, b: 2, c: 3 };
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj1, obj2);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("handles nested objects", async () => {
+    const obj1 = { a: { c: 1 }, b: 2 };
+    const obj2 = { a: { c: 1 }, b: 2 };
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj1, obj2);
+    node_assert_1.default.equal(result, true);
+});
+(0, vitest_1.test)("detects inequality in nested objects", async () => {
+    const obj1 = { a: { c: 1 }, b: 2 };
+    const obj2 = { a: { c: 2 }, b: 2 };
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj1, obj2);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("compares arrays correctly", async () => {
+    const arr1 = [1, 2, 3];
+    const arr2 = [1, 2, 3];
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(arr1, arr2);
+    node_assert_1.default.equal(result, true);
+    const arr3 = [1, 2, 3];
+    const arr4 = [1, 2, 4];
+    const result2 = (0, isDeepEqualData_js_1.isDeepEqualData)(arr3, arr4);
+    node_assert_1.default.equal(result2, false);
+});
+(0, vitest_1.test)("returns false for null comparison with object", () => {
+    const obj = { a: 1 };
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj, null);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("distinguishes between array and object with same enumerable properties", () => {
+    const obj = { 0: "one", 1: "two", length: 2 };
+    const arr = ["one", "two"];
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj, arr);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("returns false when comparing objects with different prototypes", () => {
+    const obj1 = Object.create({ a: 1 });
+    const obj2 = Object.create(null);
+    obj1.b = 2;
+    obj2.b = 2;
+    const result = (0, isDeepEqualData_js_1.isDeepEqualData)(obj1, obj2);
+    node_assert_1.default.equal(result, false);
+});
+(0, vitest_1.test)("handles date object comparisons correctly", () => {
+    const date1 = new Date(2000, 0, 1);
+    const date2 = new Date(2000, 0, 1);
+    const date3 = new Date(2000, 0, 2);
+    node_assert_1.default.equal((0, isDeepEqualData_js_1.isDeepEqualData)(date1, date2), true);
+    node_assert_1.default.equal((0, isDeepEqualData_js_1.isDeepEqualData)(date1, date3), false);
+});
+(0, vitest_1.test)("handles function comparisons", () => {
+    const func1 = () => {
+        console.log("hello");
+    };
+    const func2 = () => {
+        console.log("hello");
+    };
+    const func3 = () => {
+        console.log("world");
+    };
+    node_assert_1.default.equal((0, isDeepEqualData_js_1.isDeepEqualData)(func1, func2), false);
+    node_assert_1.default.equal((0, isDeepEqualData_js_1.isDeepEqualData)(func1, func3), false);
+});

package/util/isDeepEqualData.test.d.ts

@@ -0,0 +1 @@
+export {};

package/util/isDeepEqualData.test.js

@@ -0,0 +1,103 @@
+import assert from "node:assert";
+import { test } from "vitest";
+import { isDeepEqualData } from "./isDeepEqualData.js";
+test("checks if two primitives are equal", async () => {
+    let x = 1;
+    let y = 1;
+    let result = isDeepEqualData(x, y);
+    assert.equal(result, true);
+    x = 1;
+    y = 2;
+    result = isDeepEqualData(x, y);
+    assert.equal(result, false);
+});
+test("returns false for different types", async () => {
+    const obj = { a: 1 };
+    const num = 1;
+    const result = isDeepEqualData(obj, num);
+    assert.equal(result, false);
+});
+test("returns false for null values compared with objects", async () => {
+    const obj = { a: 1 };
+    const result = isDeepEqualData(obj, null);
+    assert.equal(result, false);
+});
+test("identifies two equal objects", async () => {
+    const obj1 = { a: 1, b: 2 };
+    const obj2 = { a: 1, b: 2 };
+    const result = isDeepEqualData(obj1, obj2);
+    assert.equal(result, true);
+});
+test("identifies two objects with different values", async () => {
+    const obj1 = { a: 1, b: 2 };
+    const obj2 = { a: 1, b: 3 };
+    const result = isDeepEqualData(obj1, obj2);
+    assert.equal(result, false);
+});
+test("identifies two objects with different number of keys", async () => {
+    const obj1 = { a: 1, b: 2 };
+    const obj2 = { a: 1, b: 2, c: 3 };
+    const result = isDeepEqualData(obj1, obj2);
+    assert.equal(result, false);
+});
+test("handles nested objects", async () => {
+    const obj1 = { a: { c: 1 }, b: 2 };
+    const obj2 = { a: { c: 1 }, b: 2 };
+    const result = isDeepEqualData(obj1, obj2);
+    assert.equal(result, true);
+});
+test("detects inequality in nested objects", async () => {
+    const obj1 = { a: { c: 1 }, b: 2 };
+    const obj2 = { a: { c: 2 }, b: 2 };
+    const result = isDeepEqualData(obj1, obj2);
+    assert.equal(result, false);
+});
+test("compares arrays correctly", async () => {
+    const arr1 = [1, 2, 3];
+    const arr2 = [1, 2, 3];
+    const result = isDeepEqualData(arr1, arr2);
+    assert.equal(result, true);
+    const arr3 = [1, 2, 3];
+    const arr4 = [1, 2, 4];
+    const result2 = isDeepEqualData(arr3, arr4);
+    assert.equal(result2, false);
+});
+test("returns false for null comparison with object", () => {
+    const obj = { a: 1 };
+    const result = isDeepEqualData(obj, null);
+    assert.equal(result, false);
+});
+test("distinguishes between array and object with same enumerable properties", () => {
+    const obj = { 0: "one", 1: "two", length: 2 };
+    const arr = ["one", "two"];
+    const result = isDeepEqualData(obj, arr);
+    assert.equal(result, false);
+});
+test("returns false when comparing objects with different prototypes", () => {
+    const obj1 = Object.create({ a: 1 });
+    const obj2 = Object.create(null);
+    obj1.b = 2;
+    obj2.b = 2;
+    const result = isDeepEqualData(obj1, obj2);
+    assert.equal(result, false);
+});
+test("handles date object comparisons correctly", () => {
+    const date1 = new Date(2000, 0, 1);
+    const date2 = new Date(2000, 0, 1);
+    const date3 = new Date(2000, 0, 2);
+    assert.equal(isDeepEqualData(date1, date2), true);
+    assert.equal(isDeepEqualData(date1, date3), false);
+});
+test("handles function comparisons", () => {
+    const func1 = () => {
+        console.log("hello");
+    };
+    const func2 = () => {
+        console.log("hello");
+    };
+    const func3 = () => {
+        console.log("world");
+    };
+    assert.equal(isDeepEqualData(func1, func2), false);
+    assert.equal(isDeepEqualData(func1, func3), false);
+});

package/prompt/Llama2PromptFormat.d.ts

@@ -1,13 +0,0 @@
-import { PromptFormat } from "./PromptFormat.js";
-import { InstructionPrompt } from "./InstructionPrompt.js";
-import { ChatPrompt } from "./chat/ChatPrompt.js";
-/**
- * Formats an instruction prompt as a Llama 2 prompt.
- *
- * @see https://www.philschmid.de/llama-2#how-to-prompt-llama-2-chat
- */
-export declare function mapInstructionPromptToLlama2Format(): PromptFormat<InstructionPrompt, string>;
-/**
- * Formats a chat prompt as a Llama 2 prompt.
- */
-export declare function mapChatPromptToLlama2Format(): PromptFormat<ChatPrompt, string>;

package/prompt/index.d.ts

@@ -1,11 +0,0 @@
-export * from "./AlpacaPromptFormat.js";
-export * from "./InstructionPrompt.js";
-export * from "./Llama2PromptFormat.js";
-export * from "./PromptFormat.js";
-export * from "./PromptFormatTextGenerationModel.js";
-export * from "./PromptFormatTextStreamingModel.js";
-export * from "./TextPromptFormat.js";
-export * from "./VicunaPromptFormat.js";
-export * from "./chat/ChatPrompt.js";
-export * from "./chat/trimChatPrompt.js";
-export * from "./chat/validateChatPrompt.js";

package/prompt/index.js

@@ -1,11 +0,0 @@
-export * from "./AlpacaPromptFormat.js";
-export * from "./InstructionPrompt.js";
-export * from "./Llama2PromptFormat.js";
-export * from "./PromptFormat.js";
-export * from "./PromptFormatTextGenerationModel.js";
-export * from "./PromptFormatTextStreamingModel.js";
-export * from "./TextPromptFormat.js";
-export * from "./VicunaPromptFormat.js";
-export * from "./chat/ChatPrompt.js";
-export * from "./chat/trimChatPrompt.js";
-export * from "./chat/validateChatPrompt.js";