modelfusion 0.57.2 → 0.59.0

package/model-function/generate-text/generateText.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
+import { ModelCallMetadata } from "../ModelCallMetadata.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "./TextGenerationModel.js";
 /**
  * Generate text for a prompt and return it as a string.
@@ -20,6 +20,15 @@ import { TextGenerationModel, TextGenerationModelSettings } from "./TextGenerati
  * @param {PROMPT} prompt - The prompt to use for text generation.
  * @param {FunctionOptions} [options] - Optional parameters for the function.
  *
- * @returns {ModelFunctionPromise<string>} - A promise that resolves to the generated text.
+ * @returns {Promise<string>} - A promise that resolves to the generated text.
  */
-export declare function generateText<PROMPT>(model: TextGenerationModel<PROMPT, TextGenerationModelSettings>, prompt: PROMPT, options?: FunctionOptions): ModelFunctionPromise<string>;
+export declare function generateText<PROMPT>(model: TextGenerationModel<PROMPT, TextGenerationModelSettings>, prompt: PROMPT, options?: FunctionOptions & {
+    returnType?: "text";
+}): Promise<string>;
+export declare function generateText<PROMPT>(model: TextGenerationModel<PROMPT, TextGenerationModelSettings>, prompt: PROMPT, options: FunctionOptions & {
+    returnType: "full";
+}): Promise<{
+    value: string;
+    response: unknown;
+    metadata: ModelCallMetadata;
+}>;

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

@@ -1,28 +1,6 @@
 import { executeStandardCall } from "../executeStandardCall.js";
