modelfusion 0.132.0 → 0.134.0

package/tool/execute-tool/executeTool.cjs

@@ -1,102 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeTool = void 0;
-const nanoid_1 = require("nanoid");
-const FunctionEventSource_js_1 = require("../../core/FunctionEventSource.cjs");
-const ModelFusionConfiguration_js_1 = 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");
-const DurationMeasurement_js_1 = require("../../util/DurationMeasurement.cjs");
-const runSafe_js_1 = require("../../util/runSafe.cjs");
-const ToolExecutionError_js_1 = require("../ToolExecutionError.cjs");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function executeTool({ tool, args, fullResponse, ...options }) {
-    const callResponse = await doExecuteTool({ tool, args, ...options });
-    return fullResponse ? callResponse : callResponse.output;
-}
-exports.executeTool = executeTool;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function doExecuteTool({ tool, args, ...options }) {
-    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, ModelFusionConfiguration_js_1.getLogFormat)()),
-            ...(0, ModelFusionConfiguration_js_1.getFunctionObservers)(),
-            ...(run?.functionObserver != null ? [run.functionObserver] : []),
-            ...(options?.observers ?? []),
-        ],
-        errorHandler: run?.errorHandler,
-    });
-    const durationMeasurement = (0, DurationMeasurement_js_1.startDurationMeasurement)();
-    const metadata = {
-        functionType: "execute-tool",
-        callId: `call-${(0, nanoid_1.nanoid)()}`,
-        parentCallId: options?.callId,
-        runId: run?.runId,
-        sessionId: run?.sessionId,
-        userId: run?.userId,
-        functionId: options?.functionId,
-        toolName: tool.name,
-        input: args,
-    };
-    eventSource.notify({
-        ...metadata,
-        eventType: "started",
-        timestamp: durationMeasurement.startDate,
-        startTimestamp: durationMeasurement.startDate,
-    });
-    const result = await (0, runSafe_js_1.runSafe)(() => tool.execute(args, {
-        functionType: metadata.functionType,
-        callId: metadata.callId,
-        functionId: options?.functionId,
-        logging: options?.logging,
-        observers: options?.observers,
-        run,
-    }));
-    const finishMetadata = {
-        ...metadata,
-        eventType: "finished",
-        timestamp: new Date(),
-        startTimestamp: durationMeasurement.startDate,
-        finishTimestamp: new Date(),
-        durationInMs: durationMeasurement.durationInMs,
-    };
-    if (!result.ok) {
-        if (result.isAborted) {
-            eventSource.notify({
-                ...finishMetadata,
-                result: {
-                    status: "abort",
-                },
-            });
-            throw new AbortError_js_1.AbortError();
-        }
-        eventSource.notify({
-            ...finishMetadata,
-            result: {
-                status: "error",
-                error: result.error,
-            },
-        });
-        throw new ToolExecutionError_js_1.ToolExecutionError({
-            toolName: tool.name,
-            input: args,
-            cause: result.error,
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            message: result.error?.message,
-        });
-    }
-    const output = result.value;
-    eventSource.notify({
-        ...finishMetadata,
-        result: {
-            status: "success",
-            value: output,
-        },
-    });
-    return {
-        output,
-        metadata: finishMetadata,
-    };
-}

package/tool/execute-tool/executeTool.d.ts

@@ -1,30 +0,0 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { Tool } from "../Tool.js";
-export type ExecuteToolMetadata = {
-    callId: string;
-    runId?: string;
-    sessionId?: string;
-    userId?: string;
-    functionId?: string;
-    startTimestamp: Date;
-    finishTimestamp: Date;
-    durationInMs: number;
-};
-/**
- * `executeTool` executes a tool with the given parameters.
- */
-export declare function executeTool<TOOL extends Tool<any, any, any>>(// eslint-disable-line @typescript-eslint/no-explicit-any
-params: {
-    tool: TOOL;
-    args: TOOL["parameters"]["_type"];
-    fullResponse?: false;
-} & FunctionOptions): Promise<ReturnType<TOOL["execute"]>>;
-export declare function executeTool<TOOL extends Tool<any, any, any>>(// eslint-disable-line @typescript-eslint/no-explicit-any
-params: {
-    tool: TOOL;
-    args: TOOL["parameters"]["_type"];
-    fullResponse: true;
-} & FunctionOptions): Promise<{
-    output: Awaited<ReturnType<TOOL["execute"]>>;
-    metadata: ExecuteToolMetadata;
-}>;

package/tool/execute-tool/executeTool.js

