modelfusion 0.72.0 → 0.73.1

package/core/api/ApiCallError.cjs

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiCallError = void 0;
 class ApiCallError extends Error {
-    constructor({ message, url, requestBodyValues, statusCode, cause, isRetryable = statusCode === 429 || statusCode >= 500, }) {
+    constructor({ message, url, requestBodyValues, statusCode, cause, isRetryable = statusCode != null &&
+        (statusCode === 429 || statusCode >= 500), }) {
         super(message);
         Object.defineProperty(this, "url", {
             enumerable: true,

package/core/api/ApiCallError.d.ts

@@ -1,14 +1,14 @@
 export declare class ApiCallError extends Error {
     readonly url: string;
     readonly requestBodyValues: unknown;
-    readonly statusCode: number;
+    readonly statusCode?: number;
     readonly cause?: unknown;
     readonly isRetryable: boolean;
     constructor({ message, url, requestBodyValues, statusCode, cause, isRetryable, }: {
         message: string;
         url: string;
         requestBodyValues: unknown;
-        statusCode: number;
+        statusCode?: number;
         cause?: unknown;
         isRetryable?: boolean;
     });
@@ -17,7 +17,7 @@ export declare class ApiCallError extends Error {
         message: string;
         url: string;
         requestBodyValues: unknown;
-        statusCode: number;
+        statusCode: number | undefined;
         cause: unknown;
         isRetryable: boolean;
     };

package/core/api/ApiCallError.js

@@ -1,5 +1,6 @@
 export class ApiCallError extends Error {
-    constructor({ message, url, requestBodyValues, statusCode, cause, isRetryable = statusCode === 429 || statusCode >= 500, }) {
+    constructor({ message, url, requestBodyValues, statusCode, cause, isRetryable = statusCode != null &&
+        (statusCode === 429 || statusCode >= 500), }) {
         super(message);
         Object.defineProperty(this, "url", {
             enumerable: true,

package/core/api/postToApi.cjs

@@ -108,9 +108,16 @@ const postToApi = async ({ url, headers = {}, body, successfulResponseHandler, f
         // unwrap original error when fetch failed (for easier debugging):
         if (error instanceof TypeError && error.message === "fetch failed") {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            if (error.cause != null) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                throw error.cause;
+            const cause = error.cause;
+            if (cause != null) {
+                // Failed to connect to server:
+                throw new ApiCallError_js_1.ApiCallError({
+                    message: `Cannot connect to API: ${cause.message}`,
+                    cause,
+                    url,
+                    requestBodyValues: body.values,
+                    isRetryable: true,
+                });
             }
         }
         throw error;

package/core/api/postToApi.js

@@ -101,9 +101,16 @@ export const postToApi = async ({ url, headers = {}, body, successfulResponseHan
         // unwrap original error when fetch failed (for easier debugging):
         if (error instanceof TypeError && error.message === "fetch failed") {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            if (error.cause != null) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                throw error.cause;
+            const cause = error.cause;
+            if (cause != null) {
+                // Failed to connect to server:
+                throw new ApiCallError({
+                    message: `Cannot connect to API: ${cause.message}`,
+                    cause,
+                    url,
+                    requestBodyValues: body.values,
+                    isRetryable: true,
+                });
             }
         }
         throw error;

package/model-function/generate-text/prompt-format/Llama2PromptFormat.cjs

@@ -4,9 +4,9 @@ exports.chat = exports.instruction = void 0;
 const validateChatPrompt_js_1 = require("./validateChatPrompt.cjs");
 // see https://github.com/facebookresearch/llama/blob/6c7fe276574e78057f917549435a2554000a876d/llama/generation.py#L44
 const BEGIN_SEGMENT = "<s>";
-const END_SEGMENT = "</s>\n";
+const END_SEGMENT = "</s>";
 const BEGIN_INSTRUCTION = "[INST]";
-const END_INSTRUCTION = "[/INST]\n";
+const END_INSTRUCTION = "[/INST]";
 const BEGIN_SYSTEM = "<<SYS>>\n";
 const END_SYSTEM = "\n<</SYS>>\n\n";
 /**

package/model-function/generate-text/prompt-format/Llama2PromptFormat.js

@@ -1,9 +1,9 @@
 import { validateChatPrompt } from "./validateChatPrompt.js";
 // see https://github.com/facebookresearch/llama/blob/6c7fe276574e78057f917549435a2554000a876d/llama/generation.py#L44
 const BEGIN_SEGMENT = "<s>";
-const END_SEGMENT = "</s>\n";
+const END_SEGMENT = "</s>";
 const BEGIN_INSTRUCTION = "[INST]";
-const END_INSTRUCTION = "[/INST]\n";
+const END_INSTRUCTION = "[/INST]";
 const BEGIN_SYSTEM = "<<SYS>>\n";
 const END_SYSTEM = "\n<</SYS>>\n\n";
 /**

package/model-provider/ollama/OllamaError.cjs

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedOllamaCallResponseHandler = exports.OllamaError = void 0;
+const zod_1 = require("zod");
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+const ollamaErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+    error: zod_1.z.string(),
+}));
 class OllamaError extends ApiCallError_js_1.ApiCallError {
-    constructor({ statusCode, url, requestBodyValues, message, }) {
+    constructor({ statusCode, url, requestBodyValues, data, message = data.error, }) {
         super({ message, statusCode, requestBodyValues, url });
         Object.defineProperty(this, "data", {
             enumerable: true,
@@ -11,13 +17,21 @@ class OllamaError extends ApiCallError_js_1.ApiCallError {
             writable: true,
             value: void 0
         });
+        this.data = data;
     }
 }
 exports.OllamaError = OllamaError;
-const failedOllamaCallResponseHandler = async ({ response, url, requestBodyValues }) => new OllamaError({
-    url,
-    requestBodyValues,
-    statusCode: response.status,
-    message: await response.text(),
-});
+const failedOllamaCallResponseHandler = async ({ response, url, requestBodyValues }) => {
+    const responseBody = await response.text();
+    const parsedError = (0, parseJSON_js_1.parseJSON)({
+        text: responseBody,
+        schema: ollamaErrorDataSchema,
+    });
+    return new OllamaError({
+        url,
+        requestBodyValues,
+        statusCode: response.status,
+        data: parsedError,
+    });
+};
 exports.failedOllamaCallResponseHandler = failedOllamaCallResponseHandler;

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

@@ -1,12 +1,19 @@
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+declare const ollamaErrorDataSchema: ZodSchema<{
+    error: string;
+}>;
+type OllamaErrorData = (typeof ollamaErrorDataSchema)["_type"];
 export declare class OllamaError extends ApiCallError {
-    readonly data: string;
-    constructor({ statusCode, url, requestBodyValues, message, }: {
-        message: string;
+    readonly data: OllamaErrorData;
+    constructor({ statusCode, url, requestBodyValues, data, message, }: {
+        message?: string;
         statusCode: number;
         url: string;
         requestBodyValues: unknown;
+        data: OllamaErrorData;
     });
 }
 export declare const failedOllamaCallResponseHandler: ResponseHandler<ApiCallError>;
+export {};

package/model-provider/ollama/OllamaError.js

@@ -1,6 +1,12 @@
+import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
+const ollamaErrorDataSchema = new ZodSchema(z.object({
+    error: z.string(),
+}));
 export class OllamaError extends ApiCallError {
-    constructor({ statusCode, url, requestBodyValues, message, }) {
+    constructor({ statusCode, url, requestBodyValues, data, message = data.error, }) {
         super({ message, statusCode, requestBodyValues, url });
         Object.defineProperty(this, "data", {
             enumerable: true,
@@ -8,11 +14,19 @@ export class OllamaError extends ApiCallError {
             writable: true,
             value: void 0
         });
+        this.data = data;
     }
 }
-export const failedOllamaCallResponseHandler = async ({ response, url, requestBodyValues }) => new OllamaError({
-    url,
-    requestBodyValues,
-    statusCode: response.status,
-    message: await response.text(),
-});
+export const failedOllamaCallResponseHandler = async ({ response, url, requestBodyValues }) => {
+    const responseBody = await response.text();
+    const parsedError = parseJSON({
+        text: responseBody,
+        schema: ollamaErrorDataSchema,
+    });
+    return new OllamaError({
+        url,
+        requestBodyValues,
+        statusCode: response.status,
+        data: parsedError,
+    });
+};

package/model-provider/ollama/OllamaTextGenerationModel.cjs

@@ -119,7 +119,7 @@ const ollamaTextGenerationResponseSchema = zod_1.z.object({
     prompt_eval_count: zod_1.z.number(),
     eval_count: zod_1.z.number(),
     eval_duration: zod_1.z.number(),
-    context: zod_1.z.array(zod_1.z.number()),
+    context: zod_1.z.array(zod_1.z.number()).optional(),
 });
 const ollamaTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminatedUnion("done", [
     zod_1.z.object({
@@ -140,7 +140,7 @@ const ollamaTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.d
         prompt_eval_duration: zod_1.z.number().optional(),
         eval_count: zod_1.z.number(),
         eval_duration: zod_1.z.number(),
-        context: zod_1.z.array(zod_1.z.number()),
+        context: zod_1.z.array(zod_1.z.number()).optional(),
     }),
 ]));
 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, }) {

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

@@ -125,12 +125,12 @@ export declare class OllamaTextGenerationModel<CONTEXT_WINDOW_SIZE extends numbe
             response: string;
             model: string;
             done: true;
-            context: number[];
             total_duration: number;
             load_duration: number;
             prompt_eval_count: number;
             eval_count: number;
             eval_duration: number;
+            context?: number[] | undefined;
         };
         text: string;
     }>;
@@ -147,27 +147,27 @@ declare const ollamaTextGenerationResponseSchema: z.ZodObject<{
     prompt_eval_count: z.ZodNumber;
     eval_count: z.ZodNumber;
     eval_duration: z.ZodNumber;
-    context: z.ZodArray<z.ZodNumber, "many">;
+    context: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
 }, "strip", z.ZodTypeAny, {
     response: string;
     model: string;
     done: true;
-    context: number[];
     total_duration: number;
     load_duration: number;
     prompt_eval_count: number;
     eval_count: number;
     eval_duration: number;
+    context?: number[] | undefined;
 }, {
     response: string;
     model: string;
     done: true;
-    context: number[];
     total_duration: number;
     load_duration: number;
     prompt_eval_count: number;
     eval_count: number;
     eval_duration: number;
+    context?: number[] | undefined;
 }>;
 export type OllamaTextGenerationResponse = z.infer<typeof ollamaTextGenerationResponseSchema>;
 export type OllamaTextGenerationDelta = {
@@ -189,12 +189,12 @@ export declare const OllamaTextGenerationResponseFormat: {
             response: string;
             model: string;
             done: true;
-            context: number[];
             total_duration: number;
             load_duration: number;
             prompt_eval_count: number;
             eval_count: number;
             eval_duration: number;
+            context?: number[] | undefined;
         }>;
     };
     /**

package/model-provider/ollama/OllamaTextGenerationModel.js

@@ -115,7 +115,7 @@ const ollamaTextGenerationResponseSchema = z.object({
     prompt_eval_count: z.number(),
     eval_count: z.number(),
     eval_duration: z.number(),
-    context: z.array(z.number()),
+    context: z.array(z.number()).optional(),
 });
 const ollamaTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("done", [
     z.object({
@@ -136,7 +136,7 @@ const ollamaTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("do
         prompt_eval_duration: z.number().optional(),
         eval_count: z.number(),
         eval_duration: z.number(),
-        context: z.array(z.number()),
+        context: z.array(z.number()).optional(),
     }),
 ]));
 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, }) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.72.0",
+  "version": "0.73.1",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [