modelfusion 0.111.0 → 0.112.0

package/tool/{use-tools-or-generate-text/useToolsOrGenerateText.cjs → use-tools/useTools.cjs}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useToolsOrGenerateText = void 0;
+exports.useTools = void 0;
 const executeFunctionCall_js_1 = require("../../core/executeFunctionCall.cjs");
 const ToolCallError_js_1 = require("../ToolCallError.cjs");
 const safeExecuteToolCall_js_1 = require("../execute-tool/safeExecuteToolCall.cjs");
-const generateToolCallsOrText_js_1 = require("../generate-tool-calls-or-text/generateToolCallsOrText.cjs");
-async function useToolsOrGenerateText(model, tools, prompt, options) {
+const generateToolCalls_js_1 = require("../generate-tool-calls/generateToolCalls.cjs");
+async function useTools(model, tools, prompt, options) {
     // Note: PROMPT must not be a function.
     const expandedPrompt = typeof prompt === "function"
         ? prompt(tools)
@@ -13,9 +13,9 @@ async function useToolsOrGenerateText(model, tools, prompt, options) {
     return (0, executeFunctionCall_js_1.executeFunctionCall)({
         options,
         input: expandedPrompt,
-        functionType: "use-tools-or-generate-text",
+        functionType: "use-tools",
         execute: async (options) => {
-            const modelResponse = await (0, generateToolCallsOrText_js_1.generateToolCallsOrText)(model, tools, expandedPrompt, { ...options, fullResponse: false });
+            const modelResponse = await (0, generateToolCalls_js_1.generateToolCalls)(model, tools, expandedPrompt, { ...options, fullResponse: false });
             const { toolCalls, text } = modelResponse;
             // no tool calls:
             if (toolCalls == null) {
@@ -45,4 +45,4 @@ async function useToolsOrGenerateText(model, tools, prompt, options) {
         },
     });
 }
-exports.useToolsOrGenerateText = useToolsOrGenerateText;
+exports.useTools = useTools;

package/tool/{use-tools-or-generate-text/useToolsOrGenerateText.d.ts → use-tools/useTools.d.ts}

@@ -1,7 +1,7 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { Tool } from "../Tool.js";
 import { ToolCallResult } from "../ToolCallResult.js";
-import { ToolCallsOrTextGenerationModel, ToolCallsOrTextGenerationModelSettings } from "../generate-tool-calls-or-text/ToolCallsOrTextGenerationModel.js";
+import { ToolCallsGenerationModel, ToolCallsGenerationModelSettings } from "../generate-tool-calls/ToolCallsGenerationModel.js";
 type ToolArray<T extends Tool<any, any, any>[]> = T;
 type ToToolMap<T extends ToolArray<Tool<any, any, any>[]>> = {
     [K in T[number]["name"]]: Extract<T[number], Tool<K, any, any>>;
@@ -11,7 +11,7 @@ type ToToolCallUnion<T> = {
     [KEY in StringKeys<T>]: T[KEY] extends Tool<any, infer PARAMETERS, infer OUTPUT> ? ToolCallResult<KEY, PARAMETERS, OUTPUT> : never;
 }[StringKeys<T>];
 type ToOutputValue<TOOLS extends ToolArray<Tool<any, any, any>[]>> = ToToolCallUnion<ToToolMap<TOOLS>>;
-export declare function useToolsOrGenerateText<PROMPT, TOOLS extends Array<Tool<any, any, any>>>(model: ToolCallsOrTextGenerationModel<PROMPT, ToolCallsOrTextGenerationModelSettings>, tools: TOOLS, prompt: PROMPT | ((tools: TOOLS) => PROMPT), options?: FunctionOptions): Promise<{
+export declare function useTools<PROMPT, TOOLS extends Array<Tool<any, any, any>>>(model: ToolCallsGenerationModel<PROMPT, ToolCallsGenerationModelSettings>, tools: TOOLS, prompt: PROMPT | ((tools: TOOLS) => PROMPT), options?: FunctionOptions): Promise<{
     text: string | null;
     toolResults: Array<ToOutputValue<TOOLS>> | null;
 }>;

package/tool/{use-tools-or-generate-text/useToolsOrGenerateText.js → use-tools/useTools.js}

@@ -1,8 +1,8 @@
 import { executeFunctionCall } from "../../core/executeFunctionCall.js";
 import { ToolCallError } from "../ToolCallError.js";
 import { safeExecuteToolCall } from "../execute-tool/safeExecuteToolCall.js";
-import { generateToolCallsOrText } from "../generate-tool-calls-or-text/generateToolCallsOrText.js";
-export async function useToolsOrGenerateText(model, tools, prompt, options) {
+import { generateToolCalls } from "../generate-tool-calls/generateToolCalls.js";
+export async function useTools(model, tools, prompt, options) {
     // Note: PROMPT must not be a function.
     const expandedPrompt = typeof prompt === "function"
         ? prompt(tools)
@@ -10,9 +10,9 @@ export async function useToolsOrGenerateText(model, tools, prompt, options) {
     return executeFunctionCall({
         options,
         input: expandedPrompt,
-        functionType: "use-tools-or-generate-text",
+        functionType: "use-tools",
         execute: async (options) => {
-            const modelResponse = await generateToolCallsOrText(model, tools, expandedPrompt, { ...options, fullResponse: false });
+            const modelResponse = await generateToolCalls(model, tools, expandedPrompt, { ...options, fullResponse: false });
             const { toolCalls, text } = modelResponse;
             // no tool calls:
             if (toolCalls == null) {

package/tool/InvalidToolNameError.cjs

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InvalidToolNameError = void 0;
-class InvalidToolNameError extends Error {
-    constructor({ toolName, namePattern, }) {
-        super(`Invalid tool name '${toolName}'. The tool name must match the regular expression pattern ${namePattern}.`);
-        Object.defineProperty(this, "toolName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.name = "InvalidToolNameError";
-        this.toolName = toolName;
-    }
-}
-exports.InvalidToolNameError = InvalidToolNameError;

package/tool/InvalidToolNameError.d.ts

@@ -1,7 +0,0 @@
-export declare class InvalidToolNameError extends Error {
-    readonly toolName: string;
-    constructor({ toolName, namePattern, }: {
-        toolName: string;
-        namePattern: RegExp;
-    });
-}

package/tool/InvalidToolNameError.js

@@ -1,13 +0,0 @@
-export class InvalidToolNameError extends Error {
-    constructor({ toolName, namePattern, }) {
-        super(`Invalid tool name '${toolName}'. The tool name must match the regular expression pattern ${namePattern}.`);
-        Object.defineProperty(this, "toolName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.name = "InvalidToolNameError";
-        this.toolName = toolName;
-    }
-}

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

@@ -1,23 +0,0 @@
-import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../../model-function/ModelCallEvent.js";
-export interface ToolCallsOrTextGenerationStartedEvent extends BaseModelCallStartedEvent {
-    functionType: "generate-tool-calls-or-text";
-}
-export type ToolCallsOrTextGenerationFinishedEventResult = {
-    status: "success";
-    response: unknown;
-    value: unknown;
-    usage?: {
-        promptTokens: number;
-        completionTokens: number;
-        totalTokens: number;
-    };
-} | {
-    status: "error";
-    error: unknown;
-} | {
-    status: "abort";
-};
-export type ToolCallsOrTextGenerationFinishedEvent = BaseModelCallFinishedEvent & {
-    functionType: "generate-tool-calls-or-text";
-    result: ToolCallsOrTextGenerationFinishedEventResult;
-};

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

@@ -1,6 +0,0 @@
-export * from "./TextGenerationToolCallsOrGenerateTextModel.js";
-export * from "./ToolCallsOrGenerateTextPromptTemplate.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,6 +0,0 @@
-export * from "./TextGenerationToolCallsOrGenerateTextModel.js";
-export * from "./ToolCallsOrGenerateTextPromptTemplate.js";
-export * from "./ToolCallsOrTextGenerationEvent.js";
-export * from "./ToolCallsOrTextGenerationModel.js";
-export * from "./ToolCallsOrTextParseError.js";
-export * from "./generateToolCallsOrText.js";

package/tool/use-tools-or-generate-text/UseToolsOrGenerateTextEvent.d.ts

@@ -1,7 +0,0 @@
-import { BaseFunctionFinishedEvent, BaseFunctionStartedEvent } from "../../core/FunctionEvent.js";
-export interface UseToolsOrGenerateTextStartedEvent extends BaseFunctionStartedEvent {
-    functionType: "use-tools-or-generate-text";
-}
-export interface UseToolsOrGenerateTextFinishedEvent extends BaseFunctionFinishedEvent {
-    functionType: "use-tools-or-generate-text";
-}

package/tool/use-tools-or-generate-text/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./UseToolsOrGenerateTextEvent.js";
-export * from "./useToolsOrGenerateText.js";

package/tool/use-tools-or-generate-text/index.js

@@ -1,2 +0,0 @@
-export * from "./UseToolsOrGenerateTextEvent.js";
-export * from "./useToolsOrGenerateText.js";