modelfusion 0.47.1 → 0.47.2

package/model-provider/openai/chat/OpenAIChatModel.cjs

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIChatResponseFormat = exports.OpenAIChatModel = exports.calculateOpenAIChatCostInMillicents = exports.isOpenAIChatModel = exports.getOpenAIChatModelInformation = exports.OPENAI_CHAT_MODELS = void 0;
 const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
-const zod_1 = __importDefault(require("zod"));
+const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../../core/api/postToApi.cjs");
 const AbstractModel_js_1 = require("../../../model-function/AbstractModel.cjs");
@@ -270,7 +270,7 @@ class OpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         catch (error) {
             throw new StructureParseError_js_1.StructureParseError({
                 structureName: structureDefinition.name,
-                valueText: valueText,
+                valueText,
                 cause: error,
             });
         }
@@ -370,30 +370,30 @@ class OpenAIChatModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.OpenAIChatModel = OpenAIChatModel;
-const openAIChatResponseSchema = zod_1.default.object({
-    id: zod_1.default.string(),
-    object: zod_1.default.literal("chat.completion"),
-    created: zod_1.default.number(),
-    model: zod_1.default.string(),
-    choices: zod_1.default.array(zod_1.default.object({
-        message: zod_1.default.object({
-            role: zod_1.default.literal("assistant"),
-            content: zod_1.default.string().nullable(),
-            function_call: zod_1.default
+const openAIChatResponseSchema = zod_1.z.object({
+    id: zod_1.z.string(),
+    object: zod_1.z.literal("chat.completion"),
+    created: zod_1.z.number(),
+    model: zod_1.z.string(),
+    choices: zod_1.z.array(zod_1.z.object({
+        message: zod_1.z.object({
+            role: zod_1.z.literal("assistant"),
+            content: zod_1.z.string().nullable(),
+            function_call: zod_1.z
                 .object({
-                name: zod_1.default.string(),
-                arguments: zod_1.default.string(),
+                name: zod_1.z.string(),
+                arguments: zod_1.z.string(),
             })
                 .optional(),
         }),
-        index: zod_1.default.number(),
-        logprobs: zod_1.default.nullable(zod_1.default.any()),
-        finish_reason: zod_1.default.string(),
+        index: zod_1.z.number(),
+        logprobs: zod_1.z.nullable(zod_1.z.any()),
+        finish_reason: zod_1.z.string(),
     })),
-    usage: zod_1.default.object({
-        prompt_tokens: zod_1.default.number(),
-        completion_tokens: zod_1.default.number(),
-        total_tokens: zod_1.default.number(),
+    usage: zod_1.z.object({
+        prompt_tokens: zod_1.z.number(),
+        completion_tokens: zod_1.z.number(),
+        total_tokens: zod_1.z.number(),
     }),
 });
 async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, responseFormat, model, messages, functions, functionCall, temperature, topP, n, stop, maxTokens, presencePenalty, frequencyPenalty, logitBias, user, }) {

package/model-provider/openai/chat/OpenAIChatModel.d.ts

@@ -1,4 +1,4 @@
-import z from "zod";
+import { z } from "zod";
 import { FunctionOptions } from "../../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../../core/api/postToApi.js";

package/model-provider/openai/chat/OpenAIChatModel.js

@@ -1,5 +1,5 @@
 import SecureJSON from "secure-json-parse";
-import z from "zod";
+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";
@@ -261,7 +261,7 @@ export class OpenAIChatModel extends AbstractModel {
         catch (error) {
             throw new StructureParseError({
                 structureName: structureDefinition.name,
-                valueText: valueText,
+                valueText,
                 cause: error,
             });
         }

package/model-provider/openai/chat/OpenAIChatStreamIterable.cjs

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOpenAIChatDeltaIterableQueue = void 0;
-const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
 const zod_1 = require("zod");
 const AsyncQueue_js_1 = require("../../../event-source/AsyncQueue.cjs");
 const parseEventSourceStream_js_1 = require("../../../event-source/parseEventSourceStream.cjs");
+const parseJSON_js_1 = require("../../../util/parseJSON.cjs");
 const chatResponseStreamEventSchema = zod_1.z.object({
     choices: zod_1.z.array(zod_1.z.object({
         delta: zod_1.z.object({
@@ -41,8 +38,7 @@ async function createOpenAIChatDeltaIterableQueue(stream, extractDeltaValue) {
                     queue.close();
                     return;
                 }
-                const json = secure_json_parse_1.default.parse(data);
-                const parseResult = chatResponseStreamEventSchema.safeParse(json);
+                const parseResult = (0, parseJSON_js_1.safeParseJsonWithZod)(data, chatResponseStreamEventSchema);
                 if (!parseResult.success) {
                     queue.push({
                         type: "error",

package/model-provider/openai/chat/OpenAIChatStreamIterable.js

@@ -1,7 +1,7 @@
-import SecureJSON from "secure-json-parse";
 import { z } from "zod";
 import { AsyncQueue } from "../../../event-source/AsyncQueue.js";
 import { parseEventSourceStream } from "../../../event-source/parseEventSourceStream.js";
+import { safeParseJsonWithZod } from "../../../util/parseJSON.js";
 const chatResponseStreamEventSchema = z.object({
     choices: z.array(z.object({
         delta: z.object({
@@ -35,8 +35,7 @@ export async function createOpenAIChatDeltaIterableQueue(stream, extractDeltaVal
                     queue.close();
                     return;
                 }
-                const json = SecureJSON.parse(data);
-                const parseResult = chatResponseStreamEventSchema.safeParse(json);
+                const parseResult = safeParseJsonWithZod(data, chatResponseStreamEventSchema);
                 if (!parseResult.success) {
                     queue.push({
                         type: "error",

package/model-provider/stability/StabilityError.cjs

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedStabilityCallResponseHandler = exports.StabilityError = exports.stabilityErrorDataSchema = void 0;
-const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
 const zod_1 = require("zod");
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
+const parseJSON_js_1 = require("../../util/parseJSON.cjs");
 exports.stabilityErrorDataSchema = zod_1.z.object({
     message: zod_1.z.string(),
 });
@@ -25,7 +22,7 @@ class StabilityError extends ApiCallError_js_1.ApiCallError {
 exports.StabilityError = StabilityError;
 const failedStabilityCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = exports.stabilityErrorDataSchema.parse(secure_json_parse_1.default.parse(responseBody));
+    const parsedError = (0, parseJSON_js_1.parseJsonWithZod)(responseBody, exports.stabilityErrorDataSchema);
     return new StabilityError({
         url,
         requestBodyValues,

package/model-provider/stability/StabilityError.js

@@ -1,6 +1,6 @@
-import SecureJSON from "secure-json-parse";
 import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { parseJsonWithZod } from "../../util/parseJSON.js";
 export const stabilityErrorDataSchema = z.object({
     message: z.string(),
 });
@@ -18,7 +18,7 @@ export class StabilityError extends ApiCallError {
 }
 export const failedStabilityCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = stabilityErrorDataSchema.parse(SecureJSON.parse(responseBody));
+    const parsedError = parseJsonWithZod(responseBody, stabilityErrorDataSchema);
     return new StabilityError({
         url,
         requestBodyValues,

package/package.json

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

package/util/JSONParseError.cjs

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JSONParseError = void 0;
+const getErrorMessage_js_1 = require("./getErrorMessage.cjs");
+class JSONParseError extends Error {
+    constructor({ valueText, cause }) {
+        super(`JSON parsing failed: ` +
+            `Value: ${valueText}.\n` +
+            `Error message: ${(0, getErrorMessage_js_1.getErrorMessage)(cause)}`);
+        Object.defineProperty(this, "structureName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cause", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "valueText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = "JSONParseError";
+        this.cause = cause;
+        this.valueText = valueText;
+    }
+}
+exports.JSONParseError = JSONParseError;

package/util/JSONParseError.d.ts

@@ -0,0 +1,9 @@
+export declare class JSONParseError extends Error {
+    readonly structureName: string;
+    readonly cause: unknown;
+    readonly valueText: string;
+    constructor({ valueText, cause }: {
+        valueText: string;
+        cause: unknown;
+    });
+}

package/util/JSONParseError.js

@@ -0,0 +1,29 @@
+import { getErrorMessage } from "./getErrorMessage.js";
+export class JSONParseError extends Error {
+    constructor({ valueText, cause }) {
+        super(`JSON parsing failed: ` +
+            `Value: ${valueText}.\n` +
+            `Error message: ${getErrorMessage(cause)}`);
+        Object.defineProperty(this, "structureName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cause", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "valueText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = "JSONParseError";
+        this.cause = cause;
+        this.valueText = valueText;
+    }
+}

package/util/index.cjs

@@ -14,5 +14,7 @@ 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("./JSONParseError.cjs"), exports);
 __exportStar(require("./cosineSimilarity.cjs"), exports);
 __exportStar(require("./getAudioFileExtension.cjs"), exports);
+__exportStar(require("./parseJSON.cjs"), exports);

package/util/index.d.ts

@@ -1,2 +1,4 @@
+export * from "./JSONParseError.js";
 export * from "./cosineSimilarity.js";
 export * from "./getAudioFileExtension.js";
+export * from "./parseJSON.js";

package/util/index.js

@@ -1,2 +1,4 @@
+export * from "./JSONParseError.js";
 export * from "./cosineSimilarity.js";
 export * from "./getAudioFileExtension.js";
+export * from "./parseJSON.js";

package/util/parseJSON.cjs

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeParseJsonWithSchema = exports.safeParseJsonWithZod = exports.parseJsonWithZod = void 0;
+const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
+const JSONParseError_js_1 = require("./JSONParseError.cjs");
+function parseJsonWithZod(json, schema) {
+    try {
+        const parsedJson = secure_json_parse_1.default.parse(json);
+        return schema.parse(parsedJson);
+    }
+    catch (error) {
+        throw new JSONParseError_js_1.JSONParseError({
+            valueText: json,
+            cause: error,
+        });
+    }
+}
+exports.parseJsonWithZod = parseJsonWithZod;
+function safeParseJsonWithZod(json, schema) {
+    try {
+        const parsedJson = secure_json_parse_1.default.parse(json);
+        const validationResult = schema.safeParse(parsedJson);
+        if (validationResult.success) {
+            return validationResult;
+        }
+        return {
+            success: false,
+            error: new JSONParseError_js_1.JSONParseError({
+                valueText: json,
+                cause: validationResult.error,
+            }),
+        };
+    }
+    catch (error) {
+        throw new JSONParseError_js_1.JSONParseError({
+            valueText: json,
+            cause: error,
+        });
+    }
+}
+exports.safeParseJsonWithZod = safeParseJsonWithZod;
+function safeParseJsonWithSchema(json, schema) {
+    try {
+        const parsedJson = secure_json_parse_1.default.parse(json);
+        const validationResult = schema.validate(parsedJson);
+        if (validationResult.success) {
+            return validationResult;
+        }
+        return {
+            success: false,
+            error: new JSONParseError_js_1.JSONParseError({
+                valueText: json,
+                cause: validationResult.error,
+            }),
+        };
+    }
+    catch (error) {
+        throw new JSONParseError_js_1.JSONParseError({
+            valueText: json,
+            cause: error,
+        });
+    }
+}
+exports.safeParseJsonWithSchema = safeParseJsonWithSchema;

package/util/parseJSON.d.ts

@@ -0,0 +1,18 @@
+import { z } from "zod";
+import { Schema } from "../core/structure/Schema.js";
+import { JSONParseError } from "./JSONParseError.js";
+export declare function parseJsonWithZod<T>(json: string, schema: z.Schema<T>): T;
+export declare function safeParseJsonWithZod<T>(json: string, schema: z.Schema<T>): {
+    success: true;
+    data: T;
+} | {
+    success: false;
+    error: JSONParseError;
+};
+export declare function safeParseJsonWithSchema<T>(json: string, schema: Schema<T>): {
+    success: true;
+    data: T;
+} | {
+    success: false;
+    error: JSONParseError;
+};

package/util/parseJSON.js

@@ -0,0 +1,58 @@
+import SecureJSON from "secure-json-parse";
+import { JSONParseError } from "./JSONParseError.js";
+export function parseJsonWithZod(json, schema) {
+    try {
+        const parsedJson = SecureJSON.parse(json);
+        return schema.parse(parsedJson);
+    }
+    catch (error) {
+        throw new JSONParseError({
+            valueText: json,
+            cause: error,
+        });
+    }
+}
+export function safeParseJsonWithZod(json, schema) {
+    try {
+        const parsedJson = SecureJSON.parse(json);
+        const validationResult = schema.safeParse(parsedJson);
+        if (validationResult.success) {
+            return validationResult;
+        }
+        return {
+            success: false,
+            error: new JSONParseError({
+                valueText: json,
+                cause: validationResult.error,
+            }),
+        };
+    }
+    catch (error) {
+        throw new JSONParseError({
+            valueText: json,
+            cause: error,
+        });
+    }
+}
+export function safeParseJsonWithSchema(json, schema) {
+    try {
+        const parsedJson = SecureJSON.parse(json);
+        const validationResult = schema.validate(parsedJson);
+        if (validationResult.success) {
+            return validationResult;
+        }
+        return {
+            success: false,
+            error: new JSONParseError({
+                valueText: json,
+                cause: validationResult.error,
+            }),
+        };
+    }
+    catch (error) {
+        throw new JSONParseError({
+            valueText: json,
+            cause: error,
+        });
+    }
+}

package/vector-index/memory/MemoryVectorIndex.cjs

@@ -1,16 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryVectorIndex = void 0;
-const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
-const zod_1 = __importDefault(require("zod"));
+const zod_1 = require("zod");
 const cosineSimilarity_js_1 = require("../../util/cosineSimilarity.cjs");
-const jsonDataSchema = zod_1.default.array(zod_1.default.object({
-    id: zod_1.default.string(),
-    vector: zod_1.default.array(zod_1.default.number()),
-    data: zod_1.default.unknown(),
+const parseJSON_js_1 = require("../../util/parseJSON.cjs");
+const jsonDataSchema = zod_1.z.array(zod_1.z.object({
+    id: zod_1.z.string(),
+    vector: zod_1.z.array(zod_1.z.number()),
+    data: zod_1.z.unknown(),
 }));
 /**
  * A very simple vector index that stores all entries in memory. Useful when you only have
@@ -28,7 +25,7 @@ class MemoryVectorIndex {
     }
     static async deserialize({ serializedData, schema, }) {
         // validate the outer structure:
-        const json = jsonDataSchema.parse(secure_json_parse_1.default.parse(serializedData));
+        const json = (0, parseJSON_js_1.parseJsonWithZod)(serializedData, jsonDataSchema);
         if (schema != null) {
             // when a schema is provided, validate all entries:
             for (const entry of json) {

package/vector-index/memory/MemoryVectorIndex.js

@@ -1,6 +1,6 @@
-import SecureJSON from "secure-json-parse";
-import z from "zod";
+import { z } from "zod";
 import { cosineSimilarity } from "../../util/cosineSimilarity.js";
+import { parseJsonWithZod } from "../../util/parseJSON.js";
 const jsonDataSchema = z.array(z.object({
     id: z.string(),
     vector: z.array(z.number()),
@@ -22,7 +22,7 @@ export class MemoryVectorIndex {
     }
     static async deserialize({ serializedData, schema, }) {
         // validate the outer structure:
-        const json = jsonDataSchema.parse(SecureJSON.parse(serializedData));
+        const json = parseJsonWithZod(serializedData, jsonDataSchema);
         if (schema != null) {
             // when a schema is provided, validate all entries:
             for (const entry of json) {