modelfusion 0.47.1 → 0.47.3

package/model-provider/llamacpp/LlamaCppError.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.failedLlamaCppCallResponseHandler = exports.LlamaCppError = exports.llamaCppErrorDataSchema = 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.llamaCppErrorDataSchema = zod_1.z.object({
     error: zod_1.z.string(),
 });
@@ -23,30 +20,10 @@ class LlamaCppError extends ApiCallError_js_1.ApiCallError {
     }
 }
 exports.LlamaCppError = LlamaCppError;
-const failedLlamaCppCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    try {
-        const parsedError = exports.llamaCppErrorDataSchema.parse(secure_json_parse_1.default.parse(responseBody));
-        return new LlamaCppError({
-            url,
-            requestBodyValues,
-            statusCode: response.status,
-            data: parsedError,
-        });
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            if (error.name === "AbortError" || error instanceof ApiCallError_js_1.ApiCallError) {
-                throw error;
-            }
-        }
-        throw new ApiCallError_js_1.ApiCallError({
-            message: responseBody,
-            cause: error,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-};
+const failedLlamaCppCallResponseHandler = async ({ response, url, requestBodyValues }) => new LlamaCppError({
+    url,
+    requestBodyValues,
+    statusCode: response.status,
+    data: (0, parseJSON_js_1.parseJsonWithZod)(await response.text(), exports.llamaCppErrorDataSchema),
+});
 exports.failedLlamaCppCallResponseHandler = failedLlamaCppCallResponseHandler;

package/model-provider/llamacpp/LlamaCppError.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 llamaCppErrorDataSchema = z.object({
     error: z.string(),
 });
@@ -16,29 +16,9 @@ export class LlamaCppError extends ApiCallError {
         this.data = data;
     }
 }
