modelfusion 0.77.0 → 0.79.0

package/model-function/generate-text/PromptFormatTextGenerationModel.cjs

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptFormatTextGenerationModel = void 0;
+const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
+const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
 class PromptFormatTextGenerationModel {
     constructor({ model, promptFormat, }) {
         Object.defineProperty(this, "model", {
@@ -44,6 +46,18 @@ class PromptFormatTextGenerationModel {
     get settingsForEvent() {
         return this.model.settingsForEvent;
     }
+    asToolCallGenerationModel(promptFormat) {
+        return new TextGenerationToolCallModel_js_1.TextGenerationToolCallModel({
+            model: this,
+            format: promptFormat,
+        });
+    }
+    asToolCallsOrTextGenerationModel(promptFormat) {
+        return new TextGenerationToolCallsOrGenerateTextModel_js_1.TextGenerationToolCallsOrGenerateTextModel({
+            model: this,
+            format: promptFormat,
+        });
+    }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextGenerationModel({
             model: this.withSettings({

package/model-function/generate-text/PromptFormatTextGenerationModel.d.ts

@@ -1,4 +1,6 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { TextGenerationToolCallModel, ToolCallPromptFormat } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel, ToolCallsOrGenerateTextPromptFormat } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "./TextGenerationModel.js";
 import { TextGenerationPromptFormat } from "./TextGenerationPromptFormat.js";
 export declare class PromptFormatTextGenerationModel<PROMPT, MODEL_PROMPT, SETTINGS extends TextGenerationModelSettings, MODEL extends TextGenerationModel<MODEL_PROMPT, SETTINGS>> implements TextGenerationModel<PROMPT, SETTINGS> {
@@ -23,6 +25,8 @@ export declare class PromptFormatTextGenerationModel<PROMPT, MODEL_PROMPT, SETTI
         } | undefined;
     }>;
     get settingsForEvent(): Partial<SETTINGS>;
+    asToolCallGenerationModel<INPUT_PROMPT>(promptFormat: ToolCallPromptFormat<INPUT_PROMPT, PROMPT>): TextGenerationToolCallModel<INPUT_PROMPT, PROMPT, this>;
+    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptFormat: ToolCallsOrGenerateTextPromptFormat<INPUT_PROMPT, PROMPT>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, PROMPT, this>;
     withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, PROMPT>): PromptFormatTextGenerationModel<INPUT_PROMPT, PROMPT, SETTINGS, this>;
     withSettings(additionalSettings: Partial<SETTINGS>): this;
 }

package/model-function/generate-text/PromptFormatTextGenerationModel.js

@@ -1,3 +1,5 @@
+import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 export class PromptFormatTextGenerationModel {
     constructor({ model, promptFormat, }) {
         Object.defineProperty(this, "model", {
@@ -41,6 +43,18 @@ export class PromptFormatTextGenerationModel {
     get settingsForEvent() {
         return this.model.settingsForEvent;
     }
+    asToolCallGenerationModel(promptFormat) {
+        return new TextGenerationToolCallModel({
+            model: this,
+            format: promptFormat,
+        });
+    }
+    asToolCallsOrTextGenerationModel(promptFormat) {
+        return new TextGenerationToolCallsOrGenerateTextModel({
+            model: this,
+            format: promptFormat,
+        });
+    }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextGenerationModel({
             model: this.withSettings({

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

@@ -16,7 +16,9 @@ function chatMLSegment(role, text) {
 function text() {
     return {
         stopSequences: [END_SEGMENT],
-        format: (instruction) => chatMLSegment("user", instruction),
+        format: (instruction) => 
+        // prompt and then prefix start of assistant response:
+        chatMLSegment("user", instruction) + chatMLStart("assistant"),
     };
 }
 exports.text = text;
@@ -37,7 +39,8 @@ function instruction() {
     return {
         stopSequences: [END_SEGMENT],
         format: (instruction) => chatMLSegment("system", instruction.system) +
-            chatMLSegment("user", instruction.instruction),
+            chatMLSegment("user", instruction.instruction) +
+            chatMLStart("assistant"), // prefix start of assistant response
     };
 }
 exports.instruction = instruction;

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

@@ -13,7 +13,9 @@ function chatMLSegment(role, text) {
 export function text() {
     return {
         stopSequences: [END_SEGMENT],
-        format: (instruction) => chatMLSegment("user", instruction),
+        format: (instruction) => 
+        // prompt and then prefix start of assistant response:
+        chatMLSegment("user", instruction) + chatMLStart("assistant"),
     };
 }
 /**
@@ -33,7 +35,8 @@ export function instruction() {
     return {
         stopSequences: [END_SEGMENT],
         format: (instruction) => chatMLSegment("system", instruction.system) +
-            chatMLSegment("user", instruction.instruction),
+            chatMLSegment("user", instruction.instruction) +
+            chatMLStart("assistant"), // prefix start of assistant response
     };
 }
 /**

package/model-provider/ollama/OllamaTextGenerationModel.cjs

@@ -8,6 +8,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
+const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const parseJsonStream_js_1 = require("../../util/streaming/parseJsonStream.cjs");
 const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
@@ -97,7 +98,13 @@ class OllamaTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
     asToolCallGenerationModel(promptFormat) {
         return new TextGenerationToolCallModel_js_1.TextGenerationToolCallModel({
-            model: this.withSettings({ format: "json" }),
+            model: this,
+            format: promptFormat,
+        });
+    }
+    asToolCallsOrTextGenerationModel(promptFormat) {
+        return new TextGenerationToolCallsOrGenerateTextModel_js_1.TextGenerationToolCallsOrGenerateTextModel({
+            model: this,
             format: promptFormat,
         });
     }

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

@@ -8,6 +8,7 @@ import { PromptFormatTextStreamingModel } from "../../model-function/generate-te
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
 import { TextGenerationToolCallModel, ToolCallPromptFormat } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel, ToolCallsOrGenerateTextPromptFormat } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 /**
  * @see https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion
  */
@@ -137,6 +138,7 @@ export declare class OllamaTextGenerationModel<CONTEXT_WINDOW_SIZE extends numbe
     }>;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptFormat: ToolCallPromptFormat<INPUT_PROMPT, string>): TextGenerationToolCallModel<INPUT_PROMPT, string, this>;
+    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptFormat: ToolCallsOrGenerateTextPromptFormat<INPUT_PROMPT, string>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, string, this>;
     withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OllamaTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     withSettings(additionalSettings: Partial<OllamaTextGenerationModelSettings<CONTEXT_WINDOW_SIZE>>): this;
 }

package/model-provider/ollama/OllamaTextGenerationModel.js

@@ -5,6 +5,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { parseJsonStream } from "../../util/streaming/parseJsonStream.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
@@ -94,7 +95,13 @@ export class OllamaTextGenerationModel extends AbstractModel {
     }
     asToolCallGenerationModel(promptFormat) {
         return new TextGenerationToolCallModel({
-            model: this.withSettings({ format: "json" }),
+            model: this,
+            format: promptFormat,
+        });
+    }
+    asToolCallsOrTextGenerationModel(promptFormat) {
+        return new TextGenerationToolCallsOrGenerateTextModel({
+            model: this,
             format: promptFormat,
         });
     }

package/package.json

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

package/tool/generate-tool-call/TextGenerationToolCallModel.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextGenerationToolCallModel = void 0;
 const generateText_js_1 = require("../../model-function/generate-text/generateText.cjs");
-const ToolCallParseError_js_1 = require("../ToolCallParseError.cjs");
+const ToolCallParseError_js_1 = require("./ToolCallParseError.cjs");
 class TextGenerationToolCallModel {
     constructor({ model, format, }) {
         Object.defineProperty(this, "model", {

package/tool/generate-tool-call/TextGenerationToolCallModel.js

@@ -1,5 +1,5 @@
 import { generateText } from "../../model-function/generate-text/generateText.js";
-import { ToolCallParseError } from "../ToolCallParseError.js";
+import { ToolCallParseError } from "./ToolCallParseError.js";
 export class TextGenerationToolCallModel {
     constructor({ model, format, }) {
         Object.defineProperty(this, "model", {

package/tool/{ToolCallParseError.cjs → generate-tool-call/ToolCallParseError.cjs}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToolCallParseError = void 0;
-const getErrorMessage_js_1 = require("../util/getErrorMessage.cjs");
+const getErrorMessage_js_1 = require("../../util/getErrorMessage.cjs");
 class ToolCallParseError extends Error {
     constructor({ toolName, valueText, cause, }) {
         super(`Tool call parsing failed for '${toolName}'. ` +

package/tool/{ToolCallParseError.js → generate-tool-call/ToolCallParseError.js}

@@ -1,4 +1,4 @@
-import { getErrorMessage } from "../util/getErrorMessage.js";
+import { getErrorMessage } from "../../util/getErrorMessage.js";
 export class ToolCallParseError extends Error {
     constructor({ toolName, valueText, cause, }) {
         super(`Tool call parsing failed for '${toolName}'. ` +

package/tool/generate-tool-call/index.cjs

@@ -10,25 +10,12 @@ 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 __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;
-};
 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 });
-exports.FunctionListToolCallPromptFormat = void 0;
-exports.FunctionListToolCallPromptFormat = __importStar(require("./FunctionListToolCallPromptFormat.cjs"));
 __exportStar(require("./TextGenerationToolCallModel.cjs"), exports);
 __exportStar(require("./ToolCallGenerationEvent.cjs"), exports);
 __exportStar(require("./ToolCallGenerationModel.cjs"), exports);
+__exportStar(require("./ToolCallParseError.cjs"), exports);
 __exportStar(require("./generateToolCall.cjs"), exports);

package/tool/generate-tool-call/index.d.ts

@@ -1,5 +1,5 @@
-export * as FunctionListToolCallPromptFormat from "./FunctionListToolCallPromptFormat.js";
 export * from "./TextGenerationToolCallModel.js";
 export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";
+export * from "./ToolCallParseError.js";
 export * from "./generateToolCall.js";

package/tool/generate-tool-call/index.js

@@ -1,5 +1,5 @@
-export * as FunctionListToolCallPromptFormat from "./FunctionListToolCallPromptFormat.js";
 export * from "./TextGenerationToolCallModel.js";
 export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";
+export * from "./ToolCallParseError.js";
 export * from "./generateToolCall.js";

package/tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TextGenerationToolCallsOrGenerateTextModel = void 0;
+const generateText_js_1 = require("../../model-function/generate-text/generateText.cjs");
+const ToolCallsOrTextParseError_js_1 = require("./ToolCallsOrTextParseError.cjs");
+class TextGenerationToolCallsOrGenerateTextModel {
+    constructor({ model, format, }) {
+        Object.defineProperty(this, "model", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.model = model;
+        this.format = format;
+    }
+    get modelInformation() {
+        return this.model.modelInformation;
+    }
+    get settings() {
+        return this.model.settings;
+    }
+    get settingsForEvent() {
+        return this.model.settingsForEvent;
+    }
+    async doGenerateToolCallsOrText(tools, prompt, options) {
+        const { response, value, metadata } = await (0, generateText_js_1.generateText)(this.model, this.format.createPrompt(prompt, tools), {
+            ...options,
+            returnType: "full",
+        });
+        try {
+            const { text, toolCalls } = this.format.extractToolCallsAndText(value);
+            return {
+                response,
+                text,
+                toolCalls,
+                usage: metadata?.usage,
+            };
+        }
+        catch (error) {
+            throw new ToolCallsOrTextParseError_js_1.ToolCallsOrTextParseError({
+                valueText: value,
+                cause: error,
+            });
+        }
+    }
+    withSettings(additionalSettings) {
+        return new TextGenerationToolCallsOrGenerateTextModel({
+            model: this.model.withSettings(additionalSettings),
+            format: this.format,
+        });
+    }
+}
+exports.TextGenerationToolCallsOrGenerateTextModel = TextGenerationToolCallsOrGenerateTextModel;

package/tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.d.ts

@@ -0,0 +1,41 @@
+import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { TextGenerationModel } from "../../model-function/generate-text/TextGenerationModel.js";
+import { ToolDefinition } from "../ToolDefinition.js";
+import { ToolCallsOrTextGenerationModel, ToolCallsOrTextGenerationModelSettings } from "./ToolCallsOrTextGenerationModel.js";
+export interface ToolCallsOrGenerateTextPromptFormat<SOURCE_PROMPT, TARGET_PROMPT> {
+    createPrompt: (prompt: SOURCE_PROMPT, tools: Array<ToolDefinition<string, unknown>>) => TARGET_PROMPT;
+    extractToolCallsAndText: (response: string) => {
+        text: string | null;
+        toolCalls: Array<{
+            id: string;
+            name: string;
+            args: unknown;
+        }> | null;
+    };
+}
+export declare class TextGenerationToolCallsOrGenerateTextModel<SOURCE_PROMPT, TARGET_PROMPT, MODEL extends TextGenerationModel<TARGET_PROMPT, ToolCallsOrTextGenerationModelSettings>> implements ToolCallsOrTextGenerationModel<SOURCE_PROMPT, MODEL["settings"]> {
+    private readonly model;
+    private readonly format;
+    constructor({ model, format, }: {
+        model: MODEL;
+        format: ToolCallsOrGenerateTextPromptFormat<SOURCE_PROMPT, TARGET_PROMPT>;
+    });
+    get modelInformation(): import("../../index.js").ModelInformation;
+    get settings(): ToolCallsOrTextGenerationModelSettings;
+    get settingsForEvent(): Partial<MODEL["settings"]>;
+    doGenerateToolCallsOrText(tools: Array<ToolDefinition<string, unknown>>, prompt: SOURCE_PROMPT, options?: FunctionOptions): Promise<{
+        response: unknown;
+        text: string | null;
+        toolCalls: {
+            id: string;
+            name: string;
+            args: unknown;
+        }[] | null;
+        usage: {
+            promptTokens: number;
+            completionTokens: number;
+            totalTokens: number;
+        } | undefined;
+    }>;
+    withSettings(additionalSettings: Partial<MODEL["settings"]>): this;
+}

package/tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js

@@ -0,0 +1,56 @@
+import { generateText } from "../../model-function/generate-text/generateText.js";
+import { ToolCallsOrTextParseError } from "./ToolCallsOrTextParseError.js";
+export class TextGenerationToolCallsOrGenerateTextModel {
+    constructor({ model, format, }) {
+        Object.defineProperty(this, "model", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.model = model;
+        this.format = format;
+    }
+    get modelInformation() {
+        return this.model.modelInformation;
+    }
+    get settings() {
+        return this.model.settings;
+    }
+    get settingsForEvent() {
+        return this.model.settingsForEvent;
+    }
+    async doGenerateToolCallsOrText(tools, prompt, options) {
+        const { response, value, metadata } = await generateText(this.model, this.format.createPrompt(prompt, tools), {
+            ...options,
+            returnType: "full",
+        });
+        try {
+            const { text, toolCalls } = this.format.extractToolCallsAndText(value);
+            return {
+                response,
+                text,
+                toolCalls,
+                usage: metadata?.usage,
+            };
+        }
+        catch (error) {
+            throw new ToolCallsOrTextParseError({
+                valueText: value,
+                cause: error,
+            });
+        }
+    }
+    withSettings(additionalSettings) {
+        return new TextGenerationToolCallsOrGenerateTextModel({
+            model: this.model.withSettings(additionalSettings),
+            format: this.format,
+        });
+    }
+}

package/tool/generate-tool-calls-or-text/ToolCallsOrTextParseError.cjs

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ToolCallsOrTextParseError = void 0;
+const getErrorMessage_js_1 = require("../../util/getErrorMessage.cjs");
+class ToolCallsOrTextParseError extends Error {
+    constructor({ valueText, cause }) {
+        super(`Tool calls or text parsing failed. ` +
+            `Value: ${valueText}.\n` +
+            `Error message: ${(0, getErrorMessage_js_1.getErrorMessage)(cause)}`);
+        Object.defineProperty(this, "valueText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cause", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = "ToolCallsOrTextParseError";
+        this.cause = cause;
+        this.valueText = valueText;
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            cause: this.cause,
+            message: this.message,
+            stack: this.stack,
+            valueText: this.valueText,
+        };
+    }
+}
+exports.ToolCallsOrTextParseError = ToolCallsOrTextParseError;

package/tool/generate-tool-calls-or-text/ToolCallsOrTextParseError.d.ts

@@ -0,0 +1,15 @@
+export declare class ToolCallsOrTextParseError extends Error {
+    readonly valueText: string;
+    readonly cause: unknown;
+    constructor({ valueText, cause }: {
+        valueText: string;
+        cause: unknown;
+    });
+    toJSON(): {
+        name: string;
+        cause: unknown;
+        message: string;
+        stack: string | undefined;
+        valueText: string;
+    };
+}

package/tool/generate-tool-calls-or-text/ToolCallsOrTextParseError.js

@@ -0,0 +1,32 @@
+import { getErrorMessage } from "../../util/getErrorMessage.js";
+export class ToolCallsOrTextParseError extends Error {
+    constructor({ valueText, cause }) {
+        super(`Tool calls or text parsing failed. ` +
+            `Value: ${valueText}.\n` +
+            `Error message: ${getErrorMessage(cause)}`);
+        Object.defineProperty(this, "valueText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cause", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = "ToolCallsOrTextParseError";
+        this.cause = cause;
+        this.valueText = valueText;
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            cause: this.cause,
+            message: this.message,
+            stack: this.stack,
+            valueText: this.valueText,
+        };
+    }
+}

package/tool/generate-tool-calls-or-text/index.cjs

@@ -14,6 +14,8 @@ 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("./TextGenerationToolCallsOrGenerateTextModel.cjs"), exports);
 __exportStar(require("./ToolCallsOrTextGenerationEvent.cjs"), exports);
 __exportStar(require("./ToolCallsOrTextGenerationModel.cjs"), exports);
+__exportStar(require("./ToolCallsOrTextParseError.cjs"), exports);
 __exportStar(require("./generateToolCallsOrText.cjs"), exports);

package/tool/generate-tool-calls-or-text/index.d.ts

@@ -1,3 +1,5 @@
+export * from "./TextGenerationToolCallsOrGenerateTextModel.js";
 export * from "./ToolCallsOrTextGenerationEvent.js";
 export * from "./ToolCallsOrTextGenerationModel.js";
+export * from "./ToolCallsOrTextParseError.js";
 export * from "./generateToolCallsOrText.js";

package/tool/generate-tool-calls-or-text/index.js

@@ -1,3 +1,5 @@
+export * from "./TextGenerationToolCallsOrGenerateTextModel.js";
 export * from "./ToolCallsOrTextGenerationEvent.js";
 export * from "./ToolCallsOrTextGenerationModel.js";
+export * from "./ToolCallsOrTextParseError.js";
 export * from "./generateToolCallsOrText.js";

package/tool/generate-tool-call/FunctionListToolCallPromptFormat.cjs

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.instruction = exports.text = void 0;
-const nanoid_1 = require("nanoid");
-const zod_1 = require("zod");
-const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
-const functionSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
-    function: zod_1.z.string(),
-    parameters: zod_1.z.any(),
-}));
-const DEFAULT_FUNCTION_CALL_PROMPT = [
-    ``,
-    `Select the most suitable function and parameters ` +
-        `from the list of available functions below, based on the user's input. ` +
-        `Provide your response in JSON format.`,
-    ``,
-    `Available functions:`,
-].join("\n");
-function text({ functionCallPrompt = DEFAULT_FUNCTION_CALL_PROMPT, baseFormat, } = {}) {
-    return {
-        createPrompt(instruction, tool) {
-            const instructionWithFunctionCall = [
-                instruction,
-                functionCallPrompt,
-                `${tool.name}:`,
-                `  description: ${tool.description ?? ""}`,
-                `  parameters: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
-                ``,
-            ].join("\n");
-            return (baseFormat?.format(instructionWithFunctionCall) ??
-                // handled by signature overloading:
-                instructionWithFunctionCall); // eslint-disable-line @typescript-eslint/no-explicit-any
-        },
-        extractToolCall(response) {
-            const json = (0, parseJSON_js_1.parseJSON)({ text: response, schema: functionSchema });
-            return {
-                id: (0, nanoid_1.nanoid)(),
-                args: json.parameters,
-            };
-        },
-    };
-}
-exports.text = text;
-function instruction({ functionCallPrompt = DEFAULT_FUNCTION_CALL_PROMPT, baseFormat, }) {
-    return {
-        createPrompt(instruction, tool) {
-            const instructionWithFunctionCall = [
-                instruction.instruction,
-                functionCallPrompt,
-                `${tool.name}:`,
-                `  description: ${tool.description ?? ""}`,
-                `  parameters: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
-                ``,
-            ].join("\n");
-            return baseFormat.format({
-                ...instruction,
-                instruction: instructionWithFunctionCall,
-            });
-        },
-        extractToolCall(response) {
-            const json = (0, parseJSON_js_1.parseJSON)({ text: response, schema: functionSchema });
-            return {
-                id: (0, nanoid_1.nanoid)(),
-                args: json.parameters,
-            };
-        },
-    };
-}
-exports.instruction = instruction;

package/tool/generate-tool-call/FunctionListToolCallPromptFormat.d.ts

@@ -1,14 +0,0 @@
-import { PromptFormat } from "../../model-function/PromptFormat.js";
-import { InstructionPrompt } from "../../model-function/generate-text/prompt-format/InstructionPrompt.js";
-import { ToolCallPromptFormat } from "./TextGenerationToolCallModel.js";
-export declare function text(options?: {
-    functionCallPrompt?: string;
-}): ToolCallPromptFormat<string, string>;
-export declare function text<TARGET_PROMPT>({ functionCallPrompt, baseFormat, }: {
-    functionCallPrompt?: string;
-    baseFormat: PromptFormat<string, TARGET_PROMPT>;
-}): ToolCallPromptFormat<string, TARGET_PROMPT>;
-export declare function instruction<TARGET_PROMPT>({ functionCallPrompt, baseFormat, }: {
-    functionCallPrompt?: string;
-    baseFormat: PromptFormat<InstructionPrompt, TARGET_PROMPT>;
-}): ToolCallPromptFormat<InstructionPrompt, TARGET_PROMPT>;

package/tool/generate-tool-call/FunctionListToolCallPromptFormat.js

@@ -1,65 +0,0 @@
-import { nanoid } from "nanoid";
-import { z } from "zod";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-import { parseJSON } from "../../core/schema/parseJSON.js";
-const functionSchema = new ZodSchema(z.object({
-    function: z.string(),
-    parameters: z.any(),
-}));
-const DEFAULT_FUNCTION_CALL_PROMPT = [
-    ``,
-    `Select the most suitable function and parameters ` +
-        `from the list of available functions below, based on the user's input. ` +
-        `Provide your response in JSON format.`,
-    ``,
-    `Available functions:`,
-].join("\n");
-export function text({ functionCallPrompt = DEFAULT_FUNCTION_CALL_PROMPT, baseFormat, } = {}) {
-    return {
-        createPrompt(instruction, tool) {
-            const instructionWithFunctionCall = [
-                instruction,
-                functionCallPrompt,
-                `${tool.name}:`,
-                `  description: ${tool.description ?? ""}`,
-                `  parameters: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
-                ``,
-            ].join("\n");
-            return (baseFormat?.format(instructionWithFunctionCall) ??
-                // handled by signature overloading:
-                instructionWithFunctionCall); // eslint-disable-line @typescript-eslint/no-explicit-any
-        },
-        extractToolCall(response) {
-            const json = parseJSON({ text: response, schema: functionSchema });
-            return {
-                id: nanoid(),
-                args: json.parameters,
-            };
-        },
-    };
-}
-export function instruction({ functionCallPrompt = DEFAULT_FUNCTION_CALL_PROMPT, baseFormat, }) {
-    return {
-        createPrompt(instruction, tool) {
-            const instructionWithFunctionCall = [
-                instruction.instruction,
-                functionCallPrompt,
-                `${tool.name}:`,
-                `  description: ${tool.description ?? ""}`,
-                `  parameters: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
-                ``,
-            ].join("\n");
-            return baseFormat.format({
-                ...instruction,
-                instruction: instructionWithFunctionCall,
-            });
-        },
-        extractToolCall(response) {
-            const json = parseJSON({ text: response, schema: functionSchema });
-            return {
-                id: nanoid(),
-                args: json.parameters,
-            };
-        },
-    };
-}