-import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
-/**
- * Generate text for a prompt and return it as a string.
- *
- * The prompt depends on the model used.
- * For instance, OpenAI completion models expect a string prompt,
- * whereas OpenAI chat models expect an array of chat messages.
- *
- * @see https://modelfusion.dev/guide/function/generate-text
- *
- * @example
- * const text = await generateText(
- *   new OpenAICompletionModel(...),
- *   "Write a short story about a robot learning to love:\n\n"
- * );
- *
- * @param {TextGenerationModel<PROMPT, TextGenerationModelSettings>} model - The text generation model to use.
- * @param {PROMPT} prompt - The prompt to use for text generation.
- * @param {FunctionOptions} [options] - Optional parameters for the function.
- *
- * @returns {ModelFunctionPromise<string>} - A promise that resolves to the generated text.
- */
-export function generateText(model, prompt, options) {
-    return new ModelFunctionPromise(executeStandardCall({
+export async function generateText(model, prompt, options) {
+    const fullResponse = await executeStandardCall({
         functionType: "generate-text",
         input: prompt,
         model,
@@ -32,11 +10,10 @@ export function generateText(model, prompt, options) {
             const shouldTrimWhitespace = model.settings.trimWhitespace ?? true;
             return {
                 response: result.response,
-                extractedValue: shouldTrimWhitespace
-                    ? result.text.trim()
-                    : result.text,
+                extractedValue: shouldTrimWhitespace ? result.text.trim() : result.text,
                 usage: result.usage,
             };
         },
-    }));
+    });
+    return options?.returnType === "full" ? fullResponse : fullResponse.value;
 }

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

@@ -1,37 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.streamText = void 0;
-const AsyncIterableResultPromise_js_1 = require("../AsyncIterableResultPromise.cjs");
 const executeStreamCall_js_1 = require("../executeStreamCall.cjs");
-/**
- * Stream the generated text for a prompt as an async iterable.
- *
- * The prompt depends on the model used.
- * For instance, OpenAI completion models expect a string prompt,
- * whereas OpenAI chat models expect an array of chat messages.
- *
- * @see https://modelfusion.dev/guide/function/generate-text
- *
- * @example
- * const textStream = await streamText(
- *   new OpenAICompletionModel(...),
- *   "Write a short story about a robot learning to love:\n\n"
- * );
- *
- * for await (const textPart of textStream) {
- *   // ...
- * }
- *
- * @param {TextStreamingModel<PROMPT>} model - The model to stream text from.
- * @param {PROMPT} prompt - The prompt to use for text generation.
- * @param {FunctionOptions} [options] - Optional parameters for the function.
- *
- * @returns {AsyncIterableResultPromise<string>} An async iterable promise that yields the generated text.
- */
-function streamText(model, prompt, options) {
+async function streamText(model, prompt, options) {
     let accumulatedText = "";
     let lastFullDelta;
-    return new AsyncIterableResultPromise_js_1.AsyncIterableResultPromise((0, executeStreamCall_js_1.executeStreamCall)({
+    const fullResponse = await (0, executeStreamCall_js_1.executeStreamCall)({
         functionType: "stream-text",
         input: prompt,
         model,
@@ -50,6 +24,7 @@ function streamText(model, prompt, options) {
             response: lastFullDelta,
             value: accumulatedText,
         }),
-    }));
+    });
+    return options?.returnType === "full" ? fullResponse : fullResponse.value;
 }
 exports.streamText = streamText;

package/model-function/generate-text/streamText.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { AsyncIterableResultPromise } from "../AsyncIterableResultPromise.js";
+import { ModelCallMetadata } from "../ModelCallMetadata.js";
 import { TextStreamingModel } from "./TextGenerationModel.js";
 /**
  * Stream the generated text for a prompt as an async iterable.
@@ -26,4 +26,12 @@ import { TextStreamingModel } from "./TextGenerationModel.js";
  *
  * @returns {AsyncIterableResultPromise<string>} An async iterable promise that yields the generated text.
  */
-export declare function streamText<PROMPT>(model: TextStreamingModel<PROMPT>, prompt: PROMPT, options?: FunctionOptions): AsyncIterableResultPromise<string>;
+export declare function streamText<PROMPT>(model: TextStreamingModel<PROMPT>, prompt: PROMPT, options?: FunctionOptions & {
+    returnType?: "text-stream";
+}): Promise<AsyncIterable<string>>;
+export declare function streamText<PROMPT>(model: TextStreamingModel<PROMPT>, prompt: PROMPT, options: FunctionOptions & {
+    returnType: "full";
+}): Promise<{
+    value: AsyncIterable<string>;
+    metadata: Omit<ModelCallMetadata, "durationInMs" | "finishTimestamp">;
+}>;

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

@@ -1,34 +1,8 @@
-import { AsyncIterableResultPromise } from "../AsyncIterableResultPromise.js";
 import { executeStreamCall } from "../executeStreamCall.js";
-/**
- * Stream the generated text for a prompt as an async iterable.
- *
- * The prompt depends on the model used.
- * For instance, OpenAI completion models expect a string prompt,
- * whereas OpenAI chat models expect an array of chat messages.
- *
- * @see https://modelfusion.dev/guide/function/generate-text
- *
- * @example
- * const textStream = await streamText(
- *   new OpenAICompletionModel(...),
- *   "Write a short story about a robot learning to love:\n\n"
- * );
- *
- * for await (const textPart of textStream) {
- *   // ...
- * }
- *
- * @param {TextStreamingModel<PROMPT>} model - The model to stream text from.
- * @param {PROMPT} prompt - The prompt to use for text generation.
- * @param {FunctionOptions} [options] - Optional parameters for the function.
- *
- * @returns {AsyncIterableResultPromise<string>} An async iterable promise that yields the generated text.
- */
-export function streamText(model, prompt, options) {
+export async function streamText(model, prompt, options) {
     let accumulatedText = "";
     let lastFullDelta;
-    return new AsyncIterableResultPromise(executeStreamCall({
+    const fullResponse = await executeStreamCall({
         functionType: "stream-text",
         input: prompt,
         model,
@@ -47,5 +21,6 @@ export function streamText(model, prompt, options) {
             response: lastFullDelta,
             value: accumulatedText,
         }),
-    }));
+    });
+    return options?.returnType === "full" ? fullResponse : fullResponse.value;
 }

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

@@ -2,28 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTranscription = void 0;
 const executeStandardCall_js_1 = require("../executeStandardCall.cjs");
-const ModelFunctionPromise_js_1 = require("../ModelFunctionPromise.cjs");
-/**
- * Transcribe audio data into text. Also called speech-to-text (STT) or automatic speech recognition (ASR).
- *
- * @see https://modelfusion.dev/guide/function/generate-transcription
- *
- * @example
- * const data = await fs.promises.readFile("data/test.mp3");
- *
- * const transcription = await generateTranscription(
- *   new OpenAITranscriptionModel({ model: "whisper-1" }),
- *   { type: "mp3", data }
- * );
- *
- * @param {TranscriptionModel<DATA, TranscriptionModelSettings>} model - The model to use for transcription.
- * @param {DATA} data - The data to transcribe.
- * @param {FunctionOptions} [options] - Optional parameters for the function.
- *
- * @returns {ModelFunctionPromise<string>} A promise that resolves to the transcribed text.
- */
-function generateTranscription(model, data, options) {
-    return new ModelFunctionPromise_js_1.ModelFunctionPromise((0, executeStandardCall_js_1.executeStandardCall)({
+async function generateTranscription(model, data, options) {
+    const fullResponse = await (0, executeStandardCall_js_1.executeStandardCall)({
         functionType: "generate-transcription",
         input: data,
         model,
@@ -35,6 +15,7 @@ function generateTranscription(model, data, options) {
                 extractedValue: result.transcription,
             };
         },
-    }));
+    });
+    return options?.returnType === "full" ? fullResponse : fullResponse.value;
 }
 exports.generateTranscription = generateTranscription;

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

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
+import { ModelCallMetadata } from "../ModelCallMetadata.js";
 import { TranscriptionModel, TranscriptionModelSettings } from "./TranscriptionModel.js";
 /**
  * Transcribe audio data into text. Also called speech-to-text (STT) or automatic speech recognition (ASR).
@@ -18,6 +18,15 @@ import { TranscriptionModel, TranscriptionModelSettings } from "./TranscriptionM
  * @param {DATA} data - The data to transcribe.
  * @param {FunctionOptions} [options] - Optional parameters for the function.
  *
- * @returns {ModelFunctionPromise<string>} A promise that resolves to the transcribed text.
+ * @returns {Promise<string>} A promise that resolves to the transcribed text.
  */
-export declare function generateTranscription<DATA>(model: TranscriptionModel<DATA, TranscriptionModelSettings>, data: DATA, options?: FunctionOptions): ModelFunctionPromise<string>;
+export declare function generateTranscription<DATA>(model: TranscriptionModel<DATA, TranscriptionModelSettings>, data: DATA, options?: FunctionOptions & {
+    returnType?: "text";
+}): Promise<string>;
+export declare function generateTranscription<DATA>(model: TranscriptionModel<DATA, TranscriptionModelSettings>, data: DATA, options: FunctionOptions & {
+    returnType: "full";
+}): Promise<{
+    value: string;
+    response: unknown;
+    metadata: ModelCallMetadata;
+}>;

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

@@ -1,26 +1,6 @@
 import { executeStandardCall } from "../executeStandardCall.js";
-import { ModelFunctionPromise } from "../ModelFunctionPromise.js";
-/**
- * Transcribe audio data into text. Also called speech-to-text (STT) or automatic speech recognition (ASR).
- *
- * @see https://modelfusion.dev/guide/function/generate-transcription
- *
- * @example
- * const data = await fs.promises.readFile("data/test.mp3");
- *
- * const transcription = await generateTranscription(
- *   new OpenAITranscriptionModel({ model: "whisper-1" }),
- *   { type: "mp3", data }
- * );
- *
- * @param {TranscriptionModel<DATA, TranscriptionModelSettings>} model - The model to use for transcription.
- * @param {DATA} data - The data to transcribe.
- * @param {FunctionOptions} [options] - Optional parameters for the function.
- *
- * @returns {ModelFunctionPromise<string>} A promise that resolves to the transcribed text.
- */
-export function generateTranscription(model, data, options) {
-    return new ModelFunctionPromise(executeStandardCall({
+export async function generateTranscription(model, data, options) {
+    const fullResponse = await executeStandardCall({
         functionType: "generate-transcription",
         input: data,
         model,
@@ -32,5 +12,6 @@ export function generateTranscription(model, data, options) {
                 extractedValue: result.transcription,
             };
         },
-    }));
+    });
+    return options?.returnType === "full" ? fullResponse : fullResponse.value;
 }

package/model-provider/elevenlabs/ElevenLabsSpeechModel.cjs

@@ -14,6 +14,7 @@ const elevenLabsModels = [
     "eleven_multilingual_v2",
     "eleven_multilingual_v1",
     "eleven_monolingual_v1",
+    "eleven_turbo_v2",
 ];
 const defaultModel = "eleven_monolingual_v1";
 /**

package/model-provider/elevenlabs/ElevenLabsSpeechModel.d.ts

@@ -4,7 +4,7 @@ import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { Delta } from "../../model-function/Delta.js";
 import { StreamingSpeechGenerationModel, SpeechGenerationModelSettings } from "../../model-function/generate-speech/SpeechGenerationModel.js";
-declare const elevenLabsModels: readonly ["eleven_multilingual_v2", "eleven_multilingual_v1", "eleven_monolingual_v1"];
+declare const elevenLabsModels: readonly ["eleven_multilingual_v2", "eleven_multilingual_v1", "eleven_monolingual_v1", "eleven_turbo_v2"];
 export interface ElevenLabsSpeechModelSettings extends SpeechGenerationModelSettings {
     api?: ApiConfiguration & {
         apiKey: string;

package/model-provider/elevenlabs/ElevenLabsSpeechModel.js

@@ -11,6 +11,7 @@ const elevenLabsModels = [
     "eleven_multilingual_v2",
     "eleven_multilingual_v1",
     "eleven_monolingual_v1",
+    "eleven_turbo_v2",
 ];
 const defaultModel = "eleven_monolingual_v1";
 /**

package/model-provider/ollama/OllamaTextGenerationModel.cjs

@@ -53,9 +53,25 @@ class OllamaTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            // "maxCompletionTokens",
-            // "stopSequences",
+            "maxCompletionTokens",
+            "stopSequences",
             "contextWindowSize",
+            "temperature",
+            "mirostat",
+            "mirostat_eta",
+            "mirostat_tau",
+            "num_gqa",
+            "num_gpu",
+            "num_threads",
+            "repeat_last_n",
+            "repeat_penalty",
+            "seed",
+            "tfs_z",
+            "top_k",
+            "top_p",
+            "system",
+            "template",
+            "context",
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }

package/model-provider/ollama/OllamaTextGenerationModel.js

@@ -50,9 +50,25 @@ export class OllamaTextGenerationModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            // "maxCompletionTokens",
-            // "stopSequences",
+            "maxCompletionTokens",
+            "stopSequences",
             "contextWindowSize",
+            "temperature",
+            "mirostat",
+            "mirostat_eta",
+            "mirostat_tau",
+            "num_gqa",
+            "num_gpu",
+            "num_threads",
+            "repeat_last_n",
+            "repeat_penalty",
+            "seed",
+            "tfs_z",
+            "top_k",
+            "top_p",
+            "system",
+            "template",
+            "context",
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }

package/package.json

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

package/tool/NoSuchToolError.cjs

@@ -13,5 +13,13 @@ class NoSuchToolError extends Error {
         this.name = "NoSuchToolError";
         this.toolName = toolName;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            toolName: this.toolName,
+            message: this.message,
+            stack: this.stack,
+        };
+    }
 }
 exports.NoSuchToolError = NoSuchToolError;

package/tool/NoSuchToolError.d.ts

@@ -1,4 +1,10 @@
 export declare class NoSuchToolError extends Error {
     readonly toolName: string;
     constructor(toolName: string);
+    toJSON(): {
+        name: string;
+        toolName: string;
+        message: string;
+        stack: string | undefined;
+    };
 }

package/tool/NoSuchToolError.js

@@ -10,4 +10,12 @@ export class NoSuchToolError extends Error {
         this.name = "NoSuchToolError";
         this.toolName = toolName;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            toolName: this.toolName,
+            message: this.message,
+            stack: this.stack,
+        };
+    }
 }

package/tool/ToolExecutionError.cjs

@@ -27,5 +27,15 @@ class ToolExecutionError extends Error {
         this.input = input;
         this.cause = cause;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            toolName: this.toolName,
+            input: this.input,
+            cause: this.cause,
+            message: this.message,
+            stack: this.stack,
+        };
+    }
 }
 exports.ToolExecutionError = ToolExecutionError;

package/tool/ToolExecutionError.d.ts

@@ -8,4 +8,12 @@ export declare class ToolExecutionError extends Error {
         message: string | undefined;
         cause: unknown | undefined;
     });
+    toJSON(): {
+        name: string;
+        toolName: string;
+        input: unknown;
+        cause: unknown;
+        message: string;
+        stack: string | undefined;
+    };
 }

package/tool/ToolExecutionError.js

@@ -24,4 +24,14 @@ export class ToolExecutionError extends Error {
         this.input = input;
         this.cause = cause;
     }
+    toJSON() {
+        return {
+            name: this.name,
+            toolName: this.toolName,
+            input: this.input,
+            cause: this.cause,
+            message: this.message,
+            stack: this.stack,
+        };
+    }
 }

package/tool/executeTool.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeTool = exports.ExecuteToolPromise = void 0;
+exports.executeTool = void 0;
 const nanoid_1 = require("nanoid");
 const FunctionEventSource_js_1 = require("../core/FunctionEventSource.cjs");
 const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
@@ -11,46 +11,10 @@ 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");
-class ExecuteToolPromise extends Promise {
-    constructor(fullPromise) {
-        super((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            resolve(null); // we override the resolve function
-        });
-        Object.defineProperty(this, "fullPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: fullPromise
-        });
-        Object.defineProperty(this, "outputPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.outputPromise = fullPromise.then((result) => result.output);
-    }
-    asFullResponse() {
-        return this.fullPromise;
-    }
-    then(onfulfilled, onrejected) {
-        return this.outputPromise.then(onfulfilled, onrejected);
-    }
-    catch(onrejected) {
-        return this.outputPromise.catch(onrejected);
-    }
-    finally(onfinally) {
-        return this.outputPromise.finally(onfinally);
-    }
-}
-exports.ExecuteToolPromise = ExecuteToolPromise;
-/**
- * `executeTool` directly executes a tool with the given parameters.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function executeTool(tool, input, options) {
-    return new ExecuteToolPromise(doExecuteTool(tool, input, options));
+async function executeTool(// eslint-disable-line @typescript-eslint/no-explicit-any
+tool, input, options) {
+    const fullResponse = await doExecuteTool(tool, input, options);
+    return options?.returnType === "full" ? fullResponse : fullResponse.output;
 }
 exports.executeTool = executeTool;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/tool/executeTool.d.ts

@@ -10,22 +10,17 @@ export type ExecuteToolMetadata = {
     finishTimestamp: Date;
     durationInMs: number;
 };
-export declare class ExecuteToolPromise<OUTPUT> extends Promise<OUTPUT> {
-    private fullPromise;
-    private outputPromise;
-    constructor(fullPromise: Promise<{
-        output: OUTPUT;
-        metadata: ExecuteToolMetadata;
-    }>);
-    asFullResponse(): Promise<{
-        output: OUTPUT;
-        metadata: ExecuteToolMetadata;
-    }>;
-    then<TResult1 = OUTPUT, TResult2 = never>(onfulfilled?: ((value: OUTPUT) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | undefined | null): Promise<OUTPUT | TResult>;
-    finally(onfinally?: (() => void) | undefined | null): Promise<OUTPUT>;
-}
 /**
  * `executeTool` directly executes a tool with the given parameters.
  */
-export declare function executeTool<TOOL extends Tool<any, any, any>>(tool: TOOL, input: TOOL["inputSchema"]["_type"], options?: FunctionOptions): ExecuteToolPromise<ReturnType<TOOL["execute"]>>;
+export declare function executeTool<TOOL extends Tool<any, any, any>>(// eslint-disable-line @typescript-eslint/no-explicit-any
+tool: TOOL, input: TOOL["inputSchema"]["_type"], options?: FunctionOptions & {
+    returnType?: "output";
+}): Promise<ReturnType<TOOL["execute"]>>;
+export declare function executeTool<TOOL extends Tool<any, any, any>>(// eslint-disable-line @typescript-eslint/no-explicit-any
+tool: TOOL, input: TOOL["inputSchema"]["_type"], options: FunctionOptions & {
+    returnType: "full";
+}): Promise<{
+    output: ReturnType<TOOL["execute"]>;
+    metadata: ExecuteToolMetadata;
+}>;

package/tool/executeTool.js

@@ -8,45 +8,10 @@ import { getRun } from "../core/getRun.js";
 import { startDurationMeasurement } from "../util/DurationMeasurement.js";
 import { runSafe } from "../util/runSafe.js";
 import { ToolExecutionError } from "./ToolExecutionError.js";
-export class ExecuteToolPromise extends Promise {
-    constructor(fullPromise) {
-        super((resolve) => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            resolve(null); // we override the resolve function
-        });
-        Object.defineProperty(this, "fullPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: fullPromise
-        });
-        Object.defineProperty(this, "outputPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.outputPromise = fullPromise.then((result) => result.output);
-    }
-    asFullResponse() {
-        return this.fullPromise;
-    }
-    then(onfulfilled, onrejected) {
-        return this.outputPromise.then(onfulfilled, onrejected);
-    }
-    catch(onrejected) {
-        return this.outputPromise.catch(onrejected);
-    }
-    finally(onfinally) {
-        return this.outputPromise.finally(onfinally);
-    }
-}
-/**
- * `executeTool` directly executes a tool with the given parameters.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function executeTool(tool, input, options) {
-    return new ExecuteToolPromise(doExecuteTool(tool, input, options));
+export async function executeTool(// eslint-disable-line @typescript-eslint/no-explicit-any
+tool, input, options) {
+    const fullResponse = await doExecuteTool(tool, input, options);
+    return options?.returnType === "full" ? fullResponse : fullResponse.output;
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function doExecuteTool(tool, input, options) {

package/tool/useTool.cjs

@@ -25,7 +25,10 @@ async function useTool(model, tool, prompt, options) {
                 name: tool.name,
                 description: tool.description,
                 schema: tool.inputSchema,
-            }, expandedPrompt, options).asFullResponse();
+            }, expandedPrompt, {
+                ...options,
+                returnType: "full",
+            });
             return {
                 tool: tool.name,
                 parameters: value,

package/tool/useTool.js

@@ -22,7 +22,10 @@ export async function useTool(model, tool, prompt, options) {
                 name: tool.name,
                 description: tool.description,
                 schema: tool.inputSchema,
-            }, expandedPrompt, options).asFullResponse();
+            }, expandedPrompt, {
+                ...options,
+                returnType: "full",
+            });
             return {
                 tool: tool.name,
                 parameters: value,

package/tool/useToolOrGenerateText.cjs

@@ -19,7 +19,10 @@ async function useToolOrGenerateText(model, tools, prompt, options) {
                 name: tool.name,
                 description: tool.description,
                 schema: tool.inputSchema,
-            })), expandedPrompt, options);
+            })), expandedPrompt, {
+                ...options,
+                returnType: "structure",
+            });
             const { structure, text } = modelResponse;
             if (structure == null) {
                 return {