@@ -1,98 +0,0 @@
-import { nanoid as createId } from "nanoid";
-import { FunctionEventSource } from "../../core/FunctionEventSource.js";
-import { getFunctionObservers, getLogFormat, } from "../../core/ModelFusionConfiguration.js";
-import { AbortError } from "../../core/api/AbortError.js";
-import { getFunctionCallLogger } from "../../core/getFunctionCallLogger.js";
-import { getRun } from "../../core/getRun.js";
-import { startDurationMeasurement } from "../../util/DurationMeasurement.js";
-import { runSafe } from "../../util/runSafe.js";
-import { ToolExecutionError } from "../ToolExecutionError.js";
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export async function executeTool({ tool, args, fullResponse, ...options }) {
-    const callResponse = await doExecuteTool({ tool, args, ...options });
-    return fullResponse ? callResponse : callResponse.output;
-}
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function doExecuteTool({ tool, args, ...options }) {
-    const run = await getRun(options?.run);
-    const eventSource = new FunctionEventSource({
-        observers: [
-            ...getFunctionCallLogger(options?.logging ?? getLogFormat()),
-            ...getFunctionObservers(),
-            ...(run?.functionObserver != null ? [run.functionObserver] : []),
-            ...(options?.observers ?? []),
-        ],
-        errorHandler: run?.errorHandler,
-    });
-    const durationMeasurement = startDurationMeasurement();
-    const metadata = {
-        functionType: "execute-tool",
-        callId: `call-${createId()}`,
-        parentCallId: options?.callId,
-        runId: run?.runId,
-        sessionId: run?.sessionId,
-        userId: run?.userId,
-        functionId: options?.functionId,
-        toolName: tool.name,
-        input: args,
-    };
-    eventSource.notify({
-        ...metadata,
-        eventType: "started",
-        timestamp: durationMeasurement.startDate,
-        startTimestamp: durationMeasurement.startDate,
-    });
-    const result = await runSafe(() => tool.execute(args, {
-        functionType: metadata.functionType,
-        callId: metadata.callId,
-        functionId: options?.functionId,
-        logging: options?.logging,
-        observers: options?.observers,
-        run,
-    }));
-    const finishMetadata = {
-        ...metadata,
-        eventType: "finished",
-        timestamp: new Date(),
-        startTimestamp: durationMeasurement.startDate,
-        finishTimestamp: new Date(),
-        durationInMs: durationMeasurement.durationInMs,
-    };
-    if (!result.ok) {
-        if (result.isAborted) {
-            eventSource.notify({
-                ...finishMetadata,
-                result: {
-                    status: "abort",
-                },
-            });
-            throw new AbortError();
-        }
-        eventSource.notify({
-            ...finishMetadata,
-            result: {
-                status: "error",
-                error: result.error,
-            },
-        });
-        throw new ToolExecutionError({
-            toolName: tool.name,
-            input: args,
-            cause: result.error,
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            message: result.error?.message,
-        });
-    }
-    const output = result.value;
-    eventSource.notify({
-        ...finishMetadata,
-        result: {
-            status: "success",
-            value: output,
-        },
-    });
-    return {
-        output,
-        metadata: finishMetadata,
-    };
-}

package/tool/execute-tool/index.cjs

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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("./ExecuteToolEvent.cjs"), exports);
-__exportStar(require("./executeTool.cjs"), exports);

package/tool/execute-tool/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./ExecuteToolEvent.js";
-export * from "./executeTool.js";

package/tool/execute-tool/index.js

@@ -1,2 +0,0 @@
-export * from "./ExecuteToolEvent.js";
-export * from "./executeTool.js";

package/tool/execute-tool/safeExecuteToolCall.cjs

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeExecuteToolCall = void 0;
-const ToolCallError_js_1 = require("../ToolCallError.cjs");
-const ToolExecutionError_js_1 = require("../ToolExecutionError.cjs");
-const executeTool_js_1 = require("./executeTool.cjs");
-async function safeExecuteToolCall(tool, toolCall, options) {
-    try {
-        return {
-            tool: toolCall.name,
-            toolCall,
-            args: toolCall.args,
-            ok: true,
-            result: await (0, executeTool_js_1.executeTool)({ tool, args: toolCall.args, ...options }),
-        };
-    }
-    catch (error) {
-        // If the error is an AbortError, rethrow it.
-        if (error instanceof Error && error.name === "AbortError") {
-            throw error;
-        }
-        return {
-            tool: toolCall.name,
-            toolCall,
-            args: toolCall.args,
-            ok: false,
-            result: new ToolCallError_js_1.ToolCallError({
-                toolCall,
-                cause: error instanceof ToolExecutionError_js_1.ToolExecutionError ? error.cause : error,
-            }),
-        };
-    }
-}
-exports.safeExecuteToolCall = safeExecuteToolCall;

