modelfusion 0.49.0 → 0.50.0

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

@@ -7,7 +7,7 @@ function streamText(model, prompt, options) {
     let accumulatedText = "";
     let lastFullDelta;
     return new AsyncIterableResultPromise_js_1.AsyncIterableResultPromise((0, executeStreamCall_js_1.executeStreamCall)({
-        functionType: "text-streaming",
+        functionType: "stream-text",
         input: prompt,
         model,
         options,

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

@@ -4,7 +4,7 @@ export function streamText(model, prompt, options) {
     let accumulatedText = "";
     let lastFullDelta;
     return new AsyncIterableResultPromise(executeStreamCall({
-        functionType: "text-streaming",
+        functionType: "stream-text",
         input: prompt,
         model,
         options,

package/model-function/generate-transcription/TranscriptionEvent.d.ts

@@ -1,6 +1,6 @@
 import { BaseModelCallFinishedEvent, BaseModelCallStartedEvent } from "../ModelCallEvent.js";
 export interface TranscriptionStartedEvent extends BaseModelCallStartedEvent {
-    functionType: "transcription";
+    functionType: "generate-transcription";
 }
 export type TranscriptionFinishedEventResult = {
     status: "success";
@@ -13,6 +13,6 @@ export type TranscriptionFinishedEventResult = {
     status: "abort";
 };
 export interface TranscriptionFinishedEvent extends BaseModelCallFinishedEvent {
-    functionType: "transcription";
+    functionType: "generate-transcription";
     result: TranscriptionFinishedEventResult;
 }

package/model-function/generate-transcription/generateTranscription.cjs

@@ -19,7 +19,7 @@ const ModelFunctionPromise_js_1 = require("../ModelFunctionPromise.cjs");
  */
 function generateTranscription(model, data, options) {
     return new ModelFunctionPromise_js_1.ModelFunctionPromise((0, executeStandardCall_js_1.executeStandardCall)({
-        functionType: "transcription",
+        functionType: "generate-transcription",
         input: data,
         model,
         options,

package/model-function/generate-transcription/generateTranscription.js

@@ -16,7 +16,7 @@ import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
  */
 export function generateTranscription(model, data, options) {
     return new ModelFunctionPromise(executeStandardCall({
-        functionType: "transcription",
+        functionType: "generate-transcription",
         input: data,
         model,
         options,

package/model-provider/openai/OpenAICompletionModel.d.ts

@@ -148,12 +148,12 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
     doGenerateText(prompt: string, options?: FunctionOptions): Promise<{
         response: {
             object: "text_completion";
-            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
+            model: string;
             id: string;
             created: number;
             choices: {
@@ -221,12 +221,12 @@ declare const OpenAICompletionResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: "text_completion";
-    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
+    model: string;
     id: string;
     created: number;
     choices: {
@@ -237,12 +237,12 @@ declare const OpenAICompletionResponseSchema: z.ZodObject<{
     }[];
 }, {
     object: "text_completion";
-    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
+    model: string;
     id: string;
     created: number;
     choices: {
@@ -265,12 +265,12 @@ export declare const OpenAITextResponseFormat: {
         stream: false;
         handler: ResponseHandler<{
             object: "text_completion";
-            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
+            model: string;
             id: string;
             created: number;
             choices: {

package/model-provider/openai/OpenAICostCalculator.cjs

@@ -19,12 +19,12 @@ class OpenAICostCalculator {
         const type = call.functionType;
         const model = call.model.modelName;
         switch (type) {
-            case "image-generation": {
+            case "generate-image": {
                 return (0, OpenAIImageGenerationModel_js_1.calculateOpenAIImageGenerationCostInMillicents)({
                     settings: call.settings,
                 });
             }
-            case "embedding": {
+            case "embed": {
                 if (model == null) {
                     return null;
                 }
@@ -39,8 +39,8 @@ class OpenAICostCalculator {
                 }
                 break;
             }
-            case "structure-generation":
-            case "text-generation": {
+            case "generate-structure":
+            case "generate-text": {
                 if (model == null) {
                     return null;
                 }
@@ -58,7 +58,7 @@ class OpenAICostCalculator {
                 }
                 break;
             }
-            case "transcription": {
+            case "generate-transcription": {
                 if (model == null) {
                     return null;
                 }

package/model-provider/openai/OpenAICostCalculator.js

@@ -16,12 +16,12 @@ export class OpenAICostCalculator {
         const type = call.functionType;
         const model = call.model.modelName;
         switch (type) {
-            case "image-generation": {
+            case "generate-image": {
                 return calculateOpenAIImageGenerationCostInMillicents({
                     settings: call.settings,
                 });
             }
-            case "embedding": {
+            case "embed": {
                 if (model == null) {
                     return null;
                 }
@@ -36,8 +36,8 @@ export class OpenAICostCalculator {
                 }
                 break;
             }
-            case "structure-generation":
-            case "text-generation": {
+            case "generate-structure":
+            case "generate-text": {
                 if (model == null) {
                     return null;
                 }
@@ -55,7 +55,7 @@ export class OpenAICostCalculator {
                 }
                 break;
             }
-            case "transcription": {
+            case "generate-transcription": {
                 if (model == null) {
                     return null;
                 }

package/model-provider/openai/OpenAITextEmbeddingModel.d.ts

@@ -50,11 +50,11 @@ export declare class OpenAITextEmbeddingModel extends AbstractModel<OpenAITextEm
     doEmbedValues(texts: string[], options?: FunctionOptions): Promise<{
         response: {
             object: "list";
-            model: string;
             usage: {
                 prompt_tokens: number;
                 total_tokens: number;
             };
+            model: string;
             data: {
                 object: "embedding";
                 embedding: number[];
@@ -93,11 +93,11 @@ declare const openAITextEmbeddingResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: "list";
-    model: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
+    model: string;
     data: {
         object: "embedding";
         embedding: number[];
@@ -105,11 +105,11 @@ declare const openAITextEmbeddingResponseSchema: z.ZodObject<{
     }[];
 }, {
     object: "list";
-    model: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
+    model: string;
     data: {
         object: "embedding";
         embedding: number[];

package/model-provider/openai/chat/OpenAIChatModel.d.ts

@@ -158,12 +158,12 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
     doGenerateText(prompt: OpenAIChatMessage[], options?: FunctionOptions): Promise<{
         response: {
             object: "chat.completion";
-            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
+            model: string;
             id: string;
             created: number;
             choices: {
@@ -198,12 +198,12 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
     doGenerateStructure(structureDefinition: StructureDefinition<string, unknown>, prompt: OpenAIChatMessage[], options?: FunctionOptions): Promise<{
         response: {
             object: "chat.completion";
-            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
+            model: string;
             id: string;
             created: number;
             choices: {
@@ -232,12 +232,12 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
     doGenerateStructureOrText(structureDefinitions: Array<StructureDefinition<string, unknown>>, prompt: OpenAIChatMessage[], options?: FunctionOptions): Promise<{
         response: {
             object: "chat.completion";
-            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
+            model: string;
             id: string;
             created: number;
             choices: {
@@ -268,12 +268,12 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
     } | {
         response: {
             object: "chat.completion";
-            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
+            model: string;
             id: string;
             created: number;
             choices: {
@@ -395,12 +395,12 @@ declare const openAIChatResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: "chat.completion";
-    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
+    model: string;
     id: string;
     created: number;
     choices: {
@@ -418,12 +418,12 @@ declare const openAIChatResponseSchema: z.ZodObject<{
     }[];
 }, {
     object: "chat.completion";
-    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
+    model: string;
     id: string;
     created: number;
     choices: {
@@ -453,12 +453,12 @@ export declare const OpenAIChatResponseFormat: {
         stream: false;
         handler: ResponseHandler<{
             object: "chat.completion";
-            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
+            model: string;
             id: string;
             created: number;
             choices: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "Build multimodal applications, chatbots, and agents with JavaScript and TypeScript.",
-  "version": "0.49.0",
+  "version": "0.50.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/retriever/retrieve.cjs

@@ -1,83 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retrieve = void 0;
-const nanoid_1 = require("nanoid");
-const FunctionEventSource_js_1 = require("../core/FunctionEventSource.cjs");
-const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
-const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.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 executeFunctionCall_js_1 = require("../core/executeFunctionCall.cjs");
 async function retrieve(retriever, query, 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, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
-            ...(0, GlobalFunctionObservers_js_1.getGlobalFunctionObservers)(),
-            ...(run?.functionObserver != null ? [run.functionObserver] : []),
-            ...(options?.observers ?? []),
-        ],
-        errorHandler: run?.errorHandler,
-    });
-    const durationMeasurement = (0, DurationMeasurement_js_1.startDurationMeasurement)();
-    const startMetadata = {
+    return (0, executeFunctionCall_js_1.executeFunctionCall)({
+        options,
+        input: query,
         functionType: "retrieve",
-        callId: `call-${(0, nanoid_1.nanoid)()}`,
-        runId: run?.runId,
-        sessionId: run?.sessionId,
-        userId: run?.userId,
-        functionId: options?.functionId,
-        query,
-        timestamp: durationMeasurement.startDate,
-        startTimestamp: durationMeasurement.startDate,
-    };
-    eventSource.notify({
-        eventType: "started",
-        ...startMetadata,
-    });
-    const result = await (0, runSafe_js_1.runSafe)(() => retriever.retrieve(query, {
-        functionId: options?.functionId,
-        logging: options?.logging,
-        observers: options?.observers,
-        run,
-    }));
-    const finishMetadata = {
-        eventType: "finished",
-        ...startMetadata,
-        finishTimestamp: new Date(),
-        durationInMs: durationMeasurement.durationInMs,
-    };
-    if (!result.ok) {
-        if (result.isAborted) {
-            eventSource.notify({
-                ...finishMetadata,
-                eventType: "finished",
-                result: {
-                    status: "abort",
-                },
-            });
-            throw new AbortError_js_1.AbortError();
-        }
-        eventSource.notify({
-            ...finishMetadata,
-            eventType: "finished",
-            result: {
-                status: "error",
-                error: result.error,
-            },
-        });
-        throw result.error;
-    }
-    eventSource.notify({
-        ...finishMetadata,
-        eventType: "finished",
-        result: {
-            status: "success",
-            value: result.value,
-        },
+        execute: (options) => retriever.retrieve(query, options),
+        inputPropertyName: "query",
+        outputPropertyName: "results",
     });
-    return result.value;
 }
 exports.retrieve = retrieve;

package/retriever/retrieve.js

@@ -1,79 +1,11 @@
-import { nanoid as createId } from "nanoid";
-import { FunctionEventSource } from "../core/FunctionEventSource.js";
-import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
-import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.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 { executeFunctionCall } from "../core/executeFunctionCall.js";
 export async function retrieve(retriever, query, options) {
-    const run = await getRun(options?.run);
-    const eventSource = new FunctionEventSource({
-        observers: [
-            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
-            ...getGlobalFunctionObservers(),
-            ...(run?.functionObserver != null ? [run.functionObserver] : []),
-            ...(options?.observers ?? []),
-        ],
-        errorHandler: run?.errorHandler,
-    });
-    const durationMeasurement = startDurationMeasurement();
-    const startMetadata = {
+    return executeFunctionCall({
+        options,
+        input: query,
         functionType: "retrieve",
-        callId: `call-${createId()}`,
-        runId: run?.runId,
-        sessionId: run?.sessionId,
-        userId: run?.userId,
-        functionId: options?.functionId,
-        query,
-        timestamp: durationMeasurement.startDate,
-        startTimestamp: durationMeasurement.startDate,
-    };
-    eventSource.notify({
-        eventType: "started",
-        ...startMetadata,
-    });
-    const result = await runSafe(() => retriever.retrieve(query, {
-        functionId: options?.functionId,
-        logging: options?.logging,
-        observers: options?.observers,
-        run,
-    }));
-    const finishMetadata = {
-        eventType: "finished",
-        ...startMetadata,
-        finishTimestamp: new Date(),
-        durationInMs: durationMeasurement.durationInMs,
-    };
-    if (!result.ok) {
-        if (result.isAborted) {
-            eventSource.notify({
-                ...finishMetadata,
-                eventType: "finished",
-                result: {
-                    status: "abort",
-                },
-            });
-            throw new AbortError();
-        }
-        eventSource.notify({
-            ...finishMetadata,
-            eventType: "finished",
-            result: {
-                status: "error",
-                error: result.error,
-            },
-        });
-        throw result.error;
-    }
-    eventSource.notify({
-        ...finishMetadata,
-        eventType: "finished",
-        result: {
-            status: "success",
-            value: result.value,
-        },
+        execute: (options) => retriever.retrieve(query, options),
+        inputPropertyName: "query",
+        outputPropertyName: "results",
     });
-    return result.value;
 }

package/tool/UseToolEvent.cjs

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

package/tool/UseToolEvent.d.ts

@@ -0,0 +1,7 @@
+import { BaseFunctionFinishedEvent, BaseFunctionStartedEvent } from "../core/FunctionEvent.js";
+export interface UseToolStartedEvent extends BaseFunctionStartedEvent {
+    functionType: "use-tool";
+}
+export interface UseToolFinishedEvent extends BaseFunctionFinishedEvent {
+    functionType: "use-tool";
+}

package/tool/UseToolEvent.js

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

package/tool/UseToolOrGenerateTextEvent.cjs

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

package/tool/UseToolOrGenerateTextEvent.d.ts

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

package/tool/UseToolOrGenerateTextEvent.js

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

package/tool/executeTool.cjs

@@ -69,6 +69,7 @@ async function doExecuteTool(tool, input, options) {
     const metadata = {
         functionType: "execute-tool",
         callId: `call-${(0, nanoid_1.nanoid)()}`,
+        parentCallId: options?.parentCallId,
         runId: run?.runId,
         sessionId: run?.sessionId,
         userId: run?.userId,
@@ -87,6 +88,7 @@ async function doExecuteTool(tool, input, options) {
         logging: options?.logging,
         observers: options?.observers,
         run,
+        parentCallId: metadata.callId,
     }));
     const finishMetadata = {
         ...metadata,

package/tool/executeTool.js

@@ -64,6 +64,7 @@ async function doExecuteTool(tool, input, options) {
     const metadata = {
         functionType: "execute-tool",
         callId: `call-${createId()}`,
+        parentCallId: options?.parentCallId,
         runId: run?.runId,
         sessionId: run?.sessionId,
         userId: run?.userId,
@@ -82,6 +83,7 @@ async function doExecuteTool(tool, input, options) {
         logging: options?.logging,
         observers: options?.observers,
         run,
+        parentCallId: metadata.callId,
     }));
     const finishMetadata = {
         ...metadata,

package/tool/index.cjs

@@ -19,6 +19,8 @@ __exportStar(require("./InvalidToolNameError.cjs"), exports);
 __exportStar(require("./NoSuchToolError.cjs"), exports);
 __exportStar(require("./Tool.cjs"), exports);
 __exportStar(require("./ToolExecutionError.cjs"), exports);
+__exportStar(require("./UseToolEvent.cjs"), exports);
+__exportStar(require("./UseToolOrGenerateTextEvent.cjs"), exports);
 __exportStar(require("./WebSearchTool.cjs"), exports);
 __exportStar(require("./executeTool.cjs"), exports);
 __exportStar(require("./useTool.cjs"), exports);

package/tool/index.d.ts

@@ -3,6 +3,8 @@ export * from "./InvalidToolNameError.js";
 export * from "./NoSuchToolError.js";
 export * from "./Tool.js";
 export * from "./ToolExecutionError.js";
+export * from "./UseToolEvent.js";
+export * from "./UseToolOrGenerateTextEvent.js";
 export * from "./WebSearchTool.js";
 export * from "./executeTool.js";
 export * from "./useTool.js";

package/tool/index.js

@@ -3,6 +3,8 @@ export * from "./InvalidToolNameError.js";
 export * from "./NoSuchToolError.js";
 export * from "./Tool.js";
 export * from "./ToolExecutionError.js";
+export * from "./UseToolEvent.js";
+export * from "./UseToolOrGenerateTextEvent.js";
 export * from "./WebSearchTool.js";
 export * from "./executeTool.js";
 export * from "./useTool.js";

package/tool/useTool.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useTool = void 0;
+const executeFunctionCall_js_1 = require("../core/executeFunctionCall.cjs");
 const generateStructure_js_1 = require("../model-function/generate-structure/generateStructure.cjs");
 const executeTool_js_1 = require("./executeTool.cjs");
 /**
@@ -15,15 +16,22 @@ async function useTool(model, tool, prompt, options) {
     const expandedPrompt = typeof prompt === "function"
         ? prompt(tool)
         : prompt;
-    const { value } = await (0, generateStructure_js_1.generateStructure)(model, {
-        name: tool.name,
-        description: tool.description,
-        schema: tool.inputSchema,
-    }, expandedPrompt, options).asFullResponse();
-    return {
-        tool: tool.name,
-        parameters: value,
-        result: await (0, executeTool_js_1.executeTool)(tool, value, options),
-    };
+    return (0, executeFunctionCall_js_1.executeFunctionCall)({
+        options,
+        input: expandedPrompt,
+        functionType: "use-tool",
+        execute: async (options) => {
+            const { value } = await (0, generateStructure_js_1.generateStructure)(model, {
+                name: tool.name,
+                description: tool.description,
+                schema: tool.inputSchema,
+            }, expandedPrompt, options).asFullResponse();
+            return {
+                tool: tool.name,
+                parameters: value,
+                result: await (0, executeTool_js_1.executeTool)(tool, value, options),
+            };
+        },
+    });
 }
 exports.useTool = useTool;