modelfusion 0.77.0 → 0.78.0

package/model-provider/ollama/OllamaTextGenerationModel.cjs

@@ -97,7 +97,7 @@ class OllamaTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
     asToolCallGenerationModel(promptFormat) {
         return new TextGenerationToolCallModel_js_1.TextGenerationToolCallModel({
-            model: this.withSettings({ format: "json" }),
+            model: this,
             format: promptFormat,
         });
     }

package/model-provider/ollama/OllamaTextGenerationModel.js

@@ -94,7 +94,7 @@ export class OllamaTextGenerationModel extends AbstractModel {
     }
     asToolCallGenerationModel(promptFormat) {
         return new TextGenerationToolCallModel({
-            model: this.withSettings({ format: "json" }),
+            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.78.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

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

@@ -10,24 +10,10 @@ 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);

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

@@ -1,4 +1,3 @@
-export * as FunctionListToolCallPromptFormat from "./FunctionListToolCallPromptFormat.js";
 export * from "./TextGenerationToolCallModel.js";
 export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";

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

@@ -1,4 +1,3 @@
-export * as FunctionListToolCallPromptFormat from "./FunctionListToolCallPromptFormat.js";
 export * from "./TextGenerationToolCallModel.js";
 export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.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,
-            };
-        },
-    };
-}