modelfusion 0.71.0 → 0.73.0

package/README.md

@@ -15,7 +15,7 @@
 **ModelFusion** is a TypeScript library for building AI applications, chatbots, and agents.
 
 - **Vendor-neutral**: ModelFusion is a non-commercial open source project that is community-driven. You can use it with any supported provider.
-- **Multimodal**: ModelFusion supports a wide range of models including text generation, image generation, vision, text-to-speech, speech-to-text, and embedding models.
+- **Multi-modal**: ModelFusion supports a wide range of models including text generation, image generation, vision, text-to-speech, speech-to-text, and embedding models.
 - **Streaming**: ModelFusion supports streaming for many generation models, e.g. text streaming, structure streaming, and full duplex speech streaming.
 - **Utility functions**: ModelFusion provides functionality for tools and tool usage, vector indices, and guards functions.
 - **Type inference and validation**: ModelFusion infers TypeScript types wherever possible and to validates model responses.
@@ -250,39 +250,6 @@ for await (const part of structureStream) {
 
 Providers: [OpenAI](https://modelfusion.dev/integration/model-provider/openai)
 
-### [Generate Structure or Text](https://modelfusion.dev/guide/function/generate-structure-or-text)
-
-Generate a structure (or text as a fallback) using a prompt and multiple schemas.
-It either matches one of the schemas or is text reponse.
-
-```ts
-const { structure, value, text } = await generateStructureOrText(
-  new OpenAIChatModel({ model: "gpt-3.5-turbo", maxCompletionTokens: 1000 }),
-  [
-    new ZodStructureDefinition({
-      name: "getCurrentWeather" as const, // mark 'as const' for type inference
-      description: "Get the current weather in a given location",
-      schema: z.object({
-        location: z
-          .string()
-          .describe("The city and state, e.g. San Francisco, CA"),
-        unit: z.enum(["celsius", "fahrenheit"]).optional(),
-      }),
-    }),
-    new ZodStructureDefinition({
-      name: "getContactInformation" as const,
-      description: "Get the contact information for a given person",
-      schema: z.object({
-        name: z.string().describe("The name of the person"),
-      }),
-    }),
-  ],
-  [OpenAIChatMessage.user(query)]
-);
-```
-
-Providers: [OpenAI](https://modelfusion.dev/integration/model-provider/openai)
-
 ### [Embed Value](https://modelfusion.dev/guide/function/embed)
 
 Create embeddings for text and other values. Embeddings are vectors that represent the essence of the values in the context of the model.
@@ -366,16 +333,16 @@ Tools are functions that can be executed by an AI model. They are useful for bui
 
 Predefined tools: [SerpAPI](https://modelfusion.dev/integration/tool/serpapi), [Google Custom Search](https://modelfusion.dev/integration/tool/google-custom-search)
 
-#### Create Tool
+#### [Creating Tools](https://modelfusion.dev/guide/tools/create-tools)
 
-A tool is a function with a name, a description, and a schema for the input parameters.
+A tool is comprised of an async execute function, a name, a description, and a schema for the input parameters.
 
 ```ts
 const calculator = new Tool({
   name: "calculator",
   description: "Execute a calculation",
 
-  inputSchema: new ZodSchema(
+  parameters: new ZodSchema(
     z.object({
       a: z.number().describe("The first number."),
       b: z.number().describe("The second number."),
@@ -402,31 +369,76 @@ const calculator = new Tool({
 });
 ```
 
-#### useTool
+#### [generateToolCall](https://modelfusion.dev/guide/tools/generate-tool-call)
 
-The model determines the parameters for the tool from the prompt and then executes it.
+With `generateToolCall`, you can generate a tool call for a specific tool with a language model that supports tools calls (e.g. OpenAI Chat). This function does not execute the tools.
 
 ```ts
-const { tool, parameters, result } = await useTool(
+const { id, name, args } = await generateToolCall(
   new OpenAIChatModel({ model: "gpt-3.5-turbo" }),
   calculator,
   [OpenAIChatMessage.user("What's fourteen times twelve?")]
 );
 ```
 
-#### useToolOrGenerateText
+#### [generateToolCallsOrText](https://modelfusion.dev/guide/tools/generate-tool-calls-or-text)
 
-The model determines which tool to use and its parameters from the prompt and then executes it.
-Text is generated as a fallback.
+With `generateToolCallsOrText`, you can ask a language model to generate several tool calls as well as text. The model will choose which tools (if any) should be called with which arguments. Both the text and the tool calls are optional. This function does not execute the tools.
 
 ```ts
-const { tool, parameters, result, text } = await useToolOrGenerateText(
+const { text, toolCalls } = await generateToolCallsOrText(
   new OpenAIChatModel({ model: "gpt-3.5-turbo" }),
-  [calculator /* and other tools... */],
+  [toolA, toolB, toolC],
+  [OpenAIChatMessage.user(query)]
+);
+```
+
+#### [executeTool](https://modelfusion.dev/guide/tools/execute-tool)
+
+You can directly invoke a tool with `executeTool`:
+
+```ts
+const result = await executeTool(calculator, {
+  a: 14,
+  b: 12,
+  operator: "*",
+});
+```
+
+#### [useTool](https://modelfusion.dev/guide/tools/use-tool)
+
+With `useTool`, you can use a tool with a language model that supports tools calls (e.g. OpenAI Chat). `useTool` first generates a tool call and then executes the tool with the arguments.
+
+```ts
+const { tool, toolCall, args, ok, result } = await useTool(
+  new OpenAIChatModel({ model: "gpt-3.5-turbo" }),
+  calculator,
+  [OpenAIChatMessage.user("What's fourteen times twelve?")]
+);
+
+console.log(`Tool call:`, toolCall);
+console.log(`Tool:`, tool);
+console.log(`Arguments:`, args);
+console.log(`Ok:`, ok);
+console.log(`Result or Error:`, result);
+```
+
+#### [useToolsOrGenerateText](https://modelfusion.dev/guide/tools/use-tools-or-generate-text)
+
+With `useToolsOrGenerateText`, you can ask a language model to generate several tool calls as well as text. The model will choose which tools (if any) should be called with which arguments. Both the text and the tool calls are optional. This function executes the tools.
+
+```ts
+const { text, toolResults } = await useToolsOrGenerateText(
+  new OpenAIChatModel({ model: "gpt-3.5-turbo" }),
+  [calculator /* ... */],
   [OpenAIChatMessage.user("What's fourteen times twelve?")]
 );
 ```
 
+#### [Agent Loop](https://modelfusion.dev/guide/tools/agent-loop)
+
+You can use `useToolsOrGenerateText` to implement an agent loop that responds to user messages and executes tools. [Learn more](https://modelfusion.dev/guide/tools/agent-loop).
+
 ### [Vector Indices](https://modelfusion.dev/guide/vector-index)
 
 ```ts

package/core/FunctionEvent.d.ts

@@ -1,11 +1,11 @@
-import { ExecuteFunctionFinishedEvent, ExecuteFunctionStartedEvent } from "./ExecuteFunctionEvent.js";
 import { GuardFinishedEvent, GuardStartedEvent } from "../guard/GuardEvent.js";
 import { ModelCallFinishedEvent, ModelCallStartedEvent } from "../model-function/ModelCallEvent.js";
 import { RetrieveFinishedEvent, RetrieveStartedEvent } from "../retriever/RetrieveEvent.js";
-import { ExecuteToolFinishedEvent, ExecuteToolStartedEvent } from "../tool/ExecuteToolEvent.js";
-import { UseToolFinishedEvent, UseToolStartedEvent } from "../tool/UseToolEvent.js";
-import { UseToolOrGenerateTextFinishedEvent, UseToolOrGenerateTextStartedEvent } from "../tool/UseToolOrGenerateTextEvent.js";
+import { ExecuteToolFinishedEvent, ExecuteToolStartedEvent } from "../tool/execute-tool/ExecuteToolEvent.js";
+import { UseToolFinishedEvent, UseToolStartedEvent } from "../tool/use-tool/UseToolEvent.js";
+import { UseToolsOrGenerateTextFinishedEvent, UseToolsOrGenerateTextStartedEvent } from "../tool/use-tools-or-generate-text/UseToolsOrGenerateTextEvent.js";
 import { UpsertIntoVectorIndexFinishedEvent, UpsertIntoVectorIndexStartedEvent } from "../vector-index/UpsertIntoVectorIndexEvent.js";
+import { ExecuteFunctionFinishedEvent, ExecuteFunctionStartedEvent } from "./ExecuteFunctionEvent.js";
 export interface BaseFunctionEvent {
     /**
      * Unique identifier for the function call.
@@ -82,4 +82,4 @@ export interface BaseFunctionFinishedEvent extends BaseFunctionEvent {
      */
     result: BaseFunctionFinishedEventResult;
 }
-export type FunctionEvent = ExecuteFunctionStartedEvent | ExecuteFunctionFinishedEvent | ExecuteToolStartedEvent | ExecuteToolFinishedEvent | GuardStartedEvent | GuardFinishedEvent | ModelCallStartedEvent | ModelCallFinishedEvent | RetrieveStartedEvent | RetrieveFinishedEvent | UpsertIntoVectorIndexStartedEvent | UpsertIntoVectorIndexFinishedEvent | UseToolStartedEvent | UseToolFinishedEvent | UseToolOrGenerateTextStartedEvent | UseToolOrGenerateTextFinishedEvent;
+export type FunctionEvent = ExecuteFunctionStartedEvent | ExecuteFunctionFinishedEvent | ExecuteToolStartedEvent | ExecuteToolFinishedEvent | GuardStartedEvent | GuardFinishedEvent | ModelCallStartedEvent | ModelCallFinishedEvent | RetrieveStartedEvent | RetrieveFinishedEvent | UpsertIntoVectorIndexStartedEvent | UpsertIntoVectorIndexFinishedEvent | UseToolStartedEvent | UseToolFinishedEvent | UseToolsOrGenerateTextStartedEvent | UseToolsOrGenerateTextFinishedEvent;

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/guard/guard.cjs

@@ -4,14 +4,14 @@ exports.guard = void 0;
 const executeFunctionCall_js_1 = require("../core/executeFunctionCall.cjs");
 async function guard(execute, input, guards, options) {
     const guardList = Array.isArray(guards) ? guards : [guards];
-    const maxRetries = options?.maxRetries ?? 1;
+    const maxAttempts = options?.maxAttempts ?? 2;
     return (0, executeFunctionCall_js_1.executeFunctionCall)({
         options,
         input,
         functionType: "guard",
         execute: async (options) => {
             let attempts = 0;
-            while (attempts <= maxRetries) {
+            while (attempts < maxAttempts) {
                 let result;
                 try {
                     result = {
@@ -70,8 +70,9 @@ async function guard(execute, input, guards, options) {
                 }
                 attempts++;
             }
-            throw new Error(`Maximum retry attempts of ${maxRetries} reached ` +
-                `without producing a valid output or handling an error after ${attempts} attempts.`);
+            // TODO dedicated error type
+            throw new Error(`Maximum attempts of ${maxAttempts} reached ` +
+                `without producing a valid output or handling an error.`);
         },
     });
 }

package/guard/guard.d.ts

@@ -24,6 +24,6 @@ export type Guard<INPUT, OUTPUT> = ({ type, input, output, error, }: OutputResul
     action: "passThrough";
 } | undefined>;
 export declare function guard<INPUT, OUTPUT>(execute: (input: INPUT, options?: FunctionOptions) => PromiseLike<OUTPUT>, input: INPUT, guards: Guard<INPUT, OUTPUT> | Array<Guard<INPUT, OUTPUT>>, options?: FunctionOptions & {
-    maxRetries: number;
+    maxAttempts: number;
 }): Promise<OUTPUT | undefined>;
 export {};

package/guard/guard.js

@@ -1,14 +1,14 @@
 import { executeFunctionCall } from "../core/executeFunctionCall.js";
 export async function guard(execute, input, guards, options) {
     const guardList = Array.isArray(guards) ? guards : [guards];
-    const maxRetries = options?.maxRetries ?? 1;
+    const maxAttempts = options?.maxAttempts ?? 2;
     return executeFunctionCall({
         options,
         input,
         functionType: "guard",
         execute: async (options) => {
             let attempts = 0;
-            while (attempts <= maxRetries) {
+            while (attempts < maxAttempts) {
                 let result;
                 try {
                     result = {
@@ -67,8 +67,9 @@ export async function guard(execute, input, guards, options) {
                 }
                 attempts++;
             }
-            throw new Error(`Maximum retry attempts of ${maxRetries} reached ` +
-                `without producing a valid output or handling an error after ${attempts} attempts.`);
+            // TODO dedicated error type
+            throw new Error(`Maximum attempts of ${maxAttempts} reached ` +
+                `without producing a valid output or handling an error.`);
         },
     });
 }

package/model-function/ModelCallEvent.d.ts

@@ -1,4 +1,6 @@
 import { BaseFunctionFinishedEvent, BaseFunctionStartedEvent } from "../core/FunctionEvent.js";
+import { ToolCallGenerationFinishedEvent, ToolCallGenerationStartedEvent } from "../tool/generate-tool-call/ToolCallGenerationEvent.js";
+import { ToolCallsOrTextGenerationFinishedEvent, ToolCallsOrTextGenerationStartedEvent } from "../tool/generate-tool-calls-or-text/ToolCallsOrTextGenerationEvent.js";
 import { ModelInformation } from "./ModelInformation.js";
 import { EmbeddingFinishedEvent, EmbeddingStartedEvent } from "./embed/EmbeddingEvent.js";
 import { ImageGenerationFinishedEvent, ImageGenerationStartedEvent } from "./generate-image/ImageGenerationEvent.js";
@@ -6,8 +8,6 @@ import { SpeechGenerationFinishedEvent, SpeechGenerationStartedEvent, SpeechStre
 import { StructureGenerationFinishedEvent, StructureGenerationStartedEvent } from "./generate-structure/StructureGenerationEvent.js";
 import { StructureStreamingFinishedEvent, StructureStreamingStartedEvent } from "./generate-structure/StructureStreamingEvent.js";
 import { TextGenerationFinishedEvent, TextGenerationStartedEvent, TextStreamingFinishedEvent, TextStreamingStartedEvent } from "./generate-text/TextGenerationEvent.js";
-import { ToolCallGenerationFinishedEvent, ToolCallGenerationStartedEvent } from "./generate-tool-call/ToolCallGenerationEvent.js";
-import { ToolCallsOrTextGenerationFinishedEvent, ToolCallsOrTextGenerationStartedEvent } from "./generate-tool-call/ToolCallsOrTextGenerationEvent.js";
 import { TranscriptionFinishedEvent, TranscriptionStartedEvent } from "./generate-transcription/TranscriptionEvent.js";
 export interface BaseModelCallStartedEvent extends BaseFunctionStartedEvent {
     model: ModelInformation;

package/model-function/generate-structure/StructureGenerationEvent.d.ts

@@ -1,6 +1,6 @@
 import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
 export interface StructureGenerationStartedEvent extends BaseModelCallStartedEvent {
-    functionType: "generate-structure" | "generate-structure-or-text";
+    functionType: "generate-structure";
 }
 export type StructureGenerationFinishedEventResult = {
     status: "success";
@@ -18,6 +18,6 @@ export type StructureGenerationFinishedEventResult = {
     status: "abort";
 };
 export type StructureGenerationFinishedEvent = BaseModelCallFinishedEvent & {
-    functionType: "generate-structure" | "generate-structure-or-text";
+    functionType: "generate-structure";
     result: StructureGenerationFinishedEventResult;
 };

package/model-function/generate-structure/StructureParseError.cjs

@@ -30,5 +30,15 @@ class StructureParseError extends Error {
         this.cause = cause;
         this.valueText = valueText;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            cause: this.cause,
+            message: this.message,
+            stack: this.stack,
+            structureName: this.structureName,
+            valueText: this.valueText,
+        };
+    }
 }
 exports.StructureParseError = StructureParseError;

package/model-function/generate-structure/StructureParseError.d.ts

@@ -7,4 +7,12 @@ export declare class StructureParseError extends Error {
         valueText: string;
         cause: unknown;
     });
+    toJSON(): {
+        name: string;
+        cause: unknown;
+        message: string;
+        stack: string | undefined;
+        structureName: string;
+        valueText: string;
+    };
 }

package/model-function/generate-structure/StructureParseError.js

@@ -27,4 +27,14 @@ export class StructureParseError extends Error {
         this.cause = cause;
         this.valueText = valueText;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            cause: this.cause,
+            message: this.message,
+            stack: this.stack,
+            structureName: this.structureName,
+            valueText: this.valueText,
+        };
+    }
 }

package/model-function/generate-structure/index.cjs

@@ -14,14 +14,11 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./NoSuchStructureError.cjs"), exports);
 __exportStar(require("./StructureFromTextGenerationModel.cjs"), exports);
 __exportStar(require("./StructureGenerationEvent.cjs"), exports);
 __exportStar(require("./StructureGenerationModel.cjs"), exports);
-__exportStar(require("./StructureOrTextGenerationModel.cjs"), exports);
 __exportStar(require("./StructureParseError.cjs"), exports);
 __exportStar(require("./StructureStreamingEvent.cjs"), exports);
 __exportStar(require("./StructureValidationError.cjs"), exports);
 __exportStar(require("./generateStructure.cjs"), exports);
-__exportStar(require("./generateStructureOrText.cjs"), exports);
 __exportStar(require("./streamStructure.cjs"), exports);

package/model-function/generate-structure/index.d.ts

@@ -1,11 +1,8 @@
-export * from "./NoSuchStructureError.js";
 export * from "./StructureFromTextGenerationModel.js";
 export * from "./StructureGenerationEvent.js";
 export * from "./StructureGenerationModel.js";
-export * from "./StructureOrTextGenerationModel.js";
 export * from "./StructureParseError.js";
 export * from "./StructureStreamingEvent.js";
 export * from "./StructureValidationError.js";
 export * from "./generateStructure.js";
-export * from "./generateStructureOrText.js";
 export * from "./streamStructure.js";

package/model-function/generate-structure/index.js

@@ -1,11 +1,8 @@
-export * from "./NoSuchStructureError.js";
 export * from "./StructureFromTextGenerationModel.js";
 export * from "./StructureGenerationEvent.js";
 export * from "./StructureGenerationModel.js";
-export * from "./StructureOrTextGenerationModel.js";
 export * from "./StructureParseError.js";
 export * from "./StructureStreamingEvent.js";
 export * from "./StructureValidationError.js";
 export * from "./generateStructure.js";
-export * from "./generateStructureOrText.js";
 export * from "./streamStructure.js";

package/model-function/index.cjs

@@ -31,7 +31,6 @@ __exportStar(require("./generate-image/generateImage.cjs"), exports);
 __exportStar(require("./generate-speech/index.cjs"), exports);
 __exportStar(require("./generate-structure/index.cjs"), exports);
 __exportStar(require("./generate-text/index.cjs"), exports);
-__exportStar(require("./generate-tool-call/index.cjs"), exports);
 __exportStar(require("./generate-transcription/TranscriptionEvent.cjs"), exports);
 __exportStar(require("./generate-transcription/TranscriptionModel.cjs"), exports);
 __exportStar(require("./generate-transcription/generateTranscription.cjs"), exports);

package/model-function/index.d.ts

@@ -15,7 +15,6 @@ export * from "./generate-image/generateImage.js";
 export * from "./generate-speech/index.js";
 export * from "./generate-structure/index.js";
 export * from "./generate-text/index.js";
-export * from "./generate-tool-call/index.js";
 export * from "./generate-transcription/TranscriptionEvent.js";
 export * from "./generate-transcription/TranscriptionModel.js";
 export * from "./generate-transcription/generateTranscription.js";

package/model-function/index.js

@@ -15,7 +15,6 @@ export * from "./generate-image/generateImage.js";
 export * from "./generate-speech/index.js";
 export * from "./generate-structure/index.js";
 export * from "./generate-text/index.js";
-export * from "./generate-tool-call/index.js";
 export * from "./generate-transcription/TranscriptionEvent.js";
 export * from "./generate-transcription/TranscriptionModel.js";
 export * from "./generate-transcription/generateTranscription.js";

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

@@ -19,8 +19,8 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     get settingsForEvent(): Partial<Automatic1111ImageGenerationSettings>;
     doGenerateImage(prompt: Automatic1111ImageGenerationPrompt, options?: FunctionOptions): Promise<{
         response: {
-            parameters: {};
             images: string[];
+            parameters: {};
             info: string;
         };
         base64Image: string;
@@ -42,12 +42,12 @@ declare const Automatic1111ImageGenerationResponseSchema: z.ZodObject<{
     parameters: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
     info: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    parameters: {};
     images: string[];
+    parameters: {};
     info: string;
 }, {
-    parameters: {};
     images: string[];
+    parameters: {};
     info: string;
 }>;
 export type Automatic1111ImageGenerationResponse = z.infer<typeof Automatic1111ImageGenerationResponseSchema>;

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, }) {