-export const failedLlamaCppCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    try {
-        const parsedError = llamaCppErrorDataSchema.parse(SecureJSON.parse(responseBody));
-        return new LlamaCppError({
-            url,
-            requestBodyValues,
-            statusCode: response.status,
-            data: parsedError,
-        });
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            if (error.name === "AbortError" || error instanceof ApiCallError) {
-                throw error;
-            }
-        }
-        throw new ApiCallError({
-            message: responseBody,
-            cause: error,
-            statusCode: response.status,
-            url,
-            requestBodyValues,
-        });
-    }
-};
+export const failedLlamaCppCallResponseHandler = async ({ response, url, requestBodyValues }) => new LlamaCppError({
+    url,
+    requestBodyValues,
+    statusCode: response.status,
+    data: parseJsonWithZod(await response.text(), llamaCppErrorDataSchema),
+});

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.cjs

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppTextEmbeddingModel = void 0;
-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");
@@ -84,8 +81,8 @@ class LlamaCppTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.LlamaCppTextEmbeddingModel = LlamaCppTextEmbeddingModel;
-const llamaCppTextEmbeddingResponseSchema = zod_1.default.object({
-    embedding: zod_1.default.array(zod_1.default.number()),
+const llamaCppTextEmbeddingResponseSchema = zod_1.z.object({
+    embedding: zod_1.z.array(zod_1.z.number()),
 });
 async function callLlamaCppEmbeddingAPI({ api = new LlamaCppApiConfiguration_js_1.LlamaCppApiConfiguration(), abortSignal, content, }) {
     return (0, postToApi_js_1.postJsonToApi)({

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.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 { AbstractModel } from "../../model-function/AbstractModel.js";

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.js

@@ -1,4 +1,4 @@
-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";

package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppTextGenerationResponseFormat = exports.LlamaCppTextGenerationModel = 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 AsyncQueue_js_1 = require("../../event-source/AsyncQueue.cjs");
 const parseEventSourceStream_js_1 = require("../../event-source/parseEventSourceStream.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 LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");
@@ -118,59 +115,59 @@ class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.LlamaCppTextGenerationModel = LlamaCppTextGenerationModel;
-const llamaCppTextGenerationResponseSchema = zod_1.default.object({
-    content: zod_1.default.string(),
-    stop: zod_1.default.literal(true),
-    generation_settings: zod_1.default.object({
-        frequency_penalty: zod_1.default.number(),
-        ignore_eos: zod_1.default.boolean(),
-        logit_bias: zod_1.default.array(zod_1.default.number()),
-        mirostat: zod_1.default.number(),
-        mirostat_eta: zod_1.default.number(),
-        mirostat_tau: zod_1.default.number(),
-        model: zod_1.default.string(),
-        n_ctx: zod_1.default.number(),
-        n_keep: zod_1.default.number(),
-        n_predict: zod_1.default.number(),
-        n_probs: zod_1.default.number(),
-        penalize_nl: zod_1.default.boolean(),
-        presence_penalty: zod_1.default.number(),
-        repeat_last_n: zod_1.default.number(),
-        repeat_penalty: zod_1.default.number(),
-        seed: zod_1.default.number(),
-        stop: zod_1.default.array(zod_1.default.string()),
-        stream: zod_1.default.boolean(),
-        temp: zod_1.default.number(),
-        tfs_z: zod_1.default.number(),
-        top_k: zod_1.default.number(),
-        top_p: zod_1.default.number(),
-        typical_p: zod_1.default.number(),
+const llamaCppTextGenerationResponseSchema = zod_1.z.object({
+    content: zod_1.z.string(),
+    stop: zod_1.z.literal(true),
+    generation_settings: zod_1.z.object({
+        frequency_penalty: zod_1.z.number(),
+        ignore_eos: zod_1.z.boolean(),
+        logit_bias: zod_1.z.array(zod_1.z.number()),
+        mirostat: zod_1.z.number(),
+        mirostat_eta: zod_1.z.number(),
+        mirostat_tau: zod_1.z.number(),
+        model: zod_1.z.string(),
+        n_ctx: zod_1.z.number(),
+        n_keep: zod_1.z.number(),
+        n_predict: zod_1.z.number(),
+        n_probs: zod_1.z.number(),
+        penalize_nl: zod_1.z.boolean(),
+        presence_penalty: zod_1.z.number(),
+        repeat_last_n: zod_1.z.number(),
+        repeat_penalty: zod_1.z.number(),
+        seed: zod_1.z.number(),
+        stop: zod_1.z.array(zod_1.z.string()),
+        stream: zod_1.z.boolean(),
+        temp: zod_1.z.number(),
+        tfs_z: zod_1.z.number(),
+        top_k: zod_1.z.number(),
+        top_p: zod_1.z.number(),
+        typical_p: zod_1.z.number(),
     }),
-    model: zod_1.default.string(),
-    prompt: zod_1.default.string(),
-    stopped_eos: zod_1.default.boolean(),
-    stopped_limit: zod_1.default.boolean(),
-    stopped_word: zod_1.default.boolean(),
-    stopping_word: zod_1.default.string(),
-    timings: zod_1.default.object({
-        predicted_ms: zod_1.default.number(),
-        predicted_n: zod_1.default.number(),
-        predicted_per_second: zod_1.default.number().nullable(),
-        predicted_per_token_ms: zod_1.default.number().nullable(),
-        prompt_ms: zod_1.default.number().nullable(),
-        prompt_n: zod_1.default.number(),
-        prompt_per_second: zod_1.default.number().nullable(),
-        prompt_per_token_ms: zod_1.default.number().nullable(),
+    model: zod_1.z.string(),
+    prompt: zod_1.z.string(),
+    stopped_eos: zod_1.z.boolean(),
+    stopped_limit: zod_1.z.boolean(),
+    stopped_word: zod_1.z.boolean(),
+    stopping_word: zod_1.z.string(),
+    timings: zod_1.z.object({
+        predicted_ms: zod_1.z.number(),
+        predicted_n: zod_1.z.number(),
+        predicted_per_second: zod_1.z.number().nullable(),
+        predicted_per_token_ms: zod_1.z.number().nullable(),
+        prompt_ms: zod_1.z.number().nullable(),
+        prompt_n: zod_1.z.number(),
+        prompt_per_second: zod_1.z.number().nullable(),
+        prompt_per_token_ms: zod_1.z.number().nullable(),
     }),
-    tokens_cached: zod_1.default.number(),
-    tokens_evaluated: zod_1.default.number(),
-    tokens_predicted: zod_1.default.number(),
-    truncated: zod_1.default.boolean(),
+    tokens_cached: zod_1.z.number(),
+    tokens_evaluated: zod_1.z.number(),
+    tokens_predicted: zod_1.z.number(),
+    truncated: zod_1.z.boolean(),
 });
-const llamaCppTextStreamingResponseSchema = zod_1.default.discriminatedUnion("stop", [
-    zod_1.default.object({
-        content: zod_1.default.string(),
-        stop: zod_1.default.literal(false),
+const llamaCppTextStreamingResponseSchema = zod_1.z.discriminatedUnion("stop", [
+    zod_1.z.object({
+        content: zod_1.z.string(),
+        stop: zod_1.z.literal(false),
     }),
     llamaCppTextGenerationResponseSchema,
 ]);
@@ -213,17 +210,7 @@ async function createLlamaCppFullDeltaIterableQueue(stream) {
         try {
             for await (const event of events) {
                 const data = event.data;
-                const json = secure_json_parse_1.default.parse(data);
-                const parseResult = llamaCppTextStreamingResponseSchema.safeParse(json);
-                if (!parseResult.success) {
-                    queue.push({
-                        type: "error",
-                        error: parseResult.error,
-                    });
-                    queue.close();
-                    return;
-                }
-                const eventData = parseResult.data;
+                const eventData = (0, parseJSON_js_1.parseJsonWithZod)(data, llamaCppTextStreamingResponseSchema);
                 content += eventData.content;
                 queue.push({
                     type: "delta",

package/model-provider/llamacpp/LlamaCppTextGenerationModel.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/llamacpp/LlamaCppTextGenerationModel.js

@@ -1,11 +1,11 @@
-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 { AsyncQueue } from "../../event-source/AsyncQueue.js";
 import { parseEventSourceStream } from "../../event-source/parseEventSourceStream.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
+import { parseJsonWithZod } from "../../util/parseJSON.js";
 import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
 import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
@@ -206,17 +206,7 @@ async function createLlamaCppFullDeltaIterableQueue(stream) {
         try {
             for await (const event of events) {
                 const data = event.data;
-                const json = SecureJSON.parse(data);
-                const parseResult = llamaCppTextStreamingResponseSchema.safeParse(json);
-                if (!parseResult.success) {
-                    queue.push({
-                        type: "error",
-                        error: parseResult.error,
-                    });
-                    queue.close();
-                    return;
-                }
-                const eventData = parseResult.data;
+                const eventData = parseJsonWithZod(data, llamaCppTextStreamingResponseSchema);
                 content += eventData.content;
                 queue.push({
                     type: "delta",

package/model-provider/llamacpp/LlamaCppTokenizer.cjs

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LlamaCppTokenizer = void 0;
-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 LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
@@ -49,8 +46,8 @@ class LlamaCppTokenizer {
     }
 }
 exports.LlamaCppTokenizer = LlamaCppTokenizer;
-const llamaCppTokenizationResponseSchema = zod_1.default.object({
-    tokens: zod_1.default.array(zod_1.default.number()),
+const llamaCppTokenizationResponseSchema = zod_1.z.object({
+    tokens: zod_1.z.array(zod_1.z.number()),
 });
 async function callLlamaCppTokenizeAPI({ api, abortSignal, text, }) {
     return (0, postToApi_js_1.postJsonToApi)({

package/model-provider/llamacpp/LlamaCppTokenizer.d.ts

@@ -1,4 +1,4 @@
-import z from "zod";
+import { z } from "zod";
 import { Run } from "../../core/Run.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { BasicTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";

package/model-provider/llamacpp/LlamaCppTokenizer.js

@@ -1,4 +1,4 @@
-import z from "zod";
+import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";

package/model-provider/openai/OpenAIError.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.failedOpenAICallResponseHandler = exports.OpenAIError = exports.openAIErrorDataSchema = 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.openAIErrorDataSchema = zod_1.z.object({
     error: zod_1.z.object({
         message: zod_1.z.string(),
@@ -41,7 +38,7 @@ 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 = exports.openAIErrorDataSchema.parse(secure_json_parse_1.default.parse(responseBody));
+        const parsedError = (0, parseJSON_js_1.parseJsonWithZod)(responseBody, exports.openAIErrorDataSchema);
         return new OpenAIError({
             url,
             requestBodyValues,

package/model-provider/openai/OpenAIError.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 openAIErrorDataSchema = z.object({
     error: z.object({
         message: z.string(),
@@ -34,7 +34,7 @@ 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 = openAIErrorDataSchema.parse(SecureJSON.parse(responseBody));
+        const parsedError = parseJsonWithZod(responseBody, openAIErrorDataSchema);
         return new OpenAIError({
             url,
             requestBodyValues,

package/model-provider/openai/OpenAITextEmbeddingModel.cjs

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAITextEmbeddingModel = exports.calculateOpenAIEmbeddingCostInMillicents = exports.isOpenAIEmbeddingModel = exports.OPENAI_TEXT_EMBEDDING_MODELS = void 0;
-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");
@@ -122,17 +119,17 @@ class OpenAITextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.OpenAITextEmbeddingModel = OpenAITextEmbeddingModel;
-const openAITextEmbeddingResponseSchema = zod_1.default.object({
-    object: zod_1.default.literal("list"),
-    data: zod_1.default.array(zod_1.default.object({
-        object: zod_1.default.literal("embedding"),
-        embedding: zod_1.default.array(zod_1.default.number()),
-        index: zod_1.default.number(),
+const openAITextEmbeddingResponseSchema = zod_1.z.object({
+    object: zod_1.z.literal("list"),
+    data: zod_1.z.array(zod_1.z.object({
+        object: zod_1.z.literal("embedding"),
+        embedding: zod_1.z.array(zod_1.z.number()),
+        index: zod_1.z.number(),
     })),
-    model: zod_1.default.string(),
-    usage: zod_1.default.object({
-        prompt_tokens: zod_1.default.number(),
-        total_tokens: zod_1.default.number(),
+    model: zod_1.z.string(),
+    usage: zod_1.z.object({
+        prompt_tokens: zod_1.z.number(),
+        total_tokens: zod_1.z.number(),
     }),
 });
 async function callOpenAITextEmbeddingAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, model, input, user, }) {

package/model-provider/openai/OpenAITextEmbeddingModel.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 { AbstractModel } from "../../model-function/AbstractModel.js";

package/model-provider/openai/OpenAITextEmbeddingModel.js

@@ -1,4 +1,4 @@
-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";

package/model-provider/openai/OpenAITextGenerationModel.cjs

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAITextResponseFormat = exports.OpenAITextGenerationModel = exports.calculateOpenAITextGenerationCostInMillicents = exports.isOpenAITextGenerationModel = exports.getOpenAITextGenerationModelInformation = exports.OPENAI_TEXT_GENERATION_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 AsyncQueue_js_1 = require("../../event-source/AsyncQueue.cjs");
@@ -14,6 +10,7 @@ const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const TextPromptFormat_js_1 = require("../../model-function/generate-text/TextPromptFormat.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
+const parseJSON_js_1 = require("../../util/parseJSON.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");
@@ -267,21 +264,21 @@ class OpenAITextGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.OpenAITextGenerationModel = OpenAITextGenerationModel;
-const openAITextGenerationResponseSchema = zod_1.default.object({
-    id: zod_1.default.string(),
-    object: zod_1.default.literal("text_completion"),
-    created: zod_1.default.number(),
-    model: zod_1.default.string(),
-    choices: zod_1.default.array(zod_1.default.object({
-        text: zod_1.default.string(),
-        index: zod_1.default.number(),
-        logprobs: zod_1.default.nullable(zod_1.default.any()),
-        finish_reason: zod_1.default.string(),
+const openAITextGenerationResponseSchema = zod_1.z.object({
+    id: zod_1.z.string(),
+    object: zod_1.z.literal("text_completion"),
+    created: zod_1.z.number(),
+    model: zod_1.z.string(),
+    choices: zod_1.z.array(zod_1.z.object({
+        text: zod_1.z.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 callOpenAITextGenerationAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, responseFormat, model, prompt, suffix, maxTokens, temperature, topP, n, logprobs, echo, stop, presencePenalty, frequencyPenalty, bestOf, logitBias, user, }) {
@@ -332,16 +329,16 @@ exports.OpenAITextResponseFormat = {
         handler: async ({ response }) => createOpenAITextFullDeltaIterableQueue(response.body),
     },
 };
-const textResponseStreamEventSchema = zod_1.default.object({
-    choices: zod_1.default.array(zod_1.default.object({
-        text: zod_1.default.string(),
-        finish_reason: zod_1.default.enum(["stop", "length"]).nullable(),
-        index: zod_1.default.number(),
+const textResponseStreamEventSchema = zod_1.z.object({
+    choices: zod_1.z.array(zod_1.z.object({
+        text: zod_1.z.string(),
+        finish_reason: zod_1.z.enum(["stop", "length"]).nullable(),
+        index: zod_1.z.number(),
     })),
-    created: zod_1.default.number(),
-    id: zod_1.default.string(),
-    model: zod_1.default.string(),
-    object: zod_1.default.string(),
+    created: zod_1.z.number(),
+    id: zod_1.z.string(),
+    model: zod_1.z.string(),
+    object: zod_1.z.string(),
 });
 async function createOpenAITextFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
@@ -356,17 +353,7 @@ async function createOpenAITextFullDeltaIterableQueue(stream) {
                     queue.close();
                     return;
                 }
-                const json = secure_json_parse_1.default.parse(data);
-                const parseResult = textResponseStreamEventSchema.safeParse(json);
-                if (!parseResult.success) {
-                    queue.push({
-                        type: "error",
-                        error: parseResult.error,
-                    });
-                    queue.close();
-                    return;
-                }
-                const eventData = parseResult.data;
+                const eventData = (0, parseJSON_js_1.parseJsonWithZod)(data, textResponseStreamEventSchema);
                 for (let i = 0; i < eventData.choices.length; i++) {
                     const eventChoice = eventData.choices[i];
                     const delta = eventChoice.text;

package/model-provider/openai/OpenAITextGenerationModel.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/OpenAITextGenerationModel.js

@@ -1,5 +1,4 @@
-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 { AsyncQueue } from "../../event-source/AsyncQueue.js";
@@ -8,6 +7,7 @@ import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { mapChatPromptToTextFormat, mapInstructionPromptToTextFormat, } from "../../model-function/generate-text/TextPromptFormat.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
+import { parseJsonWithZod } from "../../util/parseJSON.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
@@ -346,17 +346,7 @@ async function createOpenAITextFullDeltaIterableQueue(stream) {
                     queue.close();
                     return;
                 }
-                const json = SecureJSON.parse(data);
-                const parseResult = textResponseStreamEventSchema.safeParse(json);
-                if (!parseResult.success) {
-                    queue.push({
-                        type: "error",
-                        error: parseResult.error,
-                    });
-                    queue.close();
-                    return;
-                }
-                const eventData = parseResult.data;
+                const eventData = parseJsonWithZod(data, textResponseStreamEventSchema);
                 for (let i = 0; i < eventData.choices.length; i++) {
                     const eventChoice = eventData.choices[i];
                     const delta = eventChoice.text;