modelfusion 0.91.0 → 0.92.1

package/README.md

@@ -40,7 +40,7 @@ Or use a template:
 
 ## Usage Examples
 
-> 💡
+> [!TIP]
 > The basic examples are a great way to get started and to explore in parallel with the [documentation](https://modelfusion.dev/). You can find them in the [examples/basic](https://github.com/lgrammel/modelfusion/tree/main/examples/basic) folder.
 
 You can provide API keys for the different [integrations](https://modelfusion.dev/integration/model-provider/) using environment variables (e.g., `OPENAI_API_KEY`) or pass them into the model constructors as options.
@@ -636,7 +636,9 @@ ModelFusion provides an [observer framework](https://modelfusion.dev/guide/util/
 #### Global Logging Example
 
 ```ts
-setGlobalFunctionLogging("detailed-object"); // log full events
+import { modelfusion } from "modelfusion";
+
+modelfusion.setLogFormat("detailed-object"); // log full events
 ```
 
 ### [Server](https://modelfusion.dev/guide/server/)

package/core/FunctionOptions.d.ts

@@ -1,5 +1,6 @@
-import { Run } from "./Run.js";
 import { FunctionObserver } from "./FunctionObserver.js";
+import { LogFormat } from "./LogFormat.js";
+import { Run } from "./Run.js";
 /**
  * Additional settings for ModelFusion functions.
  */
@@ -12,7 +13,7 @@ export type FunctionOptions = {
      * Optional logging to use for the function. Logs are sent to the console.
      * Overrides the global function logging setting.
      */
-    logging?: FunctionLogging;
+    logging?: LogFormat;
     /**
      * Optional observers that are called when the function is invoked.
      */
@@ -27,12 +28,3 @@ export type FunctionOptions = {
      */
     parentCallId?: string | undefined;
 };
-/**
- * The logging to use for the function. Logs are sent to the console.
- *
- * - `off` or undefined: No logging.
- * - `basic-text`: Log the timestamp and the type of event as a single line of text.
- * - `detailed-object`: Log everything except the original response as an object to the console.
- * - `detailed-json`: Log everything except the original response as a JSON string to the console.
- */
-export type FunctionLogging = undefined | "off" | "basic-text" | "detailed-object" | "detailed-json";

package/core/LogFormat.cjs

@@ -0,0 +1,10 @@
+"use strict";
+/**
+ * The logging output format to use, e.g. for functions. Logs are sent to the console.
+ *
+ * - `off` or undefined: No logging.
+ * - `basic-text`: Log the timestamp and the type of event as a single line of text.
+ * - `detailed-object`: Log everything except the original response as an object to the console.
+ * - `detailed-json`: Log everything except the original response as a JSON string to the console.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

package/core/LogFormat.d.ts

@@ -0,0 +1,9 @@
+/**
+ * The logging output format to use, e.g. for functions. Logs are sent to the console.
+ *
+ * - `off` or undefined: No logging.
+ * - `basic-text`: Log the timestamp and the type of event as a single line of text.
+ * - `detailed-object`: Log everything except the original response as an object to the console.
+ * - `detailed-json`: Log everything except the original response as a JSON string to the console.
+ */
+export type LogFormat = undefined | "off" | "basic-text" | "detailed-object" | "detailed-json";

package/core/LogFormat.js

@@ -0,0 +1,9 @@
+/**
+ * The logging output format to use, e.g. for functions. Logs are sent to the console.
+ *
+ * - `off` or undefined: No logging.
+ * - `basic-text`: Log the timestamp and the type of event as a single line of text.
+ * - `detailed-object`: Log everything except the original response as an object to the console.
+ * - `detailed-json`: Log everything except the original response as a JSON string to the console.
+ */
+export {};

package/core/ModelFusionConfiguration.cjs

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogFormat = exports.setLogFormat = exports.getFunctionObservers = exports.setFunctionObservers = void 0;
+let globalLogFormat = undefined;
+let globalFunctionObservers = [];
+function setFunctionObservers(functionObservers) {
+    globalFunctionObservers = functionObservers;
+}
+exports.setFunctionObservers = setFunctionObservers;
+function getFunctionObservers() {
+    return globalFunctionObservers;
+}
+exports.getFunctionObservers = getFunctionObservers;
+function setLogFormat(format) {
+    globalLogFormat = format;
+}
+exports.setLogFormat = setLogFormat;
+function getLogFormat() {
+    return globalLogFormat;
+}
+exports.getLogFormat = getLogFormat;

package/core/ModelFusionConfiguration.d.ts

@@ -0,0 +1,6 @@
+import { FunctionObserver } from "./FunctionObserver.js";
+import { LogFormat } from "./LogFormat.js";
+export declare function setFunctionObservers(functionObservers: FunctionObserver[]): void;
+export declare function getFunctionObservers(): FunctionObserver[];
+export declare function setLogFormat(format: LogFormat): void;
+export declare function getLogFormat(): LogFormat;

package/core/ModelFusionConfiguration.js

@@ -0,0 +1,14 @@
+let globalLogFormat = undefined;
+let globalFunctionObservers = [];
+export function setFunctionObservers(functionObservers) {
+    globalFunctionObservers = functionObservers;
+}
+export function getFunctionObservers() {
+    return globalFunctionObservers;
+}
+export function setLogFormat(format) {
+    globalLogFormat = format;
+}
+export function getLogFormat() {
+    return globalLogFormat;
+}

package/core/api/ApiCallError.cjs

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiCallError = void 0;
 class ApiCallError extends Error {
     constructor({ message, url, requestBodyValues, statusCode, responseBody, cause, isRetryable = statusCode != null &&
-        (statusCode === 429 || statusCode >= 500), }) {
+        (statusCode === 429 || statusCode >= 500), data, }) {
         super(message);
         Object.defineProperty(this, "url", {
             enumerable: true,
@@ -41,6 +41,12 @@ class ApiCallError extends Error {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.name = "ApiCallError";
         this.url = url;
         this.requestBodyValues = requestBodyValues;
@@ -48,6 +54,7 @@ class ApiCallError extends Error {
         this.responseBody = responseBody;
         this.cause = cause;
         this.isRetryable = isRetryable;
+        this.data = data;
     }
     toJSON() {
         return {
@@ -59,6 +66,7 @@ class ApiCallError extends Error {
             responseBody: this.responseBody,
             cause: this.cause,
             isRetryable: this.isRetryable,
+            data: this.data,
         };
     }
 }

package/core/api/ApiCallError.d.ts

@@ -5,7 +5,8 @@ export declare class ApiCallError extends Error {
     readonly responseBody?: string;
     readonly cause?: unknown;
     readonly isRetryable: boolean;
-    constructor({ message, url, requestBodyValues, statusCode, responseBody, cause, isRetryable, }: {
+    readonly data?: unknown;
+    constructor({ message, url, requestBodyValues, statusCode, responseBody, cause, isRetryable, data, }: {
         message: string;
         url: string;
         requestBodyValues: unknown;
@@ -13,6 +14,7 @@ export declare class ApiCallError extends Error {
         responseBody?: string;
         cause?: unknown;
         isRetryable?: boolean;
+        data?: unknown;
     });
     toJSON(): {
         name: string;
@@ -23,5 +25,6 @@ export declare class ApiCallError extends Error {
         responseBody: string | undefined;
         cause: unknown;
         isRetryable: boolean;
+        data: unknown;
     };
 }

package/core/api/ApiCallError.js

@@ -1,6 +1,6 @@
 export class ApiCallError extends Error {
     constructor({ message, url, requestBodyValues, statusCode, responseBody, cause, isRetryable = statusCode != null &&
-        (statusCode === 429 || statusCode >= 500), }) {
+        (statusCode === 429 || statusCode >= 500), data, }) {
         super(message);
         Object.defineProperty(this, "url", {
             enumerable: true,
@@ -38,6 +38,12 @@ export class ApiCallError extends Error {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.name = "ApiCallError";
         this.url = url;
         this.requestBodyValues = requestBodyValues;
@@ -45,6 +51,7 @@ export class ApiCallError extends Error {
         this.responseBody = responseBody;
         this.cause = cause;
         this.isRetryable = isRetryable;
+        this.data = data;
     }
     toJSON() {
         return {
@@ -56,6 +63,7 @@ export class ApiCallError extends Error {
             responseBody: this.responseBody,
             cause: this.cause,
             isRetryable: this.isRetryable,
+            data: this.data,
         };
     }
 }

package/core/executeFunctionCall.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeFunctionCall = void 0;
 const nanoid_1 = require("nanoid");
 const FunctionEventSource_js_1 = require("./FunctionEventSource.cjs");
-const GlobalFunctionLogging_js_1 = require("./GlobalFunctionLogging.cjs");
-const GlobalFunctionObservers_js_1 = require("./GlobalFunctionObservers.cjs");
+const ModelFusionConfiguration_js_1 = require("./ModelFusionConfiguration.cjs");
+const ModelFusionConfiguration_js_2 = require("./ModelFusionConfiguration.cjs");
 const AbortError_js_1 = require("./api/AbortError.cjs");
 const getFunctionCallLogger_js_1 = require("./getFunctionCallLogger.cjs");
 const getRun_js_1 = require("./getRun.cjs");
@@ -14,8 +14,8 @@ async function executeFunctionCall({ options, input, functionType, execute, inpu
     const run = await (0, getRun_js_1.getRun)(options?.run);
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
-            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
-            ...(0, GlobalFunctionObservers_js_1.getGlobalFunctionObservers)(),
+            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, ModelFusionConfiguration_js_1.getLogFormat)()),
+            ...(0, ModelFusionConfiguration_js_2.getFunctionObservers)(),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),
         ],

package/core/executeFunctionCall.js

@@ -1,7 +1,7 @@
 import { nanoid as createId } from "nanoid";
 import { FunctionEventSource } from "./FunctionEventSource.js";
-import { getGlobalFunctionLogging } from "./GlobalFunctionLogging.js";
-import { getGlobalFunctionObservers } from "./GlobalFunctionObservers.js";
+import { getLogFormat } from "./ModelFusionConfiguration.js";
+import { getFunctionObservers } from "./ModelFusionConfiguration.js";
 import { AbortError } from "./api/AbortError.js";
 import { getFunctionCallLogger } from "./getFunctionCallLogger.js";
 import { getRun } from "./getRun.js";
@@ -11,8 +11,8 @@ export async function executeFunctionCall({ options, input, functionType, execut
     const run = await getRun(options?.run);
     const eventSource = new FunctionEventSource({
         observers: [
-            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
-            ...getGlobalFunctionObservers(),
+            ...getFunctionCallLogger(options?.logging ?? getLogFormat()),
+            ...getFunctionObservers(),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),
         ],

package/core/getFunctionCallLogger.cjs

@@ -45,11 +45,27 @@ const detailedObjectObserver = {
                 ),
             };
         }
-        // filter all undefined properties from event for cleaner console output:
-        event = Object.fromEntries(
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        Object.entries(event).filter(([_, v]) => v !== undefined));
-        console.log(event);
+        // filter all hard-to-read properties from event for cleaner console output:
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        function cleanObject(obj) {
+            if (obj instanceof Date || typeof obj === "string") {
+                return obj;
+            }
+            if (obj !== null && typeof obj === "object") {
+                return Object.fromEntries(Object.entries(obj)
+                    .filter(([_, v] // eslint-disable-line @typescript-eslint/no-unused-vars
+                ) => v !== undefined && // filter all undefined properties
+                    !(v instanceof Buffer) // remove all buffers
+                )
+                    .map(([k, v]) => [k, cleanObject(v)])
+                    .filter(([_, v]) => v !== undefined) // eslint-disable-line @typescript-eslint/no-unused-vars
+                );
+            }
+            return obj;
+        }
+        // Clean the event object
+        const cleanedEvent = cleanObject(event);
+        console.log(cleanedEvent);
     },
 };
 const detailedJsonObserver = {

package/core/getFunctionCallLogger.js

@@ -41,11 +41,27 @@ const detailedObjectObserver = {
                 ),
             };
         }
-        // filter all undefined properties from event for cleaner console output:
-        event = Object.fromEntries(
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        Object.entries(event).filter(([_, v]) => v !== undefined));
-        console.log(event);
+        // filter all hard-to-read properties from event for cleaner console output:
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        function cleanObject(obj) {
+            if (obj instanceof Date || typeof obj === "string") {
+                return obj;
+            }
+            if (obj !== null && typeof obj === "object") {
+                return Object.fromEntries(Object.entries(obj)
+                    .filter(([_, v] // eslint-disable-line @typescript-eslint/no-unused-vars
+                ) => v !== undefined && // filter all undefined properties
+                    !(v instanceof Buffer) // remove all buffers
+                )
+                    .map(([k, v]) => [k, cleanObject(v)])
+                    .filter(([_, v]) => v !== undefined) // eslint-disable-line @typescript-eslint/no-unused-vars
+                );
+            }
+            return obj;
+        }
+        // Clean the event object
+        const cleanedEvent = cleanObject(event);
+        console.log(cleanedEvent);
     },
 };
 const detailedJsonObserver = {

package/core/index.cjs

@@ -10,18 +10,31 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelfusion = void 0;
 __exportStar(require("./DefaultRun.cjs"), exports);
 __exportStar(require("./ExecuteFunctionEvent.cjs"), exports);
 __exportStar(require("./FunctionEvent.cjs"), exports);
 __exportStar(require("./FunctionEventSource.cjs"), exports);
 __exportStar(require("./FunctionObserver.cjs"), exports);
 __exportStar(require("./FunctionOptions.cjs"), exports);
-__exportStar(require("./GlobalFunctionLogging.cjs"), exports);
-__exportStar(require("./GlobalFunctionObservers.cjs"), exports);
+__exportStar(require("./LogFormat.cjs"), exports);
+exports.modelfusion = __importStar(require("./ModelFusionConfiguration.cjs"));
 __exportStar(require("./Run.cjs"), exports);
 __exportStar(require("./Vector.cjs"), exports);
 __exportStar(require("./api/index.cjs"), exports);

package/core/index.d.ts

@@ -4,8 +4,8 @@ export * from "./FunctionEvent.js";
 export * from "./FunctionEventSource.js";
 export * from "./FunctionObserver.js";
 export * from "./FunctionOptions.js";
-export * from "./GlobalFunctionLogging.js";
-export * from "./GlobalFunctionObservers.js";
+export * from "./LogFormat.js";
+export * as modelfusion from "./ModelFusionConfiguration.js";
 export * from "./Run.js";
 export * from "./Vector.js";
 export * from "./api/index.js";

package/core/index.js

@@ -4,8 +4,8 @@ export * from "./FunctionEvent.js";
 export * from "./FunctionEventSource.js";
 export * from "./FunctionObserver.js";
 export * from "./FunctionOptions.js";
-export * from "./GlobalFunctionLogging.js";
-export * from "./GlobalFunctionObservers.js";
+export * from "./LogFormat.js";
+export * as modelfusion from "./ModelFusionConfiguration.js";
 export * from "./Run.js";
 export * from "./Vector.js";
 export * from "./api/index.js";

package/model-function/executeStandardCall.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeStandardCall = void 0;
 const nanoid_1 = require("nanoid");
 const FunctionEventSource_js_1 = require("../core/FunctionEventSource.cjs");
-const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
-const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
+const ModelFusionConfiguration_js_1 = require("../core/ModelFusionConfiguration.cjs");
+const ModelFusionConfiguration_js_2 = require("../core/ModelFusionConfiguration.cjs");
 const AbortError_js_1 = require("../core/api/AbortError.cjs");
 const getFunctionCallLogger_js_1 = require("../core/getFunctionCallLogger.cjs");
 const getRun_js_1 = require("../core/getRun.cjs");
@@ -15,8 +15,8 @@ async function executeStandardCall({ model, options, input, functionType, genera
     const settings = model.settings;
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
-            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
-            ...(0, GlobalFunctionObservers_js_1.getGlobalFunctionObservers)(),
+            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, ModelFusionConfiguration_js_1.getLogFormat)()),
+            ...(0, ModelFusionConfiguration_js_2.getFunctionObservers)(),
             ...(settings.observers ?? []),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),

package/model-function/executeStandardCall.js

@@ -1,7 +1,7 @@
 import { nanoid as createId } from "nanoid";
 import { FunctionEventSource } from "../core/FunctionEventSource.js";
-import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
-import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
+import { getLogFormat } from "../core/ModelFusionConfiguration.js";
+import { getFunctionObservers } from "../core/ModelFusionConfiguration.js";
 import { AbortError } from "../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
 import { getRun } from "../core/getRun.js";
@@ -12,8 +12,8 @@ export async function executeStandardCall({ model, options, input, functionType,
     const settings = model.settings;
     const eventSource = new FunctionEventSource({
         observers: [
-            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
-            ...getGlobalFunctionObservers(),
+            ...getFunctionCallLogger(options?.logging ?? getLogFormat()),
+            ...getFunctionObservers(),
             ...(settings.observers ?? []),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),

package/model-function/executeStreamCall.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeStreamCall = void 0;
 const nanoid_1 = require("nanoid");
 const FunctionEventSource_js_1 = require("../core/FunctionEventSource.cjs");
-const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
-const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
+const ModelFusionConfiguration_js_1 = require("../core/ModelFusionConfiguration.cjs");
+const ModelFusionConfiguration_js_2 = require("../core/ModelFusionConfiguration.cjs");
 const AbortError_js_1 = require("../core/api/AbortError.cjs");
 const getFunctionCallLogger_js_1 = require("../core/getFunctionCallLogger.cjs");
 const getRun_js_1 = require("../core/getRun.cjs");
@@ -16,8 +16,8 @@ async function executeStreamCall({ model, options, input, functionType, startStr
     const settings = model.settings;
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
-            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
-            ...(0, GlobalFunctionObservers_js_1.getGlobalFunctionObservers)(),
+            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, ModelFusionConfiguration_js_1.getLogFormat)()),
+            ...(0, ModelFusionConfiguration_js_2.getFunctionObservers)(),
             ...(settings.observers ?? []),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),

package/model-function/executeStreamCall.js

@@ -1,7 +1,7 @@
 import { nanoid as createId } from "nanoid";
 import { FunctionEventSource } from "../core/FunctionEventSource.js";
-import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
-import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
+import { getLogFormat } from "../core/ModelFusionConfiguration.js";
+import { getFunctionObservers } from "../core/ModelFusionConfiguration.js";
 import { AbortError } from "../core/api/AbortError.js";
 import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
 import { getRun } from "../core/getRun.js";
@@ -13,8 +13,8 @@ export async function executeStreamCall({ model, options, input, functionType, s
     const settings = model.settings;
     const eventSource = new FunctionEventSource({
         observers: [
-            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
-            ...getGlobalFunctionObservers(),
+            ...getFunctionCallLogger(options?.logging ?? getLogFormat()),
+            ...getFunctionObservers(),
             ...(settings.observers ?? []),
             ...(run?.functionObserver != null ? [run.functionObserver] : []),
             ...(options?.observers ?? []),

package/model-provider/ollama/OllamaError.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedOllamaCallResponseHandler = exports.OllamaError = void 0;
+exports.failedOllamaCallResponseHandler = 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");
@@ -8,30 +8,31 @@ 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, data, message = data.error, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-exports.OllamaError = OllamaError;
 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,
-    });
+    // resilient parsing in case the response is not JSON or does not match the schema:
+    try {
+        const parsedError = (0, parseJSON_js_1.parseJSON)({
+            text: responseBody,
+            schema: ollamaErrorDataSchema,
+        });
+        return new ApiCallError_js_1.ApiCallError({
+            message: parsedError.error,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+            data: parsedError,
+        });
+    }
+    catch (parseError) {
+        return new ApiCallError_js_1.ApiCallError({
+            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+        });
+    }
 };
 exports.failedOllamaCallResponseHandler = failedOllamaCallResponseHandler;

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

@@ -4,16 +4,6 @@ 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: OllamaErrorData;
-    constructor({ statusCode, url, requestBodyValues, data, message, }: {
-        message?: string;
-        statusCode: number;
-        url: string;
-        requestBodyValues: unknown;
-        data: OllamaErrorData;
-    });
-}
+export type OllamaErrorData = (typeof ollamaErrorDataSchema)["_type"];
 export declare const failedOllamaCallResponseHandler: ResponseHandler<ApiCallError>;
 export {};

package/model-provider/ollama/OllamaError.js

@@ -5,28 +5,30 @@ 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, data, message = data.error, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
 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,
-    });
+    // resilient parsing in case the response is not JSON or does not match the schema:
+    try {
+        const parsedError = parseJSON({
+            text: responseBody,
+            schema: ollamaErrorDataSchema,
+        });
+        return new ApiCallError({
+            message: parsedError.error,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+            data: parsedError,
+        });
+    }
+    catch (parseError) {
+        return new ApiCallError({
+            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+        });
+    }
 };