modelfusion 0.13.0 → 0.15.0

package/prompt/index.cjs

@@ -14,14 +14,14 @@ 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("./AlpacaPromptMapping.cjs"), exports);
+__exportStar(require("./AlpacaPromptFormat.cjs"), exports);
 __exportStar(require("./InstructionPrompt.cjs"), exports);
-__exportStar(require("./Llama2PromptMapping.cjs"), exports);
-__exportStar(require("./OpenAIChatPromptMapping.cjs"), exports);
-__exportStar(require("./PromptMapping.cjs"), exports);
-__exportStar(require("./PromptMappingTextGenerationModel.cjs"), exports);
-__exportStar(require("./TextPromptMapping.cjs"), exports);
-__exportStar(require("./VicunaPromptMapping.cjs"), exports);
+__exportStar(require("./Llama2PromptFormat.cjs"), exports);
+__exportStar(require("./OpenAIChatPromptFormat.cjs"), exports);
+__exportStar(require("./PromptFormat.cjs"), exports);
+__exportStar(require("./PromptFormatTextGenerationModel.cjs"), exports);
+__exportStar(require("./TextPromptFormat.cjs"), exports);
+__exportStar(require("./VicunaPromptFormat.cjs"), exports);
 __exportStar(require("./chat/ChatPrompt.cjs"), exports);
 __exportStar(require("./chat/trimChatPrompt.cjs"), exports);
 __exportStar(require("./chat/validateChatPrompt.cjs"), exports);

package/prompt/index.d.ts

@@ -1,11 +1,11 @@
-export * from "./AlpacaPromptMapping.js";
+export * from "./AlpacaPromptFormat.js";
 export * from "./InstructionPrompt.js";
-export * from "./Llama2PromptMapping.js";
-export * from "./OpenAIChatPromptMapping.js";
-export * from "./PromptMapping.js";
-export * from "./PromptMappingTextGenerationModel.js";
-export * from "./TextPromptMapping.js";
-export * from "./VicunaPromptMapping.js";
+export * from "./Llama2PromptFormat.js";
+export * from "./OpenAIChatPromptFormat.js";
+export * from "./PromptFormat.js";
+export * from "./PromptFormatTextGenerationModel.js";
+export * from "./TextPromptFormat.js";
+export * from "./VicunaPromptFormat.js";
 export * from "./chat/ChatPrompt.js";
 export * from "./chat/trimChatPrompt.js";
 export * from "./chat/validateChatPrompt.js";

package/prompt/index.js

@@ -1,11 +1,11 @@
-export * from "./AlpacaPromptMapping.js";
+export * from "./AlpacaPromptFormat.js";
 export * from "./InstructionPrompt.js";
-export * from "./Llama2PromptMapping.js";
-export * from "./OpenAIChatPromptMapping.js";
-export * from "./PromptMapping.js";
-export * from "./PromptMappingTextGenerationModel.js";
-export * from "./TextPromptMapping.js";
-export * from "./VicunaPromptMapping.js";
+export * from "./Llama2PromptFormat.js";
+export * from "./OpenAIChatPromptFormat.js";
+export * from "./PromptFormat.js";
+export * from "./PromptFormatTextGenerationModel.js";
+export * from "./TextPromptFormat.js";
+export * from "./VicunaPromptFormat.js";
 export * from "./chat/ChatPrompt.js";
 export * from "./chat/trimChatPrompt.js";
 export * from "./chat/validateChatPrompt.js";

package/tool/WebSearchTool.cjs

@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSearchTool = void 0;
 const zod_1 = require("zod");
 const Tool_js_1 = require("./Tool.cjs");
