modelfusion 0.66.1 → 0.68.0

package/model-provider/llamacpp/LlamaCppTextGenerationModel.js

@@ -1,11 +1,12 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
-import { AsyncQueue } from "../../util/AsyncQueue.js";
-import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
+import { AsyncQueue } from "../../util/AsyncQueue.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
+import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
 import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
@@ -168,13 +169,13 @@ const llamaCppTextGenerationResponseSchema = z.object({
     tokens_predicted: z.number(),
     truncated: z.boolean(),
 });
-const llamaCppTextStreamingResponseSchema = z.discriminatedUnion("stop", [
+const llamaCppTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("stop", [
     z.object({
         content: z.string(),
         stop: z.literal(false),
     }),
     llamaCppTextGenerationResponseSchema,
-]);
+]));
 async function callLlamaCppTextGenerationAPI({ api = new LlamaCppApiConfiguration(), abortSignal, responseFormat, prompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
     return postJsonToApi({
         url: api.assembleUrl(`/completion`),
@@ -220,7 +221,10 @@ async function createLlamaCppFullDeltaIterableQueue(stream) {
         try {
             for await (const event of events) {
                 const data = event.data;
-                const eventData = parseJsonWithZod(data, llamaCppTextStreamingResponseSchema);
+                const eventData = parseJSON({
+                    text: data,
+                    schema: llamaCppTextStreamingResponseSchema,
+                });
                 content += eventData.content;
                 queue.push({
                     type: "delta",

package/model-provider/ollama/OllamaTextGenerationModel.cjs

@@ -4,6 +4,7 @@ exports.OllamaTextGenerationResponseFormat = exports.OllamaTextGenerationModel =
 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 PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -72,6 +73,8 @@ class OllamaTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             "system",
             "template",
             "context",
+            "format",
+            "raw",
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
@@ -118,7 +121,7 @@ const ollamaTextGenerationResponseSchema = zod_1.z.object({
     eval_duration: zod_1.z.number(),
     context: zod_1.z.array(zod_1.z.number()),
 });
-const ollamaTextStreamingResponseSchema = zod_1.z.discriminatedUnion("done", [
+const ollamaTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminatedUnion("done", [
     zod_1.z.object({
         done: zod_1.z.literal(false),
         model: zod_1.z.string(),
@@ -139,8 +142,8 @@ const ollamaTextStreamingResponseSchema = zod_1.z.discriminatedUnion("done", [
         eval_duration: zod_1.z.number(),
         context: zod_1.z.array(zod_1.z.number()),
     }),
-]);
-async function callOllamaTextGenerationAPI({ api = new OllamaApiConfiguration_js_1.OllamaApiConfiguration(), abortSignal, responseFormat, prompt, model, contextWindowSize, maxCompletionTokens, mirostat, mirostat_eta, mirostat_tau, num_gpu, num_gqa, num_threads, repeat_last_n, repeat_penalty, seed, stopSequences, temperature, tfs_z, top_k, top_p, system, template, context, }) {
+]));
+async function callOllamaTextGenerationAPI({ api = new OllamaApiConfiguration_js_1.OllamaApiConfiguration(), abortSignal, responseFormat, prompt, model, format, contextWindowSize, maxCompletionTokens, mirostat, mirostat_eta, mirostat_tau, num_gpu, num_gqa, num_threads, repeat_last_n, repeat_penalty, seed, stopSequences, temperature, tfs_z, top_k, top_p, system, template, context, raw, }) {
     return (0, postToApi_js_1.postJsonToApi)({
         url: api.assembleUrl(`/api/generate`),
         headers: api.headers,
@@ -148,6 +151,7 @@ async function callOllamaTextGenerationAPI({ api = new OllamaApiConfiguration_js
             stream: responseFormat.stream,
             model,
             prompt,
+            format,
             options: {
                 mirostat,
                 mirostat_eta,
@@ -169,6 +173,7 @@ async function callOllamaTextGenerationAPI({ api = new OllamaApiConfiguration_js
             system,
             template,
             context,
+            raw,
         },
         failedResponseHandler: OllamaError_js_1.failedOllamaCallResponseHandler,
         successfulResponseHandler: responseFormat.handler,

package/model-provider/ollama/OllamaTextGenerationModel.d.ts

@@ -7,27 +7,104 @@ import { Delta } from "../../model-function/Delta.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
+/**
+ * @see https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion
+ */
 export interface OllamaTextGenerationModelSettings<CONTEXT_WINDOW_SIZE extends number | undefined> extends TextGenerationModelSettings {
     api?: ApiConfiguration;
+    /**
+     * The name of the model to use. For example, 'mistral'.
+     *
+     * @see https://ollama.ai/library
+     */
     model: string;
+    /**
+     * The temperature of the model. Increasing the temperature will make the model
+     * answer more creatively. (Default: 0.8)
+     */
     temperature?: number;
     /**
      * Specify the context window size of the model that you have loaded in your
-     * Ollama server.
+     * Ollama server. (Default: 2048)
      */
     contextWindowSize?: CONTEXT_WINDOW_SIZE;
+    /**
+     * Enable Mirostat sampling for controlling perplexity.
+     * (default: 0, 0 = disabled, 1 = Mirostat, 2 = Mirostat 2.0)
+     */
     mirostat?: number;
+    /**
+     * Influences how quickly the algorithm responds to feedback from the generated text.
+     * A lower learning rate will result in slower adjustments,
+     * while a higher learning rate will make the algorithm more responsive. (Default: 0.1)
+     */
     mirostat_eta?: number;
+    /**
+     * Controls the balance between coherence and diversity of the output.
+     * A lower value will result in more focused and coherent text. (Default: 5.0)
+     */
     mirostat_tau?: number;
+    /**
+     * The number of GQA groups in the transformer layer. Required for some models,
+     * for example it is 8 for llama2:70b
+     */
     num_gqa?: number;
+    /**
+     * The number of layers to send to the GPU(s). On macOS it defaults to 1 to
+     * enable metal support, 0 to disable.
+     */
     num_gpu?: number;
+    /**
+     * Sets the number of threads to use during computation. By default, Ollama will
+     * detect this for optimal performance. It is recommended to set this value to the
+     * number of physical CPU cores your system has (as opposed to the logical number of cores).
+     */
     num_threads?: number;
+    /**
+     * Sets how far back for the model to look back to prevent repetition.
+     * (Default: 64, 0 = disabled, -1 = num_ctx)
+     */
     repeat_last_n?: number;
+    /**
+     * Sets how strongly to penalize repetitions. A higher value (e.g., 1.5)
+     * will penalize repetitions more strongly, while a lower value (e.g., 0.9)
+     * will be more lenient. (Default: 1.1)
+     */
     repeat_penalty?: number;
+    /**
+     * Sets the random number seed to use for generation. Setting this to a
+     * specific number will make the model generate the same text for the same prompt.
+     * (Default: 0)
+     */
     seed?: number;
+    /**
+     * Tail free sampling is used to reduce the impact of less probable tokens
+     * from the output. A higher value (e.g., 2.0) will reduce the impact more,
+     * while a value of 1.0 disables this setting. (default: 1)
+     */
     tfs_z?: number;
+    /**
+     * Reduces the probability of generating nonsense. A higher value (e.g. 100)
+     * will give more diverse answers, while a lower value (e.g. 10) will be more
+     *  conservative. (Default: 40)
+     */
     top_k?: number;
+    /**
+     * Works together with top-k. A higher value (e.g., 0.95) will lead to more
+     * diverse text, while a lower value (e.g., 0.5) will generate more focused
+     * and conservative text. (Default: 0.9)
+     */
     top_p?: number;
+    /**
+     * When set to true, no formatting will be applied to the prompt and no context
+     * will be returned.
+     */
+    raw?: boolean;
+    /**
+     * The format to return a response in. Currently the only accepted value is 'json'.
+     * Leave undefined to return a string.
+     */
+    format?: "json";
     system?: string;
     template?: string;
     context?: number[];

package/model-provider/ollama/OllamaTextGenerationModel.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 { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -69,6 +70,8 @@ export class OllamaTextGenerationModel extends AbstractModel {
             "system",
             "template",
             "context",
+            "format",
+            "raw",
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
@@ -114,7 +117,7 @@ const ollamaTextGenerationResponseSchema = z.object({
     eval_duration: z.number(),
     context: z.array(z.number()),
 });
-const ollamaTextStreamingResponseSchema = z.discriminatedUnion("done", [
+const ollamaTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("done", [
     z.object({
         done: z.literal(false),
         model: z.string(),
@@ -135,8 +138,8 @@ const ollamaTextStreamingResponseSchema = z.discriminatedUnion("done", [
         eval_duration: z.number(),
         context: z.array(z.number()),
     }),
-]);
-async function callOllamaTextGenerationAPI({ api = new OllamaApiConfiguration(), abortSignal, responseFormat, prompt, model, contextWindowSize, maxCompletionTokens, mirostat, mirostat_eta, mirostat_tau, num_gpu, num_gqa, num_threads, repeat_last_n, repeat_penalty, seed, stopSequences, temperature, tfs_z, top_k, top_p, system, template, context, }) {
+]));
+async function callOllamaTextGenerationAPI({ api = new OllamaApiConfiguration(), abortSignal, responseFormat, prompt, model, format, contextWindowSize, maxCompletionTokens, mirostat, mirostat_eta, mirostat_tau, num_gpu, num_gqa, num_threads, repeat_last_n, repeat_penalty, seed, stopSequences, temperature, tfs_z, top_k, top_p, system, template, context, raw, }) {
     return postJsonToApi({
         url: api.assembleUrl(`/api/generate`),
         headers: api.headers,
@@ -144,6 +147,7 @@ async function callOllamaTextGenerationAPI({ api = new OllamaApiConfiguration(),
             stream: responseFormat.stream,
             model,
             prompt,
+            format,
             options: {
                 mirostat,
                 mirostat_eta,
@@ -165,6 +169,7 @@ async function callOllamaTextGenerationAPI({ api = new OllamaApiConfiguration(),
             system,
             template,
             context,
+            raw,
         },
         failedResponseHandler: failedOllamaCallResponseHandler,
         successfulResponseHandler: responseFormat.handler,

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -9,11 +9,12 @@ const PromptFormatTextStreamingModel_js_1 = require("../../model-function/genera
 const TextPromptFormat_js_1 = require("../../model-function/generate-text/prompt-format/TextPromptFormat.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
-const parseJSON_js_1 = require("../../util/parseJSON.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 /**
  * @see https://platform.openai.com/docs/models/
  * @see https://openai.com/pricing
@@ -335,7 +336,7 @@ exports.OpenAITextResponseFormat = {
         handler: async ({ response }) => createOpenAITextFullDeltaIterableQueue(response.body),
     },
 };
-const textResponseStreamEventSchema = zod_1.z.object({
+const textResponseStreamEventSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     choices: zod_1.z.array(zod_1.z.object({
         text: zod_1.z.string(),
         finish_reason: zod_1.z
@@ -349,7 +350,7 @@ const textResponseStreamEventSchema = zod_1.z.object({
     model: zod_1.z.string(),
     system_fingerprint: zod_1.z.string().optional(),
     object: zod_1.z.literal("text_completion"),
-});
+}));
 async function createOpenAITextFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
     const streamDelta = [];
@@ -363,7 +364,10 @@ async function createOpenAITextFullDeltaIterableQueue(stream) {
                     queue.close();
                     return;
                 }
-                const eventData = (0, parseJSON_js_1.parseJsonWithZod)(data, textResponseStreamEventSchema);
+                const eventData = (0, parseJSON_js_1.parseJSON)({
+                    text: data,
+                    schema: textResponseStreamEventSchema,
+                });
                 for (let i = 0; i < eventData.choices.length; i++) {
                     const eventChoice = eventData.choices[i];
                     const delta = eventChoice.text;

package/model-provider/openai/OpenAICompletionModel.js

@@ -6,11 +6,12 @@ import { PromptFormatTextStreamingModel } from "../../model-function/generate-te
 import { mapChatPromptToTextFormat, mapInstructionPromptToTextFormat, } from "../../model-function/generate-text/prompt-format/TextPromptFormat.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
 import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
 /**
  * @see https://platform.openai.com/docs/models/
  * @see https://openai.com/pricing
@@ -328,7 +329,7 @@ export const OpenAITextResponseFormat = {
         handler: async ({ response }) => createOpenAITextFullDeltaIterableQueue(response.body),
     },
 };
-const textResponseStreamEventSchema = z.object({
+const textResponseStreamEventSchema = new ZodSchema(z.object({
     choices: z.array(z.object({
         text: z.string(),
         finish_reason: z
@@ -342,7 +343,7 @@ const textResponseStreamEventSchema = z.object({
     model: z.string(),
     system_fingerprint: z.string().optional(),
     object: z.literal("text_completion"),
-});
+}));
 async function createOpenAITextFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue();
     const streamDelta = [];
@@ -356,7 +357,10 @@ async function createOpenAITextFullDeltaIterableQueue(stream) {
                     queue.close();
                     return;
                 }
-                const eventData = parseJsonWithZod(data, textResponseStreamEventSchema);
+                const eventData = parseJSON({
+                    text: data,
+                    schema: textResponseStreamEventSchema,
+                });
                 for (let i = 0; i < eventData.choices.length; i++) {
                     const eventChoice = eventData.choices[i];
                     const delta = eventChoice.text;

package/model-provider/openai/OpenAIError.cjs

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedOpenAICallResponseHandler = exports.OpenAIError = exports.openAIErrorDataSchema = void 0;
 const zod_1 = require("zod");
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
-const parseJSON_js_1 = require("../../util/parseJSON.cjs");
-exports.openAIErrorDataSchema = zod_1.z.object({
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+exports.openAIErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.object({
         message: zod_1.z.string(),
         type: zod_1.z.string(),
         param: zod_1.z.any().nullable(),
         code: zod_1.z.string().nullable(),
     }),
-});
+}));
 class OpenAIError extends ApiCallError_js_1.ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message, }) {
         super({
@@ -38,7 +39,10 @@ const failedOpenAICallResponseHandler = async ({ response, url, requestBodyValue
     const responseBody = await response.text();
     // resilient parsing in case the response is not JSON or does not match the schema:
     try {
-        const parsedError = (0, parseJSON_js_1.parseJsonWithZod)(responseBody, exports.openAIErrorDataSchema);
+        const parsedError = (0, parseJSON_js_1.parseJSON)({
+            text: responseBody,
+            schema: exports.openAIErrorDataSchema,
+        });
         return new OpenAIError({
             url,
             requestBodyValues,

package/model-provider/openai/OpenAIError.d.ts

@@ -1,31 +1,7 @@
-import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
-export declare const openAIErrorDataSchema: z.ZodObject<{
-    error: z.ZodObject<{
-        message: z.ZodString;
-        type: z.ZodString;
-        param: z.ZodNullable<z.ZodAny>;
-        code: z.ZodNullable<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        message: string;
-        code: string | null;
-        type: string;
-        param?: any;
-    }, {
-        message: string;
-        code: string | null;
-        type: string;
-        param?: any;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    error: {
-        message: string;
-        code: string | null;
-        type: string;
-        param?: any;
-    };
-}, {
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export declare const openAIErrorDataSchema: ZodSchema<{
     error: {
         message: string;
         code: string | null;
@@ -33,7 +9,7 @@ export declare const openAIErrorDataSchema: z.ZodObject<{
         param?: any;
     };
 }>;
-export type OpenAIErrorData = z.infer<typeof openAIErrorDataSchema>;
+export type OpenAIErrorData = (typeof openAIErrorDataSchema)["_type"];
 export declare class OpenAIError extends ApiCallError {
     readonly data?: OpenAIErrorData;
     constructor({ data, statusCode, url, requestBodyValues, message, }: {

package/model-provider/openai/OpenAIError.js

@@ -1,14 +1,15 @@
 import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
-export const openAIErrorDataSchema = z.object({
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
+export const openAIErrorDataSchema = new ZodSchema(z.object({
     error: z.object({
         message: z.string(),
         type: z.string(),
         param: z.any().nullable(),
         code: z.string().nullable(),
     }),
-});
+}));
 export class OpenAIError extends ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message, }) {
         super({
@@ -34,7 +35,10 @@ export const failedOpenAICallResponseHandler = async ({ response, url, requestBo
     const responseBody = await response.text();
     // resilient parsing in case the response is not JSON or does not match the schema:
     try {
-        const parsedError = parseJsonWithZod(responseBody, openAIErrorDataSchema);
+        const parsedError = parseJSON({
+            text: responseBody,
+            schema: openAIErrorDataSchema,
+        });
         return new OpenAIError({
             url,
             requestBodyValues,

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

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { FunctionOptions } from "../../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../../core/api/postToApi.js";
-import { StructureDefinition } from "../../../core/structure/StructureDefinition.js";
+import { StructureDefinition } from "../../../core/schema/StructureDefinition.js";
 import { AbstractModel } from "../../../model-function/AbstractModel.js";
 import { Delta } from "../../../model-function/Delta.js";
 import { StructureGenerationModel } from "../../../model-function/generate-structure/StructureGenerationModel.js";

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

@@ -4,8 +4,9 @@ exports.createOpenAIChatDeltaIterableQueue = void 0;
 const zod_1 = require("zod");
 const AsyncQueue_js_1 = require("../../../util/AsyncQueue.cjs");
 const parseEventSourceStream_js_1 = require("../../../util/streaming/parseEventSourceStream.cjs");
-const parseJSON_js_1 = require("../../../util/parseJSON.cjs");
-const chatResponseStreamEventSchema = zod_1.z.object({
+const parseJSON_js_1 = require("../../../core/schema/parseJSON.cjs");
+const ZodSchema_js_1 = require("../../../core/schema/ZodSchema.cjs");
+const chatResponseStreamEventSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     id: zod_1.z.string(),
     choices: zod_1.z.array(zod_1.z.object({
         delta: zod_1.z.object({
@@ -34,7 +35,7 @@ const chatResponseStreamEventSchema = zod_1.z.object({
     model: zod_1.z.string(),
     system_fingerprint: zod_1.z.string().optional(),
     object: zod_1.z.literal("chat.completion.chunk"),
-});
+}));
 async function createOpenAIChatDeltaIterableQueue(stream, extractDeltaValue) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
     const streamDelta = [];
@@ -48,7 +49,10 @@ async function createOpenAIChatDeltaIterableQueue(stream, extractDeltaValue) {
                     queue.close();
                     return;
                 }
-                const parseResult = (0, parseJSON_js_1.safeParseJsonWithZod)(data, chatResponseStreamEventSchema);
+                const parseResult = (0, parseJSON_js_1.safeParseJSON)({
+                    text: data,
+                    schema: chatResponseStreamEventSchema,
+                });
                 if (!parseResult.success) {
                     queue.push({
                         type: "error",

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

@@ -1,8 +1,9 @@
 import { z } from "zod";
 import { AsyncQueue } from "../../../util/AsyncQueue.js";
 import { parseEventSourceStream } from "../../../util/streaming/parseEventSourceStream.js";
-import { safeParseJsonWithZod } from "../../../util/parseJSON.js";
-const chatResponseStreamEventSchema = z.object({
+import { safeParseJSON } from "../../../core/schema/parseJSON.js";
+import { ZodSchema } from "../../../core/schema/ZodSchema.js";
+const chatResponseStreamEventSchema = new ZodSchema(z.object({
     id: z.string(),
     choices: z.array(z.object({
         delta: z.object({
@@ -31,7 +32,7 @@ const chatResponseStreamEventSchema = z.object({
     model: z.string(),
     system_fingerprint: z.string().optional(),
     object: z.literal("chat.completion.chunk"),
-});
+}));
 export async function createOpenAIChatDeltaIterableQueue(stream, extractDeltaValue) {
     const queue = new AsyncQueue();
     const streamDelta = [];
@@ -45,7 +46,10 @@ export async function createOpenAIChatDeltaIterableQueue(stream, extractDeltaVal
                     queue.close();
                     return;
                 }
-                const parseResult = safeParseJsonWithZod(data, chatResponseStreamEventSchema);
+                const parseResult = safeParseJSON({
+                    text: data,
+                    schema: chatResponseStreamEventSchema,
+                });
                 if (!parseResult.success) {
                     queue.push({
                         type: "error",

package/model-provider/stability/StabilityError.cjs

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedStabilityCallResponseHandler = exports.StabilityError = exports.stabilityErrorDataSchema = void 0;
 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({
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+exports.stabilityErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     message: zod_1.z.string(),
-});
+}));
 class StabilityError extends ApiCallError_js_1.ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -22,7 +23,10 @@ class StabilityError extends ApiCallError_js_1.ApiCallError {
 exports.StabilityError = StabilityError;
 const failedStabilityCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = (0, parseJSON_js_1.parseJsonWithZod)(responseBody, exports.stabilityErrorDataSchema);
+    const parsedError = (0, parseJSON_js_1.parseJSON)({
+        text: responseBody,
+        schema: exports.stabilityErrorDataSchema,
+    });
     return new StabilityError({
         url,
         requestBodyValues,

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

@@ -1,14 +1,10 @@
-import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
-export declare const stabilityErrorDataSchema: z.ZodObject<{
-    message: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    message: string;
-}, {
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export declare const stabilityErrorDataSchema: ZodSchema<{
     message: string;
 }>;
-export type StabilityErrorData = z.infer<typeof stabilityErrorDataSchema>;
+export type StabilityErrorData = (typeof stabilityErrorDataSchema)["_type"];
 export declare class StabilityError extends ApiCallError {
     readonly data: StabilityErrorData;
     constructor({ data, statusCode, url, requestBodyValues, message, }: {

package/model-provider/stability/StabilityError.js

@@ -1,9 +1,10 @@
 import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
-export const stabilityErrorDataSchema = z.object({
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
+export const stabilityErrorDataSchema = new ZodSchema(z.object({
     message: z.string(),
-});
+}));
 export class StabilityError extends ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -18,7 +19,10 @@ export class StabilityError extends ApiCallError {
 }
 export const failedStabilityCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = parseJsonWithZod(responseBody, stabilityErrorDataSchema);
+    const parsedError = parseJSON({
+        text: responseBody,
+        schema: 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.66.1",
+  "version": "0.68.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/tool/Tool.d.ts

@@ -1,7 +1,7 @@
 import { FunctionOptions } from "../core/FunctionOptions.js";
-import { JsonSchemaProducer } from "../core/structure/JsonSchemaProducer.js";
-import { Schema } from "../core/structure/Schema.js";
-import { StructureDefinition } from "../core/structure/StructureDefinition.js";
+import { JsonSchemaProducer } from "../core/schema/JsonSchemaProducer.js";
+import { Schema } from "../core/schema/Schema.js";
+import { StructureDefinition } from "../core/schema/StructureDefinition.js";
 /**
  * A tool is a function with a name, description and defined inputs that can be used
  * by agents and chatbots.

package/tool/WebSearchTool.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSearchTool = void 0;
 const zod_1 = require("zod");
-const ZodSchema_js_1 = require("../core/structure/ZodSchema.cjs");
+const ZodSchema_js_1 = require("../core/schema/ZodSchema.cjs");
 const Tool_js_1 = require("./Tool.cjs");
 const OUTPUT_SCHEMA = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     results: zod_1.z.array(zod_1.z.object({

package/tool/WebSearchTool.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../core/FunctionOptions.js";
-import { ZodSchema } from "../core/structure/ZodSchema.js";
+import { ZodSchema } from "../core/schema/ZodSchema.js";
 import { Tool } from "./Tool.js";
 declare const OUTPUT_SCHEMA: ZodSchema<{
     results: {