modelfusion 0.48.0 → 0.50.0

package/model-provider/openai/{OpenAITextGenerationModel.js → OpenAICompletionModel.js}

@@ -84,7 +84,7 @@ export const OPENAI_TEXT_GENERATION_MODELS = {
         completionTokenCostInMillicents: 0.04,
     },
 };
-export function getOpenAITextGenerationModelInformation(model) {
+export function getOpenAICompletionModelInformation(model) {
     // Model is already a base model:
     if (model in OPENAI_TEXT_GENERATION_MODELS) {
         const baseModelInformation = OPENAI_TEXT_GENERATION_MODELS[model];
@@ -111,11 +111,11 @@ export function getOpenAITextGenerationModelInformation(model) {
     }
     throw new Error(`Unknown OpenAI chat base model ${baseModel}.`);
 }
-export const isOpenAITextGenerationModel = (model) => model in OPENAI_TEXT_GENERATION_MODELS ||
+export const isOpenAICompletionModel = (model) => model in OPENAI_TEXT_GENERATION_MODELS ||
     model.startsWith("ft:davinci-002:") ||
     model.startsWith("ft:babbage-002:");
-export const calculateOpenAITextGenerationCostInMillicents = ({ model, response, }) => {
-    const modelInformation = getOpenAITextGenerationModelInformation(model);
+export const calculateOpenAICompletionCostInMillicents = ({ model, response, }) => {
+    const modelInformation = getOpenAICompletionModelInformation(model);
     return (response.usage.prompt_tokens *
         modelInformation.promptTokenCostInMillicents +
         response.usage.completion_tokens *
@@ -127,7 +127,7 @@ export const calculateOpenAITextGenerationCostInMillicents = ({ model, response,
  * @see https://platform.openai.com/docs/api-reference/completions/create
  *
  * @example
- * const model = new OpenAITextGenerationModel({
+ * const model = new OpenAICompletionModel({
  *   model: "gpt-3.5-turbo-instruct",
  *   temperature: 0.7,
  *   maxCompletionTokens: 500,
@@ -139,7 +139,7 @@ export const calculateOpenAITextGenerationCostInMillicents = ({ model, response,
  *   "Write a short story about a robot learning to love:\n\n"
  * );
  */
-export class OpenAITextGenerationModel extends AbstractModel {
+export class OpenAICompletionModel extends AbstractModel {
     constructor(settings) {
         super({ settings });
         Object.defineProperty(this, "provider", {
@@ -160,7 +160,7 @@ export class OpenAITextGenerationModel extends AbstractModel {
             writable: true,
             value: void 0
         });
-        const modelInformation = getOpenAITextGenerationModelInformation(this.settings.model);
+        const modelInformation = getOpenAICompletionModelInformation(this.settings.model);
         this.tokenizer = new TikTokenTokenizer({
             model: modelInformation.baseModel,
         });
@@ -189,7 +189,7 @@ export class OpenAITextGenerationModel extends AbstractModel {
         return callWithRetryAndThrottle({
             retry: callSettings.api?.retry,
             throttle: callSettings.api?.throttle,
-            call: async () => callOpenAITextGenerationAPI(callSettings),
+            call: async () => callOpenAICompletionAPI(callSettings),
         });
     }
     get settingsForEvent() {
@@ -254,10 +254,10 @@ export class OpenAITextGenerationModel extends AbstractModel {
         });
     }
     withSettings(additionalSettings) {
-        return new OpenAITextGenerationModel(Object.assign({}, this.settings, additionalSettings));
+        return new OpenAICompletionModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-const openAITextGenerationResponseSchema = z.object({
+const OpenAICompletionResponseSchema = z.object({
     id: z.string(),
     object: z.literal("text_completion"),
     created: z.number(),
@@ -274,7 +274,7 @@ const openAITextGenerationResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
-async function callOpenAITextGenerationAPI({ api = new OpenAIApiConfiguration(), abortSignal, responseFormat, model, prompt, suffix, maxTokens, temperature, topP, n, logprobs, echo, stop, presencePenalty, frequencyPenalty, bestOf, logitBias, user, }) {
+async function callOpenAICompletionAPI({ api = new OpenAIApiConfiguration(), abortSignal, responseFormat, model, prompt, suffix, maxTokens, temperature, topP, n, logprobs, echo, stop, presencePenalty, frequencyPenalty, bestOf, logitBias, user, }) {
     // empty arrays are not allowed for stop:
     if (stop != null && Array.isArray(stop) && stop.length === 0) {
         stop = undefined;
@@ -311,7 +311,7 @@ export const OpenAITextResponseFormat = {
      */
     json: {
         stream: false,
-        handler: createJsonResponseHandler(openAITextGenerationResponseSchema),
+        handler: createJsonResponseHandler(OpenAICompletionResponseSchema),
     },
     /**
      * Returns an async iterable over the full deltas (all choices, including full current state at time of event)

package/model-provider/openai/OpenAICostCalculator.cjs

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAICostCalculator = void 0;
 const OpenAIImageGenerationModel_js_1 = require("./OpenAIImageGenerationModel.cjs");
 const OpenAITextEmbeddingModel_js_1 = require("./OpenAITextEmbeddingModel.cjs");
-const OpenAITextGenerationModel_js_1 = require("./OpenAITextGenerationModel.cjs");
+const OpenAICompletionModel_js_1 = require("./OpenAICompletionModel.cjs");
 const OpenAITranscriptionModel_js_1 = require("./OpenAITranscriptionModel.cjs");
 const OpenAIChatModel_js_1 = require("./chat/OpenAIChatModel.cjs");
 class OpenAICostCalculator {
@@ -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;
                 }
@@ -50,15 +50,15 @@ class OpenAICostCalculator {
                         response: call.result.response,
                     });
                 }
-                if ((0, OpenAITextGenerationModel_js_1.isOpenAITextGenerationModel)(model)) {
-                    return (0, OpenAITextGenerationModel_js_1.calculateOpenAITextGenerationCostInMillicents)({
+                if ((0, OpenAICompletionModel_js_1.isOpenAICompletionModel)(model)) {
+                    return (0, OpenAICompletionModel_js_1.calculateOpenAICompletionCostInMillicents)({
                         model,
                         response: call.result.response,
                     });
                 }
                 break;
             }
-            case "transcription": {
+            case "generate-transcription": {
                 if (model == null) {
                     return null;
                 }

package/model-provider/openai/OpenAICostCalculator.js

@@ -1,6 +1,6 @@
 import { calculateOpenAIImageGenerationCostInMillicents, } from "./OpenAIImageGenerationModel.js";
 import { calculateOpenAIEmbeddingCostInMillicents, isOpenAIEmbeddingModel, } from "./OpenAITextEmbeddingModel.js";
-import { calculateOpenAITextGenerationCostInMillicents, isOpenAITextGenerationModel, } from "./OpenAITextGenerationModel.js";
+import { calculateOpenAICompletionCostInMillicents, isOpenAICompletionModel, } from "./OpenAICompletionModel.js";
 import { calculateOpenAITranscriptionCostInMillicents, } from "./OpenAITranscriptionModel.js";
 import { calculateOpenAIChatCostInMillicents, isOpenAIChatModel, } from "./chat/OpenAIChatModel.js";
 export class OpenAICostCalculator {
@@ -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;
                 }
@@ -47,15 +47,15 @@ export class OpenAICostCalculator {
                         response: call.result.response,
                     });
                 }
-                if (isOpenAITextGenerationModel(model)) {
-                    return calculateOpenAITextGenerationCostInMillicents({
+                if (isOpenAICompletionModel(model)) {
+                    return calculateOpenAICompletionCostInMillicents({
                         model,
                         response: call.result.response,
                     });
                 }
                 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/OpenAITranscriptionModel.d.ts

@@ -4,7 +4,7 @@ import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { TranscriptionModel, TranscriptionModelSettings } from "../../model-function/transcribe-speech/TranscriptionModel.js";
+import { TranscriptionModel, TranscriptionModelSettings } from "../../model-function/generate-transcription/TranscriptionModel.js";
 /**
  * @see https://openai.com/pricing
  */

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

@@ -1,6 +1,6 @@
 import { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 import { OpenAITextEmbeddingModelType } from "./OpenAITextEmbeddingModel.js";
-import { OpenAITextGenerationBaseModelType } from "./OpenAITextGenerationModel.js";
+import { OpenAICompletionBaseModelType } from "./OpenAICompletionModel.js";
 import { OpenAIChatBaseModelType } from "./chat/OpenAIChatModel.js";
 /**
  * TikToken tokenizer for OpenAI language models.
@@ -22,7 +22,7 @@ export declare class TikTokenTokenizer implements FullTokenizer {
      * Get a TikToken tokenizer for a specific model or encoding.
      */
     constructor(options: {
-        model: OpenAIChatBaseModelType | OpenAITextGenerationBaseModelType | OpenAITextEmbeddingModelType;
+        model: OpenAIChatBaseModelType | OpenAICompletionBaseModelType | OpenAITextEmbeddingModelType;
     });
     private readonly tiktoken;
     tokenize(text: string): Promise<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/model-provider/openai/index.cjs

@@ -22,7 +22,7 @@ var OpenAIError_js_1 = require("./OpenAIError.cjs");
 Object.defineProperty(exports, "OpenAIError", { enumerable: true, get: function () { return OpenAIError_js_1.OpenAIError; } });
 __exportStar(require("./OpenAIImageGenerationModel.cjs"), exports);
 __exportStar(require("./OpenAITextEmbeddingModel.cjs"), exports);
-__exportStar(require("./OpenAITextGenerationModel.cjs"), exports);
+__exportStar(require("./OpenAICompletionModel.cjs"), exports);
 __exportStar(require("./OpenAITranscriptionModel.cjs"), exports);
 __exportStar(require("./TikTokenTokenizer.cjs"), exports);
 __exportStar(require("./chat/OpenAIChatMessage.cjs"), exports);

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

@@ -4,7 +4,7 @@ export * from "./OpenAICostCalculator.js";
 export { OpenAIError, OpenAIErrorData } from "./OpenAIError.js";
 export * from "./OpenAIImageGenerationModel.js";
 export * from "./OpenAITextEmbeddingModel.js";
-export * from "./OpenAITextGenerationModel.js";
+export * from "./OpenAICompletionModel.js";
 export * from "./OpenAITranscriptionModel.js";
 export * from "./TikTokenTokenizer.js";
 export * from "./chat/OpenAIChatMessage.js";

package/model-provider/openai/index.js

@@ -4,7 +4,7 @@ export * from "./OpenAICostCalculator.js";
 export { OpenAIError } from "./OpenAIError.js";
 export * from "./OpenAIImageGenerationModel.js";
 export * from "./OpenAITextEmbeddingModel.js";
-export * from "./OpenAITextGenerationModel.js";
+export * from "./OpenAICompletionModel.js";
 export * from "./OpenAITranscriptionModel.js";
 export * from "./TikTokenTokenizer.js";
 export * from "./chat/OpenAIChatMessage.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "Build multimodal applications, chatbots, and agents with JavaScript and TypeScript.",
-  "version": "0.48.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.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/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/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";