package/tool/execute-tool/safeExecuteToolCall.d.ts

@@ -1,5 +0,0 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { Tool } from "../Tool.js";
-import { ToolCall } from "../ToolCall.js";
-import { ToolCallResult } from "../ToolCallResult.js";
-export declare function safeExecuteToolCall<TOOL extends Tool<string, unknown, any>>(tool: TOOL, toolCall: ToolCall<TOOL["name"], TOOL["parameters"]>, options?: FunctionOptions): Promise<ToolCallResult<TOOL["name"], TOOL["parameters"], Awaited<ReturnType<TOOL["execute"]>>>>;

package/tool/execute-tool/safeExecuteToolCall.js

@@ -1,30 +0,0 @@
-import { ToolCallError } from "../ToolCallError.js";
-import { ToolExecutionError } from "../ToolExecutionError.js";
-import { executeTool } from "./executeTool.js";
-export async function safeExecuteToolCall(tool, toolCall, options) {
-    try {
-        return {
-            tool: toolCall.name,
-            toolCall,
-            args: toolCall.args,
-            ok: true,
-            result: await executeTool({ tool, args: toolCall.args, ...options }),
-        };
-    }
-    catch (error) {
-        // If the error is an AbortError, rethrow it.
-        if (error instanceof Error && error.name === "AbortError") {
-            throw error;
-        }
-        return {
-            tool: toolCall.name,
-            toolCall,
-            args: toolCall.args,
-            ok: false,
-            result: new ToolCallError({
-                toolCall,
-                cause: error instanceof ToolExecutionError ? error.cause : error,
-            }),
-        };
-    }
-}

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

@@ -1,61 +0,0 @@
-"use strict";
-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");
-class TextGenerationToolCallModel {
-    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 doGenerateToolCall(tool, prompt, options) {
-        const { rawResponse, text, metadata } = await (0, generateText_js_1.generateText)({
-            model: this.model,
-            prompt: this.format.createPrompt(prompt, tool),
-            fullResponse: true,
-            ...options,
-        });
-        try {
-            return {
-                rawResponse,
-                toolCall: this.format.extractToolCall(text, tool),
-                usage: metadata?.usage,
-            };
-        }
-        catch (error) {
-            throw new ToolCallParseError_js_1.ToolCallParseError({
-                toolName: tool.name,
-                valueText: text,
-                cause: error,
-            });
-        }
-    }
-    withSettings(additionalSettings) {
-        return new TextGenerationToolCallModel({
-            model: this.model.withSettings(additionalSettings),
-            format: this.format,
-        });
-    }
-}
-exports.TextGenerationToolCallModel = TextGenerationToolCallModel;

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

@@ -1,35 +0,0 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { TextGenerationModel, TextGenerationModelSettings } from "../../model-function/generate-text/TextGenerationModel.js";
-import { ToolDefinition } from "../ToolDefinition.js";
-import { ToolCallGenerationModel } from "./ToolCallGenerationModel.js";
-export interface ToolCallPromptTemplate<SOURCE_PROMPT, TARGET_PROMPT> {
-    createPrompt: (prompt: SOURCE_PROMPT, tool: ToolDefinition<string, unknown>) => TARGET_PROMPT;
-    extractToolCall: (response: string, tool: ToolDefinition<string, unknown>) => {
-        id: string;
-        args: unknown;
-    } | null;
-}
-export declare class TextGenerationToolCallModel<SOURCE_PROMPT, TARGET_PROMPT, MODEL extends TextGenerationModel<TARGET_PROMPT, TextGenerationModelSettings>> implements ToolCallGenerationModel<SOURCE_PROMPT, MODEL["settings"]> {
-    private readonly model;
-    private readonly format;
-    constructor({ model, format, }: {
-        model: MODEL;
-        format: ToolCallPromptTemplate<SOURCE_PROMPT, TARGET_PROMPT>;
-    });
-    get modelInformation(): import("../../index.js").ModelInformation;
-    get settings(): TextGenerationModelSettings;
-    get settingsForEvent(): Partial<MODEL["settings"]>;
-    doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: SOURCE_PROMPT, options?: FunctionOptions): Promise<{
-        rawResponse: unknown;
-        toolCall: {
-            id: string;
-            args: unknown;
-        } | null;
-        usage: {
-            promptTokens: number;
-            completionTokens: number;
-            totalTokens: number;
-        } | undefined;
-    }>;
-    withSettings(additionalSettings: Partial<MODEL["settings"]>): this;
-}

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

