modelfusion 0.57.0 → 0.57.2

package/core/api/ApiCallError.cjs

@@ -41,5 +41,16 @@ class ApiCallError extends Error {
         this.cause = cause;
         this.isRetryable = isRetryable;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            url: this.url,
+            requestBodyValues: this.requestBodyValues,
+            statusCode: this.statusCode,
+            cause: this.cause,
+            isRetryable: this.isRetryable,
+        };
+    }
 }
 exports.ApiCallError = ApiCallError;

package/core/api/ApiCallError.d.ts

@@ -12,4 +12,13 @@ export declare class ApiCallError extends Error {
         cause?: unknown;
         isRetryable?: boolean;
     });
+    toJSON(): {
+        name: string;
+        message: string;
+        url: string;
+        requestBodyValues: unknown;
+        statusCode: number;
+        cause: unknown;
+        isRetryable: boolean;
+    };
 }

package/core/api/ApiCallError.js

@@ -38,4 +38,15 @@ export class ApiCallError extends Error {
         this.cause = cause;
         this.isRetryable = isRetryable;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            url: this.url,
+            requestBodyValues: this.requestBodyValues,
+            statusCode: this.statusCode,
+            cause: this.cause,
+            isRetryable: this.isRetryable,
+        };
+    }
 }

package/core/api/LoadAPIKeyError.cjs

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoadAPIKeyError = void 0;
+class LoadAPIKeyError extends Error {
+    constructor({ message }) {
+        super(message);
+        this.name = "LoadAPIKeyError";
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+        };
+    }
+}
+exports.LoadAPIKeyError = LoadAPIKeyError;

package/core/api/LoadAPIKeyError.d.ts

@@ -0,0 +1,9 @@
+export declare class LoadAPIKeyError extends Error {
+    constructor({ message }: {
+        message: string;
+    });
+    toJSON(): {
+        name: string;
+        message: string;
+    };
+}

package/core/api/LoadAPIKeyError.js

@@ -0,0 +1,12 @@
+export class LoadAPIKeyError extends Error {
+    constructor({ message }) {
+        super(message);
+        this.name = "LoadAPIKeyError";
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+        };
+    }
+}

package/core/api/RetryError.cjs

@@ -20,5 +20,13 @@ class RetryError extends Error {
         this.reason = reason;
         this.errors = errors;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            reason: this.reason,
+            errors: this.errors,
+        };
+    }
 }
 exports.RetryError = RetryError;

package/core/api/RetryError.d.ts

@@ -7,4 +7,10 @@ export declare class RetryError extends Error {
         reason: RetryErrorReason;
         errors: Array<unknown>;
     });
+    toJSON(): {
+        name: string;
+        message: string;
+        reason: RetryErrorReason;
+        errors: unknown[];
+    };
 }

package/core/api/RetryError.js

@@ -17,4 +17,12 @@ export class RetryError extends Error {
         this.reason = reason;
         this.errors = errors;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            reason: this.reason,
+            errors: this.errors,
+        };
+    }
 }

package/core/api/loadApiKey.cjs

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadApiKey = void 0;
+const LoadAPIKeyError_js_1 = require("./LoadAPIKeyError.cjs");
 function loadApiKey({ apiKey, environmentVariableName, apiKeyParameterName = "apiKey", description, }) {
     if (apiKey != null) {
         return apiKey;
     }
     if (typeof process === "undefined") {
-        throw new Error(`${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter into the API configuration. Environment variables is not supported in this environment.`);
+        throw new LoadAPIKeyError_js_1.LoadAPIKeyError({
+            message: `${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter into the API configuration. Environment variables is not supported in this environment.`,
+        });
     }
     apiKey = process.env[environmentVariableName];
     if (apiKey == null) {
-        throw new Error(`${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter into the API configuration or set it as an environment variable named ${environmentVariableName}.`);
+        throw new LoadAPIKeyError_js_1.LoadAPIKeyError({
+            message: `${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter into the API configuration or set it as an environment variable named ${environmentVariableName}.`,
+        });
     }
     return apiKey;
 }

package/core/api/loadApiKey.js

@@ -1,13 +1,18 @@
+import { LoadAPIKeyError } from "./LoadAPIKeyError.js";
 export function loadApiKey({ apiKey, environmentVariableName, apiKeyParameterName = "apiKey", description, }) {
     if (apiKey != null) {
         return apiKey;
     }
     if (typeof process === "undefined") {
-        throw new Error(`${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter into the API configuration. Environment variables is not supported in this environment.`);
+        throw new LoadAPIKeyError({
+            message: `${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter into the API configuration. Environment variables is not supported in this environment.`,
+        });
     }
     apiKey = process.env[environmentVariableName];
     if (apiKey == null) {
-        throw new Error(`${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter into the API configuration or set it as an environment variable named ${environmentVariableName}.`);
+        throw new LoadAPIKeyError({
+            message: `${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter into the API configuration or set it as an environment variable named ${environmentVariableName}.`,
+        });
     }
     return apiKey;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "Build multimodal applications, chatbots, and agents with JavaScript and TypeScript.",
-  "version": "0.57.0",
+  "version": "0.57.2",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/server/fastify/FileSystemLogger.cjs

@@ -28,15 +28,16 @@ class FileSystemLogger {
             });
         }
     }
