modelfusion 0.67.0 → 0.68.1

package/model-provider/anthropic/AnthropicTextGenerationModel.js

@@ -5,7 +5,8 @@ import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStr
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
 import { AnthropicApiConfiguration } from "./AnthropicApiConfiguration.js";
 import { failedAnthropicCallResponseHandler } from "./AnthropicError.js";
 import { mapChatPromptToAnthropicFormat, mapInstructionPromptToAnthropicFormat, } from "./AnthropicPromptFormat.js";
@@ -154,11 +155,11 @@ async function callAnthropicTextGenerationAPI({ api = new AnthropicApiConfigurat
         abortSignal,
     });
 }
-const anthropicTextStreamingResponseSchema = z.object({
+const anthropicTextStreamingResponseSchema = new ZodSchema(z.object({
     completion: z.string(),
     stop_reason: z.string().nullable(),
     model: z.string(),
-});
+}));
 async function createAnthropicFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue();
     let content = "";
@@ -176,7 +177,10 @@ async function createAnthropicFullDeltaIterableQueue(stream) {
                     continue;
                 }
                 const data = event.data;
-                const eventData = parseJsonWithZod(data, anthropicTextStreamingResponseSchema);
+                const eventData = parseJSON({
+                    text: data,
+                    schema: anthropicTextStreamingResponseSchema,
+                });
                 content += eventData.completion;
                 queue.push({
                     type: "delta",

package/model-provider/automatic1111/Automatic1111Error.cjs

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedAutomatic1111CallResponseHandler = exports.Automatic1111Error = exports.automatic1111ErrorDataSchema = 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.automatic1111ErrorDataSchema = zod_1.z.object({
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+exports.automatic1111ErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.string(),
     detail: zod_1.z.string(),
     body: zod_1.z.string(),
     errors: zod_1.z.string(),
-});
+}));
 class Automatic1111Error extends ApiCallError_js_1.ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.detail, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -25,7 +26,10 @@ class Automatic1111Error extends ApiCallError_js_1.ApiCallError {
 exports.Automatic1111Error = Automatic1111Error;
 const failedAutomatic1111CallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = (0, parseJSON_js_1.parseJsonWithZod)(responseBody, exports.automatic1111ErrorDataSchema);
+    const parsedError = (0, parseJSON_js_1.parseJSON)({
+        text: responseBody,
+        schema: exports.automatic1111ErrorDataSchema,
+    });
     return new Automatic1111Error({
         url,
         requestBodyValues,

package/model-provider/automatic1111/Automatic1111Error.d.ts

@@ -1,23 +1,13 @@
-import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
-export declare const automatic1111ErrorDataSchema: z.ZodObject<{
-    error: z.ZodString;
-    detail: z.ZodString;
-    body: z.ZodString;
-    errors: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    error: string;
-    errors: string;
-    body: string;
-    detail: string;
-}, {
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export declare const automatic1111ErrorDataSchema: ZodSchema<{
     error: string;
     errors: string;
     body: string;
     detail: string;
 }>;
-export type Automatic1111ErrorData = z.infer<typeof automatic1111ErrorDataSchema>;
+export type Automatic1111ErrorData = (typeof automatic1111ErrorDataSchema)["_type"];
 export declare class Automatic1111Error extends ApiCallError {
     readonly data: Automatic1111ErrorData;
     constructor({ data, statusCode, url, requestBodyValues, message, }: {

package/model-provider/automatic1111/Automatic1111Error.js

@@ -1,12 +1,13 @@
 import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
-export const automatic1111ErrorDataSchema = z.object({
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
+export const automatic1111ErrorDataSchema = new ZodSchema(z.object({
     error: z.string(),
     detail: z.string(),
     body: z.string(),
     errors: z.string(),
-});
+}));
 export class Automatic1111Error extends ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.detail, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -21,7 +22,10 @@ export class Automatic1111Error extends ApiCallError {
 }
 export const failedAutomatic1111CallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = parseJsonWithZod(responseBody, automatic1111ErrorDataSchema);
+    const parsedError = parseJSON({
+        text: responseBody,
+        schema: automatic1111ErrorDataSchema,
+    });
     return new Automatic1111Error({
         url,
         requestBodyValues,

package/model-provider/cohere/CohereError.cjs

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

package/model-provider/cohere/CohereError.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 cohereErrorDataSchema: z.ZodObject<{
-    message: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    message: string;
-}, {
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export declare const cohereErrorDataSchema: ZodSchema<{
     message: string;
 }>;
-export type CohereErrorData = z.infer<typeof cohereErrorDataSchema>;
+export type CohereErrorData = (typeof cohereErrorDataSchema)["_type"];
 export declare class CohereError extends ApiCallError {
     readonly data: CohereErrorData;
     constructor({ data, statusCode, url, requestBodyValues, message, }: {

package/model-provider/cohere/CohereError.js

@@ -1,9 +1,10 @@
 import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
-export const cohereErrorDataSchema = z.object({
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
+export const cohereErrorDataSchema = new ZodSchema(z.object({
     message: z.string(),
-});
+}));
 export class CohereError extends ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -29,7 +30,10 @@ export const failedCohereCallResponseHandler = async ({ response, url, requestBo
             },
         });
     }
-    const parsedError = parseJsonWithZod(responseBody, cohereErrorDataSchema);
+    const parsedError = parseJSON({
+        text: responseBody,
+        schema: cohereErrorDataSchema,
+    });
     return new CohereError({
         url,
         requestBodyValues,

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -13,6 +13,7 @@ const parseJsonStream_js_1 = require("../../util/streaming/parseJsonStream.cjs")
 const CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereError_js_1 = require("./CohereError.cjs");
 const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 exports.COHERE_TEXT_GENERATION_MODELS = {
     command: {
         contextWindowSize: 2048,
@@ -202,7 +203,7 @@ async function callCohereTextGenerationAPI({ api = new CohereApiConfiguration_js
         abortSignal,
     });
 }
-const cohereTextStreamingResponseSchema = zod_1.z.discriminatedUnion("is_finished", [
+const cohereTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminatedUnion("is_finished", [
     zod_1.z.object({
         text: zod_1.z.string(),
         is_finished: zod_1.z.literal(false),
@@ -212,7 +213,7 @@ const cohereTextStreamingResponseSchema = zod_1.z.discriminatedUnion("is_finishe
         finish_reason: zod_1.z.string(),
         response: cohereTextGenerationResponseSchema,
     }),
-]);
+]));
 async function createCohereTextGenerationFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
     let accumulatedText = "";

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -10,6 +10,7 @@ import { parseJsonStream } from "../../util/streaming/parseJsonStream.js";
 import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
 export const COHERE_TEXT_GENERATION_MODELS = {
     command: {
         contextWindowSize: 2048,
@@ -198,7 +199,7 @@ async function callCohereTextGenerationAPI({ api = new CohereApiConfiguration(),
         abortSignal,
     });
 }
-const cohereTextStreamingResponseSchema = z.discriminatedUnion("is_finished", [
+const cohereTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("is_finished", [
     z.object({
         text: z.string(),
         is_finished: z.literal(false),
@@ -208,7 +209,7 @@ const cohereTextStreamingResponseSchema = z.discriminatedUnion("is_finished", [
         finish_reason: z.string(),
         response: cohereTextGenerationResponseSchema,
     }),
-]);
+]));
 async function createCohereTextGenerationFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue();
     let accumulatedText = "";

package/model-provider/elevenlabs/ElevenLabsSpeechModel.cjs

@@ -4,10 +4,11 @@ exports.ElevenLabsSpeechModel = void 0;
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
-const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const SimpleWebSocket_js_1 = require("../../util/SimpleWebSocket.cjs");
-const parseJSON_js_1 = require("../../util/parseJSON.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const ElevenLabsApiConfiguration_js_1 = require("./ElevenLabsApiConfiguration.cjs");
 const ElevenLabsError_js_1 = require("./ElevenLabsError.cjs");
 const elevenLabsModels = [
@@ -17,6 +18,27 @@ const elevenLabsModels = [
     "eleven_turbo_v2",
 ];
 const defaultModel = "eleven_monolingual_v1";
+const streamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.union([
+    zod_1.z.object({
+        audio: zod_1.z.string(),
+        isFinal: zod_1.z.literal(false).nullable(),
+        normalizedAlignment: zod_1.z
+            .object({
+            chars: zod_1.z.array(zod_1.z.string()),
+            charStartTimesMs: zod_1.z.array(zod_1.z.number()),
+            charDurationsMs: zod_1.z.array(zod_1.z.number()),
+        })
+            .nullable(),
+    }),
+    zod_1.z.object({
+        isFinal: zod_1.z.literal(true),
+    }),
+    zod_1.z.object({
+        message: zod_1.z.string(),
+        error: zod_1.z.string(),
+        code: zod_1.z.number(),
+    }),
+]));
 /**
  * Synthesize speech using the ElevenLabs Text to Speech API.
  *
@@ -65,27 +87,6 @@ class ElevenLabsSpeechModel extends AbstractModel_js_1.AbstractModel {
     async doGenerateSpeechStreamDuplex(textStream
     // options?: FunctionOptions | undefined
     ) {
-        const responseSchema = zod_1.z.union([
-            zod_1.z.object({
-                audio: zod_1.z.string(),
-                isFinal: zod_1.z.literal(false).nullable(),
-                normalizedAlignment: zod_1.z
-                    .object({
-                    chars: zod_1.z.array(zod_1.z.string()),
-                    charStartTimesMs: zod_1.z.array(zod_1.z.number()),
-                    charDurationsMs: zod_1.z.array(zod_1.z.number()),
-                })
-                    .nullable(),
-            }),
-            zod_1.z.object({
-                isFinal: zod_1.z.literal(true),
-            }),
-            zod_1.z.object({
-                message: zod_1.z.string(),
-                error: zod_1.z.string(),
-                code: zod_1.z.number(),
-            }),
-        ]);
         const queue = new AsyncQueue_js_1.AsyncQueue();
         const model = this.settings.model ?? defaultModel;
         const socket = await (0, SimpleWebSocket_js_1.createSimpleWebSocket)(`wss://api.elevenlabs.io/v1/text-to-speech/${this.settings.voice}/stream-input${assembleQuery({
@@ -132,7 +133,10 @@ class ElevenLabsSpeechModel extends AbstractModel_js_1.AbstractModel {
             socket.send(JSON.stringify({ text: "" }));
         };
         socket.onmessage = (event) => {
-            const parseResult = (0, parseJSON_js_1.safeParseJsonWithZod)(event.data, responseSchema);
+            const parseResult = (0, parseJSON_js_1.safeParseJSON)({
+                text: event.data,
+                schema: streamingResponseSchema,
+            });
             if (!parseResult.success) {
                 queue.push({ type: "error", error: parseResult.error });
                 return;

package/model-provider/elevenlabs/ElevenLabsSpeechModel.d.ts

@@ -3,7 +3,7 @@ import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { Delta } from "../../model-function/Delta.js";
-import { StreamingSpeechGenerationModel, SpeechGenerationModelSettings } from "../../model-function/generate-speech/SpeechGenerationModel.js";
+import { SpeechGenerationModelSettings, StreamingSpeechGenerationModel } from "../../model-function/generate-speech/SpeechGenerationModel.js";
 declare const elevenLabsModels: readonly ["eleven_multilingual_v2", "eleven_multilingual_v1", "eleven_monolingual_v1", "eleven_turbo_v2"];
 export interface ElevenLabsSpeechModelSettings extends SpeechGenerationModelSettings {
     api?: ApiConfiguration & {

package/model-provider/elevenlabs/ElevenLabsSpeechModel.js

@@ -1,10 +1,11 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createAudioMpegResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
-import { AsyncQueue } from "../../util/AsyncQueue.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { createSimpleWebSocket } from "../../util/SimpleWebSocket.js";
-import { safeParseJsonWithZod } from "../../util/parseJSON.js";
+import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { ElevenLabsApiConfiguration } from "./ElevenLabsApiConfiguration.js";
 import { failedElevenLabsCallResponseHandler } from "./ElevenLabsError.js";
 const elevenLabsModels = [
@@ -14,6 +15,27 @@ const elevenLabsModels = [
     "eleven_turbo_v2",
 ];
 const defaultModel = "eleven_monolingual_v1";
+const streamingResponseSchema = new ZodSchema(z.union([
+    z.object({
+        audio: z.string(),
+        isFinal: z.literal(false).nullable(),
+        normalizedAlignment: z
+            .object({
+            chars: z.array(z.string()),
+            charStartTimesMs: z.array(z.number()),
+            charDurationsMs: z.array(z.number()),
+        })
+            .nullable(),
+    }),
+    z.object({
+        isFinal: z.literal(true),
+    }),
+    z.object({
+        message: z.string(),
+        error: z.string(),
+        code: z.number(),
+    }),
+]));
 /**
  * Synthesize speech using the ElevenLabs Text to Speech API.
  *
@@ -62,27 +84,6 @@ export class ElevenLabsSpeechModel extends AbstractModel {
     async doGenerateSpeechStreamDuplex(textStream
     // options?: FunctionOptions | undefined
     ) {
-        const responseSchema = z.union([
-            z.object({
-                audio: z.string(),
-                isFinal: z.literal(false).nullable(),
-                normalizedAlignment: z
-                    .object({
-                    chars: z.array(z.string()),
-                    charStartTimesMs: z.array(z.number()),
-                    charDurationsMs: z.array(z.number()),
-                })
-                    .nullable(),
-            }),
-            z.object({
-                isFinal: z.literal(true),
-            }),
-            z.object({
-                message: z.string(),
-                error: z.string(),
-                code: z.number(),
-            }),
-        ]);
         const queue = new AsyncQueue();
         const model = this.settings.model ?? defaultModel;
         const socket = await createSimpleWebSocket(`wss://api.elevenlabs.io/v1/text-to-speech/${this.settings.voice}/stream-input${assembleQuery({
@@ -129,7 +130,10 @@ export class ElevenLabsSpeechModel extends AbstractModel {
             socket.send(JSON.stringify({ text: "" }));
         };
         socket.onmessage = (event) => {
-            const parseResult = safeParseJsonWithZod(event.data, responseSchema);
+            const parseResult = safeParseJSON({
+                text: event.data,
+                schema: streamingResponseSchema,
+            });
             if (!parseResult.success) {
                 queue.push({ type: "error", error: parseResult.error });
                 return;

package/model-provider/huggingface/HuggingFaceError.cjs

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedHuggingFaceCallResponseHandler = exports.HuggingFaceError = exports.huggingFaceErrorDataSchema = 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.huggingFaceErrorDataSchema = zod_1.z.object({
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+exports.huggingFaceErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()),
-});
+}));
 class HuggingFaceError extends ApiCallError_js_1.ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = typeof data.error === "string"
         ? data.error
@@ -26,6 +27,9 @@ const failedHuggingFaceCallResponseHandler = async ({ response, url, requestBody
     url,
     requestBodyValues,
     statusCode: response.status,
-    data: (0, parseJSON_js_1.parseJsonWithZod)(await response.text(), exports.huggingFaceErrorDataSchema),
+    data: (0, parseJSON_js_1.parseJSON)({
+        text: await response.text(),
+        schema: exports.huggingFaceErrorDataSchema,
+    }),
 });
 exports.failedHuggingFaceCallResponseHandler = failedHuggingFaceCallResponseHandler;

package/model-provider/huggingface/HuggingFaceError.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 huggingFaceErrorDataSchema: z.ZodObject<{
-    error: z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString]>;
-}, "strip", z.ZodTypeAny, {
-    error: (string | string[]) & (string | string[] | undefined);
-}, {
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export declare const huggingFaceErrorDataSchema: ZodSchema<{
     error: (string | string[]) & (string | string[] | undefined);
 }>;
-export type HuggingFaceErrorData = z.infer<typeof huggingFaceErrorDataSchema>;
+export type HuggingFaceErrorData = (typeof huggingFaceErrorDataSchema)["_type"];
 export declare class HuggingFaceError extends ApiCallError {
     readonly data: HuggingFaceErrorData;
     constructor({ data, statusCode, url, requestBodyValues, message, }: {

package/model-provider/huggingface/HuggingFaceError.js

@@ -1,9 +1,10 @@
 import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
-export const huggingFaceErrorDataSchema = z.object({
+import { parseJSON } from "../../core/schema/parseJSON.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export const huggingFaceErrorDataSchema = new ZodSchema(z.object({
     error: z.array(z.string()).or(z.string()),
-});
+}));
 export class HuggingFaceError extends ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = typeof data.error === "string"
         ? data.error
@@ -22,5 +23,8 @@ export const failedHuggingFaceCallResponseHandler = async ({ response, url, requ
     url,
     requestBodyValues,
     statusCode: response.status,
-    data: parseJsonWithZod(await response.text(), huggingFaceErrorDataSchema),
+    data: parseJSON({
+        text: await response.text(),
+        schema: huggingFaceErrorDataSchema,
+    }),
 });

package/model-provider/llamacpp/LlamaCppError.cjs

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedLlamaCppCallResponseHandler = exports.LlamaCppError = exports.llamaCppErrorDataSchema = 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.llamaCppErrorDataSchema = zod_1.z.object({
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+exports.llamaCppErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.string(),
-});
+}));
 class LlamaCppError extends ApiCallError_js_1.ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.error, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -24,6 +25,9 @@ const failedLlamaCppCallResponseHandler = async ({ response, url, requestBodyVal
     url,
     requestBodyValues,
     statusCode: response.status,
-    data: (0, parseJSON_js_1.parseJsonWithZod)(await response.text(), exports.llamaCppErrorDataSchema),
+    data: (0, parseJSON_js_1.parseJSON)({
+        text: await response.text(),
+        schema: exports.llamaCppErrorDataSchema,
+    }),
 });
 exports.failedLlamaCppCallResponseHandler = failedLlamaCppCallResponseHandler;

package/model-provider/llamacpp/LlamaCppError.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 llamaCppErrorDataSchema: z.ZodObject<{
-    error: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    error: string;
-}, {
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export declare const llamaCppErrorDataSchema: ZodSchema<{
     error: string;
 }>;
-export type LlamaCppErrorData = z.infer<typeof llamaCppErrorDataSchema>;
+export type LlamaCppErrorData = (typeof llamaCppErrorDataSchema)["_type"];
 export declare class LlamaCppError extends ApiCallError {
     readonly data: LlamaCppErrorData;
     constructor({ data, statusCode, url, requestBodyValues, message, }: {

package/model-provider/llamacpp/LlamaCppError.js

@@ -1,9 +1,10 @@
 import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
-export const llamaCppErrorDataSchema = z.object({
+import { parseJSON } from "../../core/schema/parseJSON.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export const llamaCppErrorDataSchema = new ZodSchema(z.object({
     error: z.string(),
-});
+}));
 export class LlamaCppError extends ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.error, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -20,5 +21,8 @@ export const failedLlamaCppCallResponseHandler = async ({ response, url, request
     url,
     requestBodyValues,
     statusCode: response.status,
-    data: parseJsonWithZod(await response.text(), llamaCppErrorDataSchema),
+    data: parseJSON({
+        text: await response.text(),
+        schema: llamaCppErrorDataSchema,
+    }),
 });

package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs

@@ -4,11 +4,12 @@ exports.LlamaCppTextGenerationResponseFormat = exports.LlamaCppTextGenerationMod
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
-const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
-const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.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 parseJSON_js_1 = require("../../util/parseJSON.cjs");
+const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
 const LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");
@@ -172,13 +173,13 @@ const llamaCppTextGenerationResponseSchema = zod_1.z.object({
     tokens_predicted: zod_1.z.number(),
     truncated: zod_1.z.boolean(),
 });
-const llamaCppTextStreamingResponseSchema = zod_1.z.discriminatedUnion("stop", [
+const llamaCppTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminatedUnion("stop", [
     zod_1.z.object({
         content: zod_1.z.string(),
         stop: zod_1.z.literal(false),
     }),
     llamaCppTextGenerationResponseSchema,
-]);
+]));
 async function callLlamaCppTextGenerationAPI({ api = new LlamaCppApiConfiguration_js_1.LlamaCppApiConfiguration(), abortSignal, responseFormat, prompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
     return (0, postToApi_js_1.postJsonToApi)({
         url: api.assembleUrl(`/completion`),
@@ -224,7 +225,10 @@ async function createLlamaCppFullDeltaIterableQueue(stream) {
         try {
             for await (const event of events) {
                 const data = event.data;
-                const eventData = (0, parseJSON_js_1.parseJsonWithZod)(data, llamaCppTextStreamingResponseSchema);
+                const eventData = (0, parseJSON_js_1.parseJSON)({
+                    text: data,
+                    schema: llamaCppTextStreamingResponseSchema,
+                });
                 content += eventData.content;
                 queue.push({
                     type: "delta",