modelfusion 0.57.2 → 0.59.0

package/tool/useToolOrGenerateText.js

@@ -16,7 +16,10 @@ export async function useToolOrGenerateText(model, tools, prompt, options) {
                 name: tool.name,
                 description: tool.description,
                 schema: tool.inputSchema,
-            })), expandedPrompt, options);
+            })), expandedPrompt, {
+                ...options,
+                returnType: "structure",
+            });
             const { structure, text } = modelResponse;
             if (structure == null) {
                 return {

package/util/JSONParseError.cjs

@@ -35,6 +35,7 @@ class JSONParseError extends Error {
             message: this.message,
             cause: this.cause,
             valueText: this.valueText,
+            stack: this.stack,
         };
     }
 }

package/util/JSONParseError.d.ts

@@ -11,5 +11,6 @@ export declare class JSONParseError extends Error {
         message: string;
         cause: unknown;
         valueText: string;
+        stack: string | undefined;
     };
 }

package/util/JSONParseError.js

@@ -32,6 +32,7 @@ export class JSONParseError extends Error {
             message: this.message,
             cause: this.cause,
             valueText: this.valueText,
+            stack: this.stack,
         };
     }
 }

package/util/runSafe.test.cjs

@@ -12,6 +12,15 @@ const runSafe_js_1 = require("./runSafe.cjs");
         error,
     });
 });
+(0, vitest_1.test)("catch thrown string in sync function", async () => {
+    const result = await (0, runSafe_js_1.runSafe)(() => {
+        throw "test error";
+    });
+    (0, vitest_1.expect)(result).toEqual({
+        ok: false,
+        error: "test error",
+    });
+});
 (0, vitest_1.test)("catch thrown error in async function", async () => {
     const error = new Error("test error");
     const result = await (0, runSafe_js_1.runSafe)(async () => {
@@ -22,7 +31,7 @@ const runSafe_js_1 = require("./runSafe.cjs");
         error,
     });
 });