-    async logError(options) {
+    async logError({ run, error, message, }) {
         const timestamp = Date.now();
         try {
-            const logPath = this.logPath(options.run);
-            return node_fs_1.promises.writeFile((0, node_path_1.join)(logPath, `${timestamp}-error.json`), JSON.stringify({
+            const logPath = this.logPath(run);
+            await node_fs_1.promises.mkdir(logPath, { recursive: true });
+            await node_fs_1.promises.writeFile((0, node_path_1.join)(logPath, `${timestamp}-error.json`), JSON.stringify({
                 timestamp: new Date(timestamp).toISOString(),
-                runId: options.run.runId,
-                message: options.message,
-                error: options.error,
+                runId: run.runId,
+                message,
+                error,
             }));
         }
         catch (error) {

package/server/fastify/FileSystemLogger.d.ts

@@ -10,7 +10,7 @@ export declare class FileSystemLogger implements Logger {
         run: FlowRun<unknown>;
         event: FunctionEvent;
     }): Promise<void>;
-    logError(options: {
+    logError({ run, error, message, }: {
         run: FlowRun<unknown>;
         message: string;
         error: unknown;

package/server/fastify/FileSystemLogger.js

@@ -25,15 +25,16 @@ export class FileSystemLogger {
             });
         }
     }
-    async logError(options) {
+    async logError({ run, error, message, }) {
         const timestamp = Date.now();
         try {
-            const logPath = this.logPath(options.run);
-            return fs.writeFile(join(logPath, `${timestamp}-error.json`), JSON.stringify({
+            const logPath = this.logPath(run);
+            await fs.mkdir(logPath, { recursive: true });
+            await fs.writeFile(join(logPath, `${timestamp}-error.json`), JSON.stringify({
                 timestamp: new Date(timestamp).toISOString(),
-                runId: options.run.runId,
-                message: options.message,
-                error: options.error,
+                runId: run.runId,
+                message,
+                error,
             }));
         }
         catch (error) {

package/server/fastify/modelFusionFlowPlugin.cjs

@@ -27,6 +27,7 @@ const modelFusionFastifyPlugin = async (fastify, { flow, baseUrl, basePath, asse
                 run,
             })
                 .catch((error) => {
+                console.error("Failed to process flow", error);
                 logger.logError({
                     run,
                     message: "Failed to process flow",

package/server/fastify/modelFusionFlowPlugin.js

@@ -24,6 +24,7 @@ export const modelFusionFastifyPlugin = async (fastify, { flow, baseUrl, basePat
                 run,
             })
                 .catch((error) => {
+                console.error("Failed to process flow", error);
                 logger.logError({
                     run,
                     message: "Failed to process flow",

package/util/JSONParseError.cjs

@@ -29,5 +29,13 @@ class JSONParseError extends Error {
         this.cause = cause;
         this.valueText = valueText;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            cause: this.cause,
+            valueText: this.valueText,
+        };
+    }
 }
 exports.JSONParseError = JSONParseError;

package/util/JSONParseError.d.ts

@@ -6,4 +6,10 @@ export declare class JSONParseError extends Error {
         valueText: string;
         cause: unknown;
     });
+    toJSON(): {
+        name: string;
+        message: string;
+        cause: unknown;
+        valueText: string;
+    };
 }

package/util/JSONParseError.js

@@ -26,4 +26,12 @@ export class JSONParseError extends Error {
         this.cause = cause;
         this.valueText = valueText;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            message: this.message,
+            cause: this.cause,
+            valueText: this.valueText,
+        };
+    }
 }

package/util/runSafe.test.cjs

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const runSafe_js_1 = require("./runSafe.cjs");
+(0, vitest_1.test)("catch thrown error in sync function", async () => {
+    const error = new Error("test error");
+    const result = await (0, runSafe_js_1.runSafe)(() => {
+        throw error;
+    });
+    (0, vitest_1.expect)(result).toEqual({
+        ok: false,
+        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 () => {
+        throw error;
+    });
+    (0, vitest_1.expect)(result).toEqual({
+        ok: false,
+        error,
+    });
+});
+(0, vitest_1.test)("catch thrown string", async () => {
+    const result = await (0, runSafe_js_1.runSafe)(async () => {
+        throw "test error";
+    });
+    (0, vitest_1.expect)(result).toEqual({
+        ok: false,
+        error: "test error",
+    });
+});
+(0, vitest_1.test)("catch rejected Promise", async () => {
+    const error = new Error("test error");
+    const result = await (0, runSafe_js_1.runSafe)(async () => {
+        return Promise.reject(error);
+    });
+    (0, vitest_1.expect)(result).toEqual({
+        ok: false,
+        error,
+    });
+});
+(0, vitest_1.test)("no error", async () => {
+    const result = await (0, runSafe_js_1.runSafe)(async () => "result");
+    (0, vitest_1.expect)(result).toEqual({
+        ok: true,
+        value: "result",
+    });
+});

package/util/runSafe.test.d.ts

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

package/util/runSafe.test.js

@@ -0,0 +1,48 @@
+import { expect, test } from "vitest";
+import { runSafe } from "./runSafe.js";
+test("catch thrown error in sync function", async () => {
+    const error = new Error("test error");
+    const result = await runSafe(() => {
+        throw error;
+    });
+    expect(result).toEqual({
+        ok: false,
+        error,
+    });
+});
+test("catch thrown error in async function", async () => {
+    const error = new Error("test error");
+    const result = await runSafe(async () => {
+        throw error;
+    });
+    expect(result).toEqual({
+        ok: false,
+        error,
+    });
+});
+test("catch thrown string", async () => {
+    const result = await runSafe(async () => {
+        throw "test error";
+    });
+    expect(result).toEqual({
+        ok: false,
+        error: "test error",
+    });
+});
+test("catch rejected Promise", async () => {
+    const error = new Error("test error");
+    const result = await runSafe(async () => {
+        return Promise.reject(error);
+    });
+    expect(result).toEqual({
+        ok: false,
+        error,
+    });
+});
+test("no error", async () => {
+    const result = await runSafe(async () => "result");
+    expect(result).toEqual({
+        ok: true,
+        value: "result",
+    });
+});