@@ -1,57 +0,0 @@
-import { generateText } from "../../model-function/generate-text/generateText.js";
-import { ToolCallParseError } from "./ToolCallParseError.js";
-export class TextGenerationToolCallModel {
-    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 doGenerateToolCall(tool, prompt, options) {
-        const { rawResponse, text, metadata } = await generateText({
-            model: this.model,
-            prompt: this.format.createPrompt(prompt, tool),
-            fullResponse: true,
-            ...options,
-        });
-        try {
-            return {
-                rawResponse,
-                toolCall: this.format.extractToolCall(text, tool),
-                usage: metadata?.usage,
-            };
-        }
-        catch (error) {
-            throw new ToolCallParseError({
-                toolName: tool.name,
-                valueText: text,
-                cause: error,
-            });
-        }
-    }
-    withSettings(additionalSettings) {
-        return new TextGenerationToolCallModel({
-            model: this.model.withSettings(additionalSettings),
-            format: this.format,
-        });
-    }
-}

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

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,23 +0,0 @@
-import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../../model-function/ModelCallEvent.js";
-export interface ToolCallGenerationStartedEvent extends BaseModelCallStartedEvent {
-    functionType: "generate-tool-call";
-}
-export type ToolCallGenerationFinishedEventResult = {
-    status: "success";
-    rawResponse: unknown;
-    value: unknown;
-    usage?: {
-        promptTokens: number;
-        completionTokens: number;
-        totalTokens: number;
-    };
-} | {
-    status: "error";
-    error: unknown;
-} | {
-    status: "abort";
-};
-export type ToolCallGenerationFinishedEvent = BaseModelCallFinishedEvent & {
-    functionType: "generate-tool-call";
-    result: ToolCallGenerationFinishedEventResult;
-};

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

@@ -1 +0,0 @@
-export {};

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

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,19 +0,0 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { Model, ModelSettings } from "../../model-function/Model.js";
-import { ToolDefinition } from "../ToolDefinition.js";
-export interface ToolCallGenerationModelSettings extends ModelSettings {
-}
-export interface ToolCallGenerationModel<PROMPT, SETTINGS extends ToolCallGenerationModelSettings = ToolCallGenerationModelSettings> extends Model<SETTINGS> {
-    doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: PROMPT, options?: FunctionOptions): PromiseLike<{
-        rawResponse: unknown;
-        toolCall: {
-            id: string;
-            args: unknown;
-        } | null;
-        usage?: {
-            promptTokens: number;
-            completionTokens: number;
-            totalTokens: number;
-        };
-    }>;
-}

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

@@ -1 +0,0 @@
-export {};

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

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolCallParseError = void 0;
-const getErrorMessage_js_1 = require("../../util/getErrorMessage.cjs");
-class ToolCallParseError extends Error {
-    constructor({ toolName, valueText, cause, }) {
-        super(`Tool call parsing failed for '${toolName}'. ` +
-            `Value: ${valueText}.\n` +
-            `Error message: ${(0, getErrorMessage_js_1.getErrorMessage)(cause)}`);
-        Object.defineProperty(this, "toolName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        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 = "ToolCallParseError";
-        this.toolName = toolName;
-        this.cause = cause;
-        this.valueText = valueText;
-    }
-    toJSON() {
-        return {
-            name: this.name,
-            cause: this.cause,
-            message: this.message,
-            stack: this.stack,
-            toolName: this.toolName,
-            valueText: this.valueText,
-        };
-    }
-}
-exports.ToolCallParseError = ToolCallParseError;

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

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

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

@@ -1,40 +0,0 @@
-import { getErrorMessage } from "../../util/getErrorMessage.js";
-export class ToolCallParseError extends Error {
-    constructor({ toolName, valueText, cause, }) {
-        super(`Tool call parsing failed for '${toolName}'. ` +
-            `Value: ${valueText}.\n` +
-            `Error message: ${getErrorMessage(cause)}`);
-        Object.defineProperty(this, "toolName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        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 = "ToolCallParseError";
-        this.toolName = toolName;
-        this.cause = cause;
-        this.valueText = valueText;
-    }
-    toJSON() {
-        return {
-            name: this.name,
-            cause: this.cause,
-            message: this.message,
-            stack: this.stack,
-            toolName: this.toolName,
-            valueText: this.valueText,
-        };
-    }
-}