modelfusion 0.47.0 → 0.47.2

package/model-provider/automatic1111/Automatic1111Error.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.failedAutomatic1111CallResponseHandler = exports.Automatic1111Error = exports.automatic1111ErrorDataSchema = void 0;
 const zod_1 = require("zod");
-const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
+const parseJSON_js_1 = require("../../util/parseJSON.cjs");
 exports.automatic1111ErrorDataSchema = zod_1.z.object({
     error: zod_1.z.string(),
     detail: zod_1.z.string(),
@@ -28,7 +25,7 @@ class Automatic1111Error extends ApiCallError_js_1.ApiCallError {
 exports.Automatic1111Error = Automatic1111Error;
 const failedAutomatic1111CallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = exports.automatic1111ErrorDataSchema.parse(secure_json_parse_1.default.parse(responseBody));
+    const parsedError = (0, parseJSON_js_1.parseJsonWithZod)(responseBody, exports.automatic1111ErrorDataSchema);
     return new Automatic1111Error({
         url,
         requestBodyValues,

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

@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { ResponseHandler } from "../../core/api/postToApi.js";
 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;

package/model-provider/automatic1111/Automatic1111Error.js

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

package/model-provider/cohere/CohereError.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.failedCohereCallResponseHandler = exports.CohereError = exports.cohereErrorDataSchema = 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.cohereErrorDataSchema = zod_1.z.object({
     message: zod_1.z.string(),
 });
@@ -36,7 +33,7 @@ const failedCohereCallResponseHandler = async ({ response, url, requestBodyValue
             },
         });
     }
-    const parsedError = exports.cohereErrorDataSchema.parse(secure_json_parse_1.default.parse(responseBody));
+    const parsedError = (0, parseJSON_js_1.parseJsonWithZod)(responseBody, exports.cohereErrorDataSchema);
     return new CohereError({
         url,
         requestBodyValues,

package/model-provider/cohere/CohereError.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 cohereErrorDataSchema = z.object({
     message: z.string(),
 });
@@ -29,7 +29,7 @@ export const failedCohereCallResponseHandler = async ({ response, url, requestBo
             },
         });
     }
-    const parsedError = cohereErrorDataSchema.parse(SecureJSON.parse(responseBody));
+    const parsedError = parseJsonWithZod(responseBody, cohereErrorDataSchema);
     return new CohereError({
         url,
         requestBodyValues,

package/model-provider/cohere/CohereTextEmbeddingModel.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.CohereTextEmbeddingModel = exports.COHERE_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");
@@ -124,13 +121,13 @@ class CohereTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.CohereTextEmbeddingModel = CohereTextEmbeddingModel;
-const cohereTextEmbeddingResponseSchema = zod_1.default.object({
-    id: zod_1.default.string(),
-    texts: zod_1.default.array(zod_1.default.string()),
-    embeddings: zod_1.default.array(zod_1.default.array(zod_1.default.number())),
-    meta: zod_1.default.object({
-        api_version: zod_1.default.object({
-            version: zod_1.default.string(),
+const cohereTextEmbeddingResponseSchema = zod_1.z.object({
+    id: zod_1.z.string(),
+    texts: zod_1.z.array(zod_1.z.string()),
+    embeddings: zod_1.z.array(zod_1.z.array(zod_1.z.number())),
+    meta: zod_1.z.object({
+        api_version: zod_1.z.object({
+            version: zod_1.z.string(),
         }),
     }),
 });

package/model-provider/cohere/CohereTextEmbeddingModel.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/cohere/CohereTextEmbeddingModel.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/cohere/CohereTextGenerationModel.cjs

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CohereTextGenerationResponseFormat = exports.CohereTextGenerationModel = exports.COHERE_TEXT_GENERATION_MODELS = void 0;
-const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
@@ -13,6 +9,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 CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereError_js_1 = require("./CohereError.cjs");
 const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");
@@ -220,7 +217,7 @@ async function createCohereTextGenerationFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
     let accumulatedText = "";
     function processLine(line) {
-        const event = cohereTextStreamingResponseSchema.parse(secure_json_parse_1.default.parse(line));
+        const event = (0, parseJSON_js_1.parseJsonWithZod)(line, cohereTextStreamingResponseSchema);
         if (event.is_finished === true) {
             queue.push({
                 type: "delta",
@@ -247,25 +244,29 @@ async function createCohereTextGenerationFullDeltaIterableQueue(stream) {
     }
     // process the stream asynchonously (no 'await' on purpose):
     (async () => {
-        let unprocessedText = "";
-        const reader = new ReadableStreamDefaultReader(stream);
-        const utf8Decoder = new TextDecoder("utf-8");
-        // eslint-disable-next-line no-constant-condition
-        while (true) {
-            const { value: chunk, done } = await reader.read();
-            if (done) {
-                break;
+        try {
+            let unprocessedText = "";
+            const reader = new ReadableStreamDefaultReader(stream);
+            const utf8Decoder = new TextDecoder("utf-8");
+            // eslint-disable-next-line no-constant-condition
+            while (true) {
+                const { value: chunk, done } = await reader.read();
+                if (done) {
+                    break;
+                }
+                unprocessedText += utf8Decoder.decode(chunk, { stream: true });
+                const processableLines = unprocessedText.split(/\r\n|\n|\r/g);
+                unprocessedText = processableLines.pop() || "";
+                processableLines.forEach(processLine);
+            }
+            // processing remaining text:
+            if (unprocessedText) {
+                processLine(unprocessedText);
             }
-            unprocessedText += utf8Decoder.decode(chunk, { stream: true });
-            const processableLines = unprocessedText.split(/\r\n|\n|\r/g);
-            unprocessedText = processableLines.pop() || "";
-            processableLines.forEach(processLine);
         }
-        // processing remaining text:
-        if (unprocessedText) {
-            processLine(unprocessedText);
+        finally {
+            queue.close();
         }
-        queue.close();
     })();
     return queue;
 }

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -1,4 +1,3 @@
-import SecureJSON from "secure-json-parse";
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
@@ -7,6 +6,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 { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
@@ -213,7 +213,7 @@ async function createCohereTextGenerationFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue();
     let accumulatedText = "";
     function processLine(line) {
-        const event = cohereTextStreamingResponseSchema.parse(SecureJSON.parse(line));
+        const event = parseJsonWithZod(line, cohereTextStreamingResponseSchema);
         if (event.is_finished === true) {
             queue.push({
                 type: "delta",
@@ -240,25 +240,29 @@ async function createCohereTextGenerationFullDeltaIterableQueue(stream) {
     }
     // process the stream asynchonously (no 'await' on purpose):
     (async () => {
-        let unprocessedText = "";
-        const reader = new ReadableStreamDefaultReader(stream);
-        const utf8Decoder = new TextDecoder("utf-8");
-        // eslint-disable-next-line no-constant-condition
-        while (true) {
-            const { value: chunk, done } = await reader.read();
-            if (done) {
-                break;
+        try {
+            let unprocessedText = "";
+            const reader = new ReadableStreamDefaultReader(stream);
+            const utf8Decoder = new TextDecoder("utf-8");
+            // eslint-disable-next-line no-constant-condition
+            while (true) {
+                const { value: chunk, done } = await reader.read();
+                if (done) {
+                    break;
+                }
+                unprocessedText += utf8Decoder.decode(chunk, { stream: true });
+                const processableLines = unprocessedText.split(/\r\n|\n|\r/g);
+                unprocessedText = processableLines.pop() || "";
+                processableLines.forEach(processLine);
+            }
+            // processing remaining text:
+            if (unprocessedText) {
+                processLine(unprocessedText);
             }
-            unprocessedText += utf8Decoder.decode(chunk, { stream: true });
-            const processableLines = unprocessedText.split(/\r\n|\n|\r/g);
-            unprocessedText = processableLines.pop() || "";
-            processableLines.forEach(processLine);
         }
-        // processing remaining text:
-        if (unprocessedText) {
-            processLine(unprocessedText);
+        finally {
+            queue.close();
         }
-        queue.close();
     })();
     return queue;
 }

package/model-provider/cohere/CohereTokenizer.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.CohereTokenizer = 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 CohereError_js_1 = require("./CohereError.cjs");
@@ -73,11 +70,11 @@ class CohereTokenizer {
     }
 }
 exports.CohereTokenizer = CohereTokenizer;
-const cohereDetokenizationResponseSchema = zod_1.default.object({
-    text: zod_1.default.string(),
-    meta: zod_1.default.object({
-        api_version: zod_1.default.object({
-            version: zod_1.default.string(),
+const cohereDetokenizationResponseSchema = zod_1.z.object({
+    text: zod_1.z.string(),
+    meta: zod_1.z.object({
+        api_version: zod_1.z.object({
+            version: zod_1.z.string(),
         }),
     }),
 });
@@ -94,12 +91,12 @@ async function callCohereDetokenizeAPI({ api = new CohereApiConfiguration_js_1.C
         abortSignal,
     });
 }
-const cohereTokenizationResponseSchema = zod_1.default.object({
-    tokens: zod_1.default.array(zod_1.default.number()),
-    token_strings: zod_1.default.array(zod_1.default.string()),
-    meta: zod_1.default.object({
-        api_version: zod_1.default.object({
-            version: zod_1.default.string(),
+const cohereTokenizationResponseSchema = zod_1.z.object({
+    tokens: zod_1.z.array(zod_1.z.number()),
+    token_strings: zod_1.z.array(zod_1.z.string()),
+    meta: zod_1.z.object({
+        api_version: zod_1.z.object({
+            version: zod_1.z.string(),
         }),
     }),
 });

package/model-provider/cohere/CohereTokenizer.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 { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";

package/model-provider/cohere/CohereTokenizer.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 { failedCohereCallResponseHandler } from "./CohereError.js";

package/model-provider/huggingface/HuggingFaceError.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.failedHuggingFaceCallResponseHandler = exports.HuggingFaceError = exports.huggingFaceErrorDataSchema = 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.huggingFaceErrorDataSchema = zod_1.z.object({
     error: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()),
 });
@@ -25,31 +22,10 @@ class HuggingFaceError extends ApiCallError_js_1.ApiCallError {
     }
 }
 exports.HuggingFaceError = HuggingFaceError;
-const failedHuggingFaceCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    try {
-        const parsedError = exports.huggingFaceErrorDataSchema.parse(secure_json_parse_1.default.parse(responseBody));
-        console.error(requestBodyValues);
-        return new HuggingFaceError({
-            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 failedHuggingFaceCallResponseHandler = async ({ response, url, requestBodyValues }) => new HuggingFaceError({
+    url,
+    requestBodyValues,
+    statusCode: response.status,
+    data: (0, parseJSON_js_1.parseJsonWithZod)(await response.text(), exports.huggingFaceErrorDataSchema),
+});
 exports.failedHuggingFaceCallResponseHandler = failedHuggingFaceCallResponseHandler;

package/model-provider/huggingface/HuggingFaceError.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 huggingFaceErrorDataSchema = z.object({
     error: z.array(z.string()).or(z.string()),
 });
@@ -18,30 +18,9 @@ export class HuggingFaceError extends ApiCallError {
         this.data = data;
     }
 }
-export const failedHuggingFaceCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    try {
-        const parsedError = huggingFaceErrorDataSchema.parse(SecureJSON.parse(responseBody));
-        console.error(requestBodyValues);
-        return new HuggingFaceError({
-            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 failedHuggingFaceCallResponseHandler = async ({ response, url, requestBodyValues }) => new HuggingFaceError({
+    url,
+    requestBodyValues,
+    statusCode: response.status,
+    data: parseJsonWithZod(await response.text(), huggingFaceErrorDataSchema),
+});

package/model-provider/huggingface/HuggingFaceImageDescriptionModel.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.HuggingFaceImageDescriptionModel = 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");
@@ -60,8 +57,8 @@ class HuggingFaceImageDescriptionModel extends AbstractModel_js_1.AbstractModel
     }
 }
 exports.HuggingFaceImageDescriptionModel = HuggingFaceImageDescriptionModel;
-const huggingFaceImageDescriptionResponseSchema = zod_1.default.array(zod_1.default.object({
-    generated_text: zod_1.default.string(),
+const huggingFaceImageDescriptionResponseSchema = zod_1.z.array(zod_1.z.object({
+    generated_text: zod_1.z.string(),
 }));
 async function callHuggingFaceImageDescriptionAPI({ api = new HuggingFaceApiConfiguration_js_1.HuggingFaceApiConfiguration(), abortSignal, model, data, }) {
     return (0, postToApi_js_1.postToApi)({

package/model-provider/huggingface/HuggingFaceImageDescriptionModel.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import z from "zod";
+import { z } from "zod";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { FunctionOptions } from "../../core/FunctionOptions.js";

package/model-provider/huggingface/HuggingFaceImageDescriptionModel.js

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

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.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.HuggingFaceTextEmbeddingModel = 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");
@@ -112,7 +109,7 @@ class HuggingFaceTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.HuggingFaceTextEmbeddingModel = HuggingFaceTextEmbeddingModel;
-const huggingFaceTextEmbeddingResponseSchema = zod_1.default.array(zod_1.default.array(zod_1.default.number()));
+const huggingFaceTextEmbeddingResponseSchema = zod_1.z.array(zod_1.z.array(zod_1.z.number()));
 async function callHuggingFaceTextGenerationAPI({ api = new HuggingFaceApiConfiguration_js_1.HuggingFaceApiConfiguration(), abortSignal, model, inputs, options, }) {
     return (0, postToApi_js_1.postJsonToApi)({
         url: api.assembleUrl(`/${model}`),

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.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/huggingface/HuggingFaceTextEmbeddingModel.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/huggingface/HuggingFaceTextGenerationModel.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.HuggingFaceTextGenerationModel = 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");
@@ -109,8 +106,8 @@ class HuggingFaceTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.HuggingFaceTextGenerationModel = HuggingFaceTextGenerationModel;
-const huggingFaceTextGenerationResponseSchema = zod_1.default.array(zod_1.default.object({
-    generated_text: zod_1.default.string(),
+const huggingFaceTextGenerationResponseSchema = zod_1.z.array(zod_1.z.object({
+    generated_text: zod_1.z.string(),
 }));
 async function callHuggingFaceTextGenerationAPI({ api = new HuggingFaceApiConfiguration_js_1.HuggingFaceApiConfiguration(), abortSignal, model, inputs, topK, topP, temperature, repetitionPenalty, maxNewTokens, maxTime, numReturnSequences, doSample, options, }) {
     return (0, postToApi_js_1.postJsonToApi)({

package/model-provider/huggingface/HuggingFaceTextGenerationModel.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/huggingface/HuggingFaceTextGenerationModel.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/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;