-const INPUT_SCHEMA = zod_1.z.object({
-    query: zod_1.z.string(),
-});
 const OUTPUT_SCHEMA = zod_1.z.object({
     results: zod_1.z.array(zod_1.z.object({
         title: zod_1.z.string(),
@@ -13,39 +10,21 @@ const OUTPUT_SCHEMA = zod_1.z.object({
         snippet: zod_1.z.string(),
     })),
 });
+// expose the schemas to library consumers:
+const createInputSchema = (description) => 
+// same structure, but with description:
+zod_1.z.object({
+    query: zod_1.z.string().describe(description),
+});
 class WebSearchTool extends Tool_js_1.Tool {
     constructor({ name, description, queryDescription = "Search query", execute, }) {
         super({
             name,
             description,
-            inputSchema: WebSearchTool.createInputSchema(queryDescription),
+            inputSchema: createInputSchema(queryDescription),
             outputSchema: OUTPUT_SCHEMA,
             execute,
         });
-        Object.defineProperty(this, "outputSchema", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.outputSchema = OUTPUT_SCHEMA;
     }
 }
 exports.WebSearchTool = WebSearchTool;
-// expose the schemas to library consumers:
-Object.defineProperty(WebSearchTool, "createInputSchema", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: (description) => 
-    // same structure, but with description:
-    zod_1.z.object({
-        query: zod_1.z.string().describe(description),
-    })
-});
-Object.defineProperty(WebSearchTool, "createOutputSchema", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: () => OUTPUT_SCHEMA
-});

package/tool/WebSearchTool.d.ts

@@ -1,80 +1,19 @@
-import { z } from "zod";
 import { Tool } from "./Tool.js";
-declare const INPUT_SCHEMA: z.ZodObject<{
-    query: z.ZodString;
-}, "strip", z.ZodTypeAny, {
+export type WebSearchToolInput = {
     query: string;
-}, {
-    query: string;
-}>;
-declare const OUTPUT_SCHEMA: z.ZodObject<{
-    results: z.ZodArray<z.ZodObject<{
-        title: z.ZodString;
-        link: z.ZodString;
-        snippet: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        link: string;
-        title: string;
-        snippet: string;
-    }, {
-        link: string;
-        title: string;
-        snippet: string;
-    }>, "many">;
-}, "strip", z.ZodTypeAny, {
+};
+export type WebSearchToolOutput = {
     results: {
-        link: string;
         title: string;
-        snippet: string;
-    }[];
-}, {
-    results: {
         link: string;
-        title: string;
         snippet: string;
     }[];
-}>;
-export declare class WebSearchTool<NAME extends string> extends Tool<NAME, z.infer<typeof INPUT_SCHEMA>, z.infer<typeof OUTPUT_SCHEMA>> {
-    static readonly createInputSchema: (description: string) => z.ZodObject<{
-        query: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        query: string;
-    }, {
-        query: string;
-    }>;
-    static readonly createOutputSchema: () => z.ZodObject<{
-        results: z.ZodArray<z.ZodObject<{
-            title: z.ZodString;
-            link: z.ZodString;
-            snippet: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            link: string;
-            title: string;
-            snippet: string;
-        }, {
-            link: string;
-            title: string;
-            snippet: string;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        results: {
-            link: string;
-            title: string;
-            snippet: string;
-        }[];
-    }, {
-        results: {
-            link: string;
-            title: string;
-            snippet: string;
-        }[];
-    }>;
-    readonly outputSchema: typeof OUTPUT_SCHEMA;
+};
+export declare class WebSearchTool<NAME extends string> extends Tool<NAME, WebSearchToolInput, WebSearchToolOutput> {
     constructor({ name, description, queryDescription, execute, }: {
         name: NAME;
         description: string;
         queryDescription?: string;
-        execute(input: z.infer<typeof INPUT_SCHEMA>): Promise<z.infer<typeof OUTPUT_SCHEMA>>;
+        execute(input: WebSearchToolInput): Promise<WebSearchToolOutput>;
     });
 }
-export {};

package/tool/WebSearchTool.js

@@ -1,8 +1,5 @@
 import { z } from "zod";
 import { Tool } from "./Tool.js";
-const INPUT_SCHEMA = z.object({
-    query: z.string(),
-});
 const OUTPUT_SCHEMA = z.object({
     results: z.array(z.object({
         title: z.string(),
@@ -10,38 +7,20 @@ const OUTPUT_SCHEMA = z.object({
         snippet: z.string(),
     })),
 });
+// expose the schemas to library consumers:
+const createInputSchema = (description) => 
+// same structure, but with description:
+z.object({
+    query: z.string().describe(description),
+});
 export class WebSearchTool extends Tool {
     constructor({ name, description, queryDescription = "Search query", execute, }) {
         super({
             name,
             description,
-            inputSchema: WebSearchTool.createInputSchema(queryDescription),
+            inputSchema: createInputSchema(queryDescription),
             outputSchema: OUTPUT_SCHEMA,
             execute,
         });
-        Object.defineProperty(this, "outputSchema", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.outputSchema = OUTPUT_SCHEMA;
     }
 }
-// expose the schemas to library consumers:
-Object.defineProperty(WebSearchTool, "createInputSchema", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: (description) => 
-    // same structure, but with description:
-    z.object({
-        query: z.string().describe(description),
-    })
-});
-Object.defineProperty(WebSearchTool, "createOutputSchema", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: () => OUTPUT_SCHEMA
-});

package/tool/executeTool.cjs

@@ -7,6 +7,7 @@ const DurationMeasurement_js_1 = require("../util/DurationMeasurement.cjs");
 const AbortError_js_1 = require("../util/api/AbortError.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, input, options) {
     const run = options?.run;
     const eventSource = new RunFunctionEventSource_js_1.RunFunctionEventSource({

package/tool/executeTool.d.ts

@@ -1,5 +1,6 @@
 import { FunctionOptions } from "../model-function/FunctionOptions.js";
 import { Tool } from "./Tool.js";
+import { z } from "zod";
 export type ExecuteToolMetadata = {
     callId: string;
     runId?: string;
@@ -12,12 +13,12 @@ export type ExecuteToolMetadata = {
 /**
  * `executeTool` directly executes a tool with the given parameters.
  */
-export declare function executeTool<INPUT, OUTPUT>(tool: Tool<string, INPUT, OUTPUT>, input: INPUT, options: FunctionOptions<undefined> & {
+export declare function executeTool<TOOL extends Tool<any, any, any>>(tool: TOOL, input: z.infer<TOOL["inputSchema"]>, options: FunctionOptions<undefined> & {
     fullResponse: true;
 }): Promise<{
-    output: OUTPUT;
+    output: Awaited<ReturnType<TOOL["execute"]>>;
     metadata: ExecuteToolMetadata;
 }>;
-export declare function executeTool<INPUT, OUTPUT>(tool: Tool<string, INPUT, OUTPUT>, input: INPUT, options?: FunctionOptions<undefined> & {
+export declare function executeTool<TOOL extends Tool<any, any, any>>(tool: TOOL, input: z.infer<TOOL["inputSchema"]>, options?: FunctionOptions<undefined> & {
     fullResponse?: false;
-}): Promise<OUTPUT>;
+}): Promise<ReturnType<TOOL["execute"]>>;

package/tool/executeTool.js

@@ -4,6 +4,7 @@ import { startDurationMeasurement } from "../util/DurationMeasurement.js";
 import { AbortError } from "../util/api/AbortError.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, input, options) {
     const run = options?.run;
     const eventSource = new RunFunctionEventSource({

package/prompt/Llama2PromptMapping.d.ts

@@ -1,10 +0,0 @@
-import { PromptMapping } from "./PromptMapping.js";
-import { InstructionPrompt } from "./InstructionPrompt.js";
-import { ChatPrompt } from "./chat/ChatPrompt.js";
-/**
- * Maps an instruction prompt to the Llama2 prompt format.
- *
- * @see https://www.philschmid.de/llama-2#how-to-prompt-llama-2-chat
- */
-export declare const InstructionToLlama2PromptMapping: () => PromptMapping<InstructionPrompt, string>;
-export declare const ChatToLlama2PromptMapping: () => PromptMapping<ChatPrompt, string>;

package/prompt/OpenAIChatPromptMapping.d.ts

@@ -1,6 +0,0 @@
-import { OpenAIChatMessage } from "../model-provider/openai/chat/OpenAIChatMessage.js";
-import { ChatPrompt } from "./chat/ChatPrompt.js";
-import { InstructionPrompt } from "./InstructionPrompt.js";
-import { PromptMapping } from "./PromptMapping.js";
-export declare const InstructionToOpenAIChatPromptMapping: () => PromptMapping<InstructionPrompt, Array<OpenAIChatMessage>>;
-export declare const ChatToOpenAIChatPromptMapping: () => PromptMapping<ChatPrompt, Array<OpenAIChatMessage>>;

package/prompt/PromptMapping.d.ts

@@ -1,7 +0,0 @@
-/**
- * Prompt mappings map a source prompt format to a target prompt format.
- */
-export interface PromptMapping<SOURCE_PROMPT, TARGET_PROMPT> {
-    map(sourcePrompt: SOURCE_PROMPT): TARGET_PROMPT;
-    stopTokens: string[];
-}

package/prompt/TextPromptMapping.d.ts

@@ -1,14 +0,0 @@
-import { PromptMapping } from "./PromptMapping.js";
-import { InstructionPrompt } from "./InstructionPrompt.js";
-import { ChatPrompt } from "./chat/ChatPrompt.js";
-export declare const InstructionToTextPromptMapping: () => PromptMapping<InstructionPrompt, string>;
-/**
- * A mapping from a chat prompt to a text prompt.
- *
- * @param user The label of the user in the chat.
- * @param ai The name of the AI in the chat.
- */
-export declare const ChatToTextPromptMapping: ({ user, ai, }: {
-    user: string;
-    ai: string;
-}) => PromptMapping<ChatPrompt, string>;