-(0, vitest_1.test)("catch thrown string", async () => {
+(0, vitest_1.test)("catch thrown string in async function", async () => {
     const result = await (0, runSafe_js_1.runSafe)(async () => {
         throw "test error";
     });

package/util/runSafe.test.js

@@ -10,6 +10,15 @@ test("catch thrown error in sync function", async () => {
         error,
     });
 });
+test("catch thrown string in sync function", async () => {
+    const result = await runSafe(() => {
+        throw "test error";
+    });
+    expect(result).toEqual({
+        ok: false,
+        error: "test error",
+    });
+});
 test("catch thrown error in async function", async () => {
     const error = new Error("test error");
     const result = await runSafe(async () => {
@@ -20,7 +29,7 @@ test("catch thrown error in async function", async () => {
         error,
     });
 });
-test("catch thrown string", async () => {
+test("catch thrown string in async function", async () => {
     const result = await runSafe(async () => {
         throw "test error";
     });

package/model-function/AsyncIterableResultPromise.cjs

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AsyncIterableResultPromise = void 0;
-class AsyncIterableResultPromise extends Promise {
-    constructor(fullPromise) {
-        super((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            resolve(null); // we override the resolve function
-        });
-        Object.defineProperty(this, "fullPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: fullPromise
-        });
-        Object.defineProperty(this, "valuePromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.valuePromise = fullPromise.then((result) => result.value);
-    }
-    asFullResponse() {
-        return this.fullPromise;
-    }
-    then(onfulfilled, onrejected) {
-        return this.valuePromise.then(onfulfilled, onrejected);
-    }
-    catch(onrejected) {
-        return this.valuePromise.catch(onrejected);
-    }
-    finally(onfinally) {
-        return this.valuePromise.finally(onfinally);
-    }
-}
-exports.AsyncIterableResultPromise = AsyncIterableResultPromise;

package/model-function/AsyncIterableResultPromise.d.ts

@@ -1,16 +0,0 @@
-import { ModelCallMetadata } from "./ModelCallMetadata.js";
-export declare class AsyncIterableResultPromise<T> extends Promise<AsyncIterable<T>> {
-    private fullPromise;
-    private valuePromise;
-    constructor(fullPromise: Promise<{
-        value: AsyncIterable<T>;
-        metadata: Omit<ModelCallMetadata, "durationInMs" | "finishTimestamp">;
-    }>);
-    asFullResponse(): Promise<{
-        value: AsyncIterable<T>;
-        metadata: Omit<ModelCallMetadata, "durationInMs" | "finishTimestamp">;
-    }>;
-    then<TResult1 = AsyncIterable<T>, TResult2 = never>(onfulfilled?: ((value: AsyncIterable<T>) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | undefined | null): Promise<AsyncIterable<T> | TResult>;
-    finally(onfinally?: (() => void) | undefined | null): Promise<AsyncIterable<T>>;
-}

package/model-function/AsyncIterableResultPromise.js

@@ -1,33 +0,0 @@
-export class AsyncIterableResultPromise extends Promise {
-    constructor(fullPromise) {
-        super((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            resolve(null); // we override the resolve function
-        });
-        Object.defineProperty(this, "fullPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: fullPromise
-        });
-        Object.defineProperty(this, "valuePromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.valuePromise = fullPromise.then((result) => result.value);
-    }
-    asFullResponse() {
-        return this.fullPromise;
-    }
-    then(onfulfilled, onrejected) {
-        return this.valuePromise.then(onfulfilled, onrejected);
-    }
-    catch(onrejected) {
-        return this.valuePromise.catch(onrejected);
-    }
-    finally(onfinally) {
-        return this.valuePromise.finally(onfinally);
-    }
-}

package/model-function/ModelFunctionPromise.cjs

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelFunctionPromise = void 0;
-class ModelFunctionPromise extends Promise {
-    constructor(fullPromise) {
-        super((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            resolve(null); // we override the resolve function
-        });
-        Object.defineProperty(this, "fullPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: fullPromise
-        });
-        Object.defineProperty(this, "valuePromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.valuePromise = fullPromise.then((result) => result.value);
-    }
-    asFullResponse() {
-        return this.fullPromise;
-    }
-    then(onfulfilled, onrejected) {
-        return this.valuePromise.then(onfulfilled, onrejected);
-    }
-    catch(onrejected) {
-        return this.valuePromise.catch(onrejected);
-    }
-    finally(onfinally) {
-        return this.valuePromise.finally(onfinally);
-    }
-}
-exports.ModelFunctionPromise = ModelFunctionPromise;

package/model-function/ModelFunctionPromise.d.ts

@@ -1,18 +0,0 @@
-import { ModelCallMetadata } from "./ModelCallMetadata.js";
-export declare class ModelFunctionPromise<VALUE> extends Promise<VALUE> {
-    private fullPromise;
-    private valuePromise;
-    constructor(fullPromise: Promise<{
-        value: VALUE;
-        response: unknown;
-        metadata: ModelCallMetadata;
-    }>);
-    asFullResponse(): Promise<{
-        value: VALUE;
-        response: unknown;
-        metadata: ModelCallMetadata;
-    }>;
-    then<TResult1 = VALUE, TResult2 = never>(onfulfilled?: ((value: VALUE) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | undefined | null): Promise<VALUE | TResult>;
-    finally(onfinally?: (() => void) | undefined | null): Promise<VALUE>;
-}

package/model-function/ModelFunctionPromise.js

@@ -1,33 +0,0 @@
-export class ModelFunctionPromise extends Promise {
-    constructor(fullPromise) {
-        super((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            resolve(null); // we override the resolve function
-        });
-        Object.defineProperty(this, "fullPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: fullPromise
-        });
-        Object.defineProperty(this, "valuePromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.valuePromise = fullPromise.then((result) => result.value);
-    }
-    asFullResponse() {
-        return this.fullPromise;
-    }
-    then(onfulfilled, onrejected) {
-        return this.valuePromise.then(onfulfilled, onrejected);
-    }
-    catch(onrejected) {
-        return this.valuePromise.catch(onrejected);
-    }
-    finally(onfinally) {
-        return this.valuePromise.finally(onfinally);
-    }
-}

package/model-function/generate-image/ImageGenerationPromise.cjs

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageGenerationPromise = void 0;
-class ImageGenerationPromise extends Promise {
-    constructor(fullPromise) {
-        super((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            resolve(null); // we override the resolve function
-        });
-        Object.defineProperty(this, "fullPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: fullPromise
-        });
-        Object.defineProperty(this, "imageBase64Promise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "imageBufferPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.imageBase64Promise = fullPromise.then((result) => result.value);
-        this.imageBufferPromise = this.imageBase64Promise.then((base64Text) => Buffer.from(base64Text, "base64"));
-    }
-    asFullResponse() {
-        return this.fullPromise;
-    }
-    asBase64Text() {
-        return this.imageBase64Promise;
-    }
-    asBuffer() {
-        return this.imageBufferPromise;
-    }
-    then(onfulfilled, onrejected) {
-        return this.imageBufferPromise.then(onfulfilled, onrejected);
-    }
-    catch(onrejected) {
-        return this.imageBufferPromise.catch(onrejected);
-    }
-    finally(onfinally) {
-        return this.imageBufferPromise.finally(onfinally);
-    }
-}
-exports.ImageGenerationPromise = ImageGenerationPromise;

package/model-function/generate-image/ImageGenerationPromise.d.ts

@@ -1,22 +0,0 @@
-/// <reference types="node" />
-import { ModelCallMetadata } from "../ModelCallMetadata.js";
-export declare class ImageGenerationPromise extends Promise<Buffer> {
-    private fullPromise;
-    private imageBase64Promise;
-    private imageBufferPromise;
-    constructor(fullPromise: Promise<{
-        value: string;
-        response: unknown;
-        metadata: ModelCallMetadata;
-    }>);
-    asFullResponse(): Promise<{
-        value: string;
-        response: unknown;
-        metadata: ModelCallMetadata;
-    }>;
-    asBase64Text(): Promise<string>;
-    asBuffer(): Promise<Buffer>;
-    then<TResult1 = Buffer, TResult2 = never>(onfulfilled?: ((value: Buffer) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | undefined | null): Promise<Buffer | TResult>;
-    finally(onfinally?: (() => void) | undefined | null): Promise<Buffer>;
-}

package/model-function/generate-image/ImageGenerationPromise.js

@@ -1,46 +0,0 @@
-export class ImageGenerationPromise extends Promise {
-    constructor(fullPromise) {
-        super((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            resolve(null); // we override the resolve function
-        });
-        Object.defineProperty(this, "fullPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: fullPromise
-        });
-        Object.defineProperty(this, "imageBase64Promise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "imageBufferPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.imageBase64Promise = fullPromise.then((result) => result.value);
-        this.imageBufferPromise = this.imageBase64Promise.then((base64Text) => Buffer.from(base64Text, "base64"));
-    }
-    asFullResponse() {
-        return this.fullPromise;
-    }
-    asBase64Text() {
-        return this.imageBase64Promise;
-    }
-    asBuffer() {
-        return this.imageBufferPromise;
-    }
-    then(onfulfilled, onrejected) {
-        return this.imageBufferPromise.then(onfulfilled, onrejected);
-    }
-    catch(onrejected) {
-        return this.imageBufferPromise.catch(onrejected);
-    }
-    finally(onfinally) {
-        return this.imageBufferPromise.finally(onfinally);
-    }
-}