modelfusion 0.121.2 → 0.122.0

package/model-provider/ollama/OllamaChatModel.test.js

@@ -14,7 +14,12 @@ describe("streamText", () => {
                 `"done":true,"total_duration":4843619375,"load_duration":1101458,"prompt_eval_count":5,"prompt_eval_duration":199339000,` +
                 `"eval_count":317,"eval_duration":4639772000}\n`,
         ];
-        const stream = await streamText(new OllamaChatModel({ model: "mistral:text" }).withTextPrompt(), "hello");
+        const stream = await streamText({
+            model: new OllamaChatModel({
+                model: "mistral:text",
+            }).withTextPrompt(),
+            prompt: "hello",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
             "Hello",

package/model-provider/ollama/OllamaCompletionModel.test.cjs

@@ -34,9 +34,12 @@ describe("generateText", () => {
             eval_count: 113,
             eval_duration: 1325948000,
         };
-        const result = await (0, generateText_js_1.generateText)(new OllamaCompletionModel_js_1.OllamaCompletionModel({
-            model: "test-model",
-        }).withTextPrompt(), "test prompt");
+        const result = await (0, generateText_js_1.generateText)({
+            model: new OllamaCompletionModel_js_1.OllamaCompletionModel({
+                model: "test-model",
+            }).withTextPrompt(),
+            prompt: "test prompt",
+        });
         expect(result).toEqual("test response");
     });
     it("should throw retryable ApiCallError when Ollama is overloaded", async () => {
@@ -47,12 +50,15 @@ describe("generateText", () => {
             done: false,
         };
         try {
-            await (0, generateText_js_1.generateText)(new OllamaCompletionModel_js_1.OllamaCompletionModel({
-                api: new OllamaApiConfiguration_js_1.OllamaApiConfiguration({
-                    retry: (0, retryNever_js_1.retryNever)(),
-                }),
-                model: "test-model",
-            }).withTextPrompt(), "test prompt");
+            await (0, generateText_js_1.generateText)({
+                model: new OllamaCompletionModel_js_1.OllamaCompletionModel({
+                    api: new OllamaApiConfiguration_js_1.OllamaApiConfiguration({
+                        retry: (0, retryNever_js_1.retryNever)(),
+                    }),
+                    model: "test-model",
+                }).withTextPrompt(),
+                prompt: "test prompt",
+            });
             (0, assert_1.fail)("Should have thrown ApiCallError");
         }
         catch (expectedError) {
@@ -73,7 +79,12 @@ describe("streamText", () => {
                 `"done":true,"context":[123,456,789],"total_duration":2165354041,"load_duration":1293958,` +
                 `"prompt_eval_count":5,"prompt_eval_duration":193273000,"eval_count":136,"eval_duration":1966852000}\n`,
         ];
-        const stream = await (0, streamText_js_1.streamText)(new OllamaCompletionModel_js_1.OllamaCompletionModel({ model: "mistral:text" }).withTextPrompt(), "hello");
+        const stream = await (0, streamText_js_1.streamText)({
+            model: new OllamaCompletionModel_js_1.OllamaCompletionModel({
+                model: "mistral:text",
+            }).withTextPrompt(),
+            prompt: "hello",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
             "Hello",
@@ -103,12 +114,16 @@ describe("streamStructure", () => {
                 `"total_duration":521893000,"load_duration":957666,"prompt_eval_count":74,"prompt_eval_duration":302508000,` +
                 `"eval_count":12,"eval_duration":215282000}\n`,
         ];
-        const stream = await (0, streamStructure_js_1.streamStructure)(new OllamaCompletionModel_js_1.OllamaCompletionModel({
-            model: "mistral:text",
-            promptTemplate: OllamaCompletionPrompt_js_1.Text,
-            format: "json",
-            raw: true,
-        }).asStructureGenerationModel(jsonStructurePrompt_js_1.jsonStructurePrompt.text()), (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })), "generate a name");
+        const stream = await (0, streamStructure_js_1.streamStructure)({
+            model: new OllamaCompletionModel_js_1.OllamaCompletionModel({
+                model: "mistral:text",
+                promptTemplate: OllamaCompletionPrompt_js_1.Text,
+                format: "json",
+                raw: true,
+            }).asStructureGenerationModel(jsonStructurePrompt_js_1.jsonStructurePrompt.text()),
+            schema: (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })),
+            prompt: "generate a name",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
             { isComplete: false, value: {} },

package/model-provider/ollama/OllamaCompletionModel.test.js

@@ -32,9 +32,12 @@ describe("generateText", () => {
             eval_count: 113,
             eval_duration: 1325948000,
         };
-        const result = await generateText(new OllamaCompletionModel({
-            model: "test-model",
-        }).withTextPrompt(), "test prompt");
+        const result = await generateText({
+            model: new OllamaCompletionModel({
+                model: "test-model",
+            }).withTextPrompt(),
+            prompt: "test prompt",
+        });
         expect(result).toEqual("test response");
     });
     it("should throw retryable ApiCallError when Ollama is overloaded", async () => {
@@ -45,12 +48,15 @@ describe("generateText", () => {
             done: false,
         };
         try {
-            await generateText(new OllamaCompletionModel({
-                api: new OllamaApiConfiguration({
-                    retry: retryNever(),
-                }),
-                model: "test-model",
-            }).withTextPrompt(), "test prompt");
+            await generateText({
+                model: new OllamaCompletionModel({
+                    api: new OllamaApiConfiguration({
+                        retry: retryNever(),
+                    }),
+                    model: "test-model",
+                }).withTextPrompt(),
+                prompt: "test prompt",
+            });
             fail("Should have thrown ApiCallError");
         }
         catch (expectedError) {
@@ -71,7 +77,12 @@ describe("streamText", () => {
                 `"done":true,"context":[123,456,789],"total_duration":2165354041,"load_duration":1293958,` +
                 `"prompt_eval_count":5,"prompt_eval_duration":193273000,"eval_count":136,"eval_duration":1966852000}\n`,
         ];
-        const stream = await streamText(new OllamaCompletionModel({ model: "mistral:text" }).withTextPrompt(), "hello");
+        const stream = await streamText({
+            model: new OllamaCompletionModel({
+                model: "mistral:text",
+            }).withTextPrompt(),
+            prompt: "hello",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
             "Hello",
@@ -101,12 +112,16 @@ describe("streamStructure", () => {
                 `"total_duration":521893000,"load_duration":957666,"prompt_eval_count":74,"prompt_eval_duration":302508000,` +
                 `"eval_count":12,"eval_duration":215282000}\n`,
         ];
-        const stream = await streamStructure(new OllamaCompletionModel({
-            model: "mistral:text",
-            promptTemplate: Text,
-            format: "json",
-            raw: true,
-        }).asStructureGenerationModel(jsonStructurePrompt.text()), zodSchema(z.object({ name: z.string() })), "generate a name");
+        const stream = await streamStructure({
+            model: new OllamaCompletionModel({
+                model: "mistral:text",
+                promptTemplate: Text,
+                format: "json",
+                raw: true,
+            }).asStructureGenerationModel(jsonStructurePrompt.text()),
+            schema: zodSchema(z.object({ name: z.string() })),
+            prompt: "generate a name",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
             { isComplete: false, value: {} },

package/model-provider/openai/OpenAIChatFunctionCallStructureGenerationModel.cjs

@@ -101,7 +101,7 @@ class OpenAIChatFunctionCallStructureGenerationModel {
     async doGenerateStructure(schema, prompt, // first argument of the function
     options) {
         const expandedPrompt = this.promptTemplate.format(prompt);
-        const response = await this.model
+        const rawResponse = await this.model
             .withSettings({
             stopSequences: [
                 ...(this.settings.stopSequences ?? []),
@@ -119,13 +119,13 @@ class OpenAIChatFunctionCallStructureGenerationModel {
                 },
             ],
         });
-        const valueText = response.choices[0].message.function_call.arguments;
+        const valueText = rawResponse.choices[0].message.function_call.arguments;
         try {
             return {
-                response,
+                rawResponse,
                 valueText,
                 value: secure_json_parse_1.default.parse(valueText),
-                usage: this.model.extractUsage(response),
+                usage: this.model.extractUsage(rawResponse),
             };
         }
         catch (error) {

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

@@ -127,7 +127,7 @@ OpenAIChatSettings> {
      */
     doGenerateStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
     options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: "chat.completion";
             model: string;
             usage: {

package/model-provider/openai/OpenAIChatFunctionCallStructureGenerationModel.js

@@ -95,7 +95,7 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
     async doGenerateStructure(schema, prompt, // first argument of the function
     options) {
         const expandedPrompt = this.promptTemplate.format(prompt);
-        const response = await this.model
+        const rawResponse = await this.model
             .withSettings({
             stopSequences: [
                 ...(this.settings.stopSequences ?? []),
@@ -113,13 +113,13 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
                 },
             ],
         });
-        const valueText = response.choices[0].message.function_call.arguments;
+        const valueText = rawResponse.choices[0].message.function_call.arguments;
         try {
             return {
-                response,
+                rawResponse,
                 valueText,
                 value: SecureJSON.parse(valueText),
-                usage: this.model.extractUsage(response),
+                usage: this.model.extractUsage(rawResponse),
             };
         }
         catch (error) {

package/model-provider/openai/OpenAIChatModel.test.cjs

@@ -27,11 +27,14 @@ describe("streamText", () => {
                 `"system_fingerprint":null,"choices":[{"index":1,"delta":{},"finish_reason":"stop"}]}\n\n`,
             "data: [DONE]\n\n",
         ];
-        const stream = await (0, streamText_js_1.streamText)(new OpenAIChatModel_js_1.OpenAIChatModel({
-            api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
-            model: "gpt-3.5-turbo",
-            numberOfGenerations: 2,
-        }).withTextPrompt(), "test prompt");
+        const stream = await (0, streamText_js_1.streamText)({
+            model: new OpenAIChatModel_js_1.OpenAIChatModel({
+                api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
+                model: "gpt-3.5-turbo",
+                numberOfGenerations: 2,
+            }).withTextPrompt(),
+            prompt: "test prompt",
+        });
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual(["A"]);
     });
 });
@@ -73,15 +76,19 @@ describe("streamStructure", () => {
                 `"choices":[{"index":0,"delta":{},"logprobs":null,"finish_reason":"stop"}]}\n\n`,
             `data: [DONE]\n\n`,
         ];
-        const stream = await (0, streamStructure_js_1.streamStructure)(new OpenAIChatModel_js_1.OpenAIChatModel({
-            api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
-            model: "gpt-3.5-turbo",
-        })
-            .asFunctionCallStructureGenerationModel({
-            fnName: "generateCharacter",
-            fnDescription: "Generate character descriptions.",
-        })
-            .withTextPrompt(), (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })), "generate a name");
+        const stream = await (0, streamStructure_js_1.streamStructure)({
+            model: new OpenAIChatModel_js_1.OpenAIChatModel({
+                api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
+                model: "gpt-3.5-turbo",
+            })
+                .asFunctionCallStructureGenerationModel({
+                fnName: "generateCharacter",
+                fnDescription: "Generate character descriptions.",
+            })
+                .withTextPrompt(),
+            schema: (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })),
+            prompt: "generate a name",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
             { isComplete: false, value: {} },

package/model-provider/openai/OpenAIChatModel.test.js

@@ -25,11 +25,14 @@ describe("streamText", () => {
                 `"system_fingerprint":null,"choices":[{"index":1,"delta":{},"finish_reason":"stop"}]}\n\n`,
             "data: [DONE]\n\n",
         ];
-        const stream = await streamText(new OpenAIChatModel({
-            api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
-            model: "gpt-3.5-turbo",
-            numberOfGenerations: 2,
-        }).withTextPrompt(), "test prompt");
+        const stream = await streamText({
+            model: new OpenAIChatModel({
+                api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
+                model: "gpt-3.5-turbo",
+                numberOfGenerations: 2,
+            }).withTextPrompt(),
+            prompt: "test prompt",
+        });
         expect(await arrayFromAsync(stream)).toStrictEqual(["A"]);
     });
 });
@@ -71,15 +74,19 @@ describe("streamStructure", () => {
                 `"choices":[{"index":0,"delta":{},"logprobs":null,"finish_reason":"stop"}]}\n\n`,
             `data: [DONE]\n\n`,
         ];
-        const stream = await streamStructure(new OpenAIChatModel({
-            api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
-            model: "gpt-3.5-turbo",
-        })
-            .asFunctionCallStructureGenerationModel({
-            fnName: "generateCharacter",
-            fnDescription: "Generate character descriptions.",
-        })
-            .withTextPrompt(), zodSchema(z.object({ name: z.string() })), "generate a name");
+        const stream = await streamStructure({
+            model: new OpenAIChatModel({
+                api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
+                model: "gpt-3.5-turbo",
+            })
+                .asFunctionCallStructureGenerationModel({
+                fnName: "generateCharacter",
+                fnDescription: "Generate character descriptions.",
+            })
+                .withTextPrompt(),
+            schema: zodSchema(z.object({ name: z.string() })),
+            prompt: "generate a name",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
             { isComplete: false, value: {} },

package/model-provider/openai/OpenAICompletionModel.test.cjs

@@ -20,10 +20,13 @@ describe("streamText", () => {
                 `"choices":[{"text":"","index":0,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
             "data: [DONE]\n\n",
         ];
-        const stream = await (0, streamText_js_1.streamText)(new OpenAICompletionModel_js_1.OpenAICompletionModel({
-            api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
-            model: "gpt-3.5-turbo-instruct",
-        }), "hello");
+        const stream = await (0, streamText_js_1.streamText)({
+            model: new OpenAICompletionModel_js_1.OpenAICompletionModel({
+                api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
+                model: "gpt-3.5-turbo-instruct",
+            }),
+            prompt: "hello",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
             "Hello",
@@ -43,11 +46,14 @@ describe("streamText", () => {
                 `"choices":[{"text":"","index":1,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
             "data: [DONE]\n\n",
         ];
-        const stream = await (0, streamText_js_1.streamText)(new OpenAICompletionModel_js_1.OpenAICompletionModel({
-            api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
-            model: "gpt-3.5-turbo-instruct",
-            numberOfGenerations: 2,
-        }), "test prompt");
+        const stream = await (0, streamText_js_1.streamText)({
+            model: new OpenAICompletionModel_js_1.OpenAICompletionModel({
+                api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
+                model: "gpt-3.5-turbo-instruct",
+                numberOfGenerations: 2,
+            }),
+            prompt: "test prompt",
+        });
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual(["A"]);
     });
 });

package/model-provider/openai/OpenAICompletionModel.test.js

@@ -18,10 +18,13 @@ describe("streamText", () => {
                 `"choices":[{"text":"","index":0,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
             "data: [DONE]\n\n",
         ];
-        const stream = await streamText(new OpenAICompletionModel({
-            api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
-            model: "gpt-3.5-turbo-instruct",
-        }), "hello");
+        const stream = await streamText({
+            model: new OpenAICompletionModel({
+                api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
+                model: "gpt-3.5-turbo-instruct",
+            }),
+            prompt: "hello",
+        });
         // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
             "Hello",
@@ -41,11 +44,14 @@ describe("streamText", () => {
                 `"choices":[{"text":"","index":1,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
             "data: [DONE]\n\n",
         ];
-        const stream = await streamText(new OpenAICompletionModel({
-            api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
-            model: "gpt-3.5-turbo-instruct",
-            numberOfGenerations: 2,
-        }), "test prompt");
+        const stream = await streamText({
+            model: new OpenAICompletionModel({
+                api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
+                model: "gpt-3.5-turbo-instruct",
+                numberOfGenerations: 2,
+            }),
+            prompt: "test prompt",
+        });
         expect(await arrayFromAsync(stream)).toStrictEqual(["A"]);
     });
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building AI applications.",
-  "version": "0.121.2",
+  "version": "0.122.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/tool/execute-tool/executeTool.cjs

@@ -10,14 +10,14 @@ 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");
-async function executeTool(// eslint-disable-line @typescript-eslint/no-explicit-any
-tool, args, options) {
-    const fullResponse = await doExecuteTool(tool, args, options);
-    return options?.fullResponse ? fullResponse : fullResponse.output;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function executeTool({ tool, args, fullResponse, ...options }) {
+    const callResponse = await doExecuteTool({ tool, args, ...options });
+    return fullResponse ? callResponse : callResponse.output;
 }
 exports.executeTool = executeTool;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function doExecuteTool(tool, args, options) {
+async function doExecuteTool({ tool, args, ...options }) {
     const run = await (0, getRun_js_1.getRun)(options?.run);
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [

package/tool/execute-tool/executeTool.d.ts

@@ -14,13 +14,17 @@ export type ExecuteToolMetadata = {
  * `executeTool` executes a tool with the given parameters.
  */
 export declare function executeTool<TOOL extends Tool<any, any, any>>(// eslint-disable-line @typescript-eslint/no-explicit-any
-tool: TOOL, args: TOOL["parameters"]["_type"], options?: FunctionOptions & {
+params: {
+    tool: TOOL;
+    args: TOOL["parameters"]["_type"];
     fullResponse?: false;
-}): Promise<ReturnType<TOOL["execute"]>>;
+} & FunctionOptions): Promise<ReturnType<TOOL["execute"]>>;
 export declare function executeTool<TOOL extends Tool<any, any, any>>(// eslint-disable-line @typescript-eslint/no-explicit-any
-tool: TOOL, args: TOOL["parameters"]["_type"], options: FunctionOptions & {
+params: {
+    tool: TOOL;
+    args: TOOL["parameters"]["_type"];
     fullResponse: true;
-}): Promise<{
+} & FunctionOptions): Promise<{
     output: Awaited<ReturnType<TOOL["execute"]>>;
     metadata: ExecuteToolMetadata;
 }>;

package/tool/execute-tool/executeTool.js

@@ -7,13 +7,13 @@ import { getRun } from "../../core/getRun.js";
 import { startDurationMeasurement } from "../../util/DurationMeasurement.js";
 import { runSafe } from "../../util/runSafe.js";
 import { ToolExecutionError } from "../ToolExecutionError.js";
-export async function executeTool(// eslint-disable-line @typescript-eslint/no-explicit-any
-tool, args, options) {
-    const fullResponse = await doExecuteTool(tool, args, options);
-    return options?.fullResponse ? fullResponse : fullResponse.output;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function executeTool({ tool, args, fullResponse, ...options }) {
+    const callResponse = await doExecuteTool({ tool, args, ...options });
+    return fullResponse ? callResponse : callResponse.output;
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function doExecuteTool(tool, args, options) {
+async function doExecuteTool({ tool, args, ...options }) {
     const run = await getRun(options?.run);
     const eventSource = new FunctionEventSource({
         observers: [

package/tool/execute-tool/safeExecuteToolCall.cjs

@@ -11,7 +11,7 @@ async function safeExecuteToolCall(tool, toolCall, options) {
             toolCall,
             args: toolCall.args,
             ok: true,
-            result: await (0, executeTool_js_1.executeTool)(tool, toolCall.args, options),
+            result: await (0, executeTool_js_1.executeTool)({ tool, args: toolCall.args, ...options }),
         };
     }
     catch (error) {

package/tool/execute-tool/safeExecuteToolCall.js

@@ -8,7 +8,7 @@ export async function safeExecuteToolCall(tool, toolCall, options) {
             toolCall,
             args: toolCall.args,
             ok: true,
-            result: await executeTool(tool, toolCall.args, options),
+            result: await executeTool({ tool, args: toolCall.args, ...options }),
         };
     }
     catch (error) {

package/tool/generate-tool-call/TextGenerationToolCallModel.cjs

@@ -30,9 +30,11 @@ class TextGenerationToolCallModel {
         return this.model.settingsForEvent;
     }
     async doGenerateToolCall(tool, prompt, options) {
-        const { rawResponse, text, metadata } = await (0, generateText_js_1.generateText)(this.model, this.format.createPrompt(prompt, tool), {
-            ...options,
+        const { rawResponse, text, metadata } = await (0, generateText_js_1.generateText)({
+            model: this.model,
+            prompt: this.format.createPrompt(prompt, tool),
             fullResponse: true,
+            ...options,
         });
         try {
             return {

package/tool/generate-tool-call/TextGenerationToolCallModel.js

@@ -27,9 +27,11 @@ export class TextGenerationToolCallModel {
         return this.model.settingsForEvent;
     }
     async doGenerateToolCall(tool, prompt, options) {
-        const { rawResponse, text, metadata } = await generateText(this.model, this.format.createPrompt(prompt, tool), {
-            ...options,
+        const { rawResponse, text, metadata } = await generateText({
+            model: this.model,
+            prompt: this.format.createPrompt(prompt, tool),
             fullResponse: true,
+            ...options,
         });
         try {
             return {

package/tool/generate-tool-call/generateToolCall.cjs

@@ -4,12 +4,12 @@ exports.generateToolCall = void 0;
 const executeStandardCall_js_1 = require("../../model-function/executeStandardCall.cjs");
 const ToolCallArgumentsValidationError_js_1 = require("../ToolCallArgumentsValidationError.cjs");
 const ToolCallGenerationError_js_1 = require("../ToolCallGenerationError.cjs");
-async function generateToolCall(model, tool, prompt, options) {
+async function generateToolCall({ model, tool, prompt, fullResponse, ...options }) {
     // Note: PROMPT must not be a function.
     const expandedPrompt = typeof prompt === "function"
         ? prompt(tool)
         : prompt;
-    const fullResponse = await (0, executeStandardCall_js_1.executeStandardCall)({
+    const callResponse = await (0, executeStandardCall_js_1.executeStandardCall)({
         functionType: "generate-tool-call",
         input: expandedPrompt,
         model,
@@ -54,12 +54,12 @@ async function generateToolCall(model, tool, prompt, options) {
             }
         },
     });
-    return options?.fullResponse
+    return fullResponse
         ? {
-            toolCall: fullResponse.value,
-            response: fullResponse.rawResponse,
-            metadata: fullResponse.metadata,
+            toolCall: callResponse.value,
+            rawResponse: callResponse.rawResponse,
+            metadata: callResponse.metadata,
         }
-        : fullResponse.value;
+        : callResponse.value;
 }
 exports.generateToolCall = generateToolCall;

package/tool/generate-tool-call/generateToolCall.d.ts

@@ -3,13 +3,19 @@ import { ModelCallMetadata } from "../../model-function/ModelCallMetadata.js";
 import { ToolCall } from "../ToolCall.js";
 import { ToolDefinition } from "../ToolDefinition.js";
 import { ToolCallGenerationModel, ToolCallGenerationModelSettings } from "./ToolCallGenerationModel.js";
-export declare function generateToolCall<PARAMETERS, PROMPT, NAME extends string, SETTINGS extends ToolCallGenerationModelSettings>(model: ToolCallGenerationModel<PROMPT, SETTINGS>, tool: ToolDefinition<NAME, PARAMETERS>, prompt: PROMPT | ((tool: ToolDefinition<NAME, PARAMETERS>) => PROMPT), options?: FunctionOptions & {
+export declare function generateToolCall<PARAMETERS, PROMPT, NAME extends string, SETTINGS extends ToolCallGenerationModelSettings>(params: {
+    model: ToolCallGenerationModel<PROMPT, SETTINGS>;
+    tool: ToolDefinition<NAME, PARAMETERS>;
+    prompt: PROMPT | ((tool: ToolDefinition<NAME, PARAMETERS>) => PROMPT);
     fullResponse?: false;
-}): Promise<ToolCall<NAME, PARAMETERS>>;
-export declare function generateToolCall<PARAMETERS, PROMPT, NAME extends string, SETTINGS extends ToolCallGenerationModelSettings>(model: ToolCallGenerationModel<PROMPT, SETTINGS>, tool: ToolDefinition<NAME, PARAMETERS>, prompt: PROMPT | ((tool: ToolDefinition<NAME, PARAMETERS>) => PROMPT), options: FunctionOptions & {
+} & FunctionOptions): Promise<ToolCall<NAME, PARAMETERS>>;
+export declare function generateToolCall<PARAMETERS, PROMPT, NAME extends string, SETTINGS extends ToolCallGenerationModelSettings>(params: {
+    model: ToolCallGenerationModel<PROMPT, SETTINGS>;
+    tool: ToolDefinition<NAME, PARAMETERS>;
+    prompt: PROMPT | ((tool: ToolDefinition<NAME, PARAMETERS>) => PROMPT);
     fullResponse: true;
-}): Promise<{
+} & FunctionOptions): Promise<{
     toolCall: ToolCall<NAME, PARAMETERS>;
-    response: unknown;
+    rawResponse: unknown;
     metadata: ModelCallMetadata;
 }>;

package/tool/generate-tool-call/generateToolCall.js

@@ -1,12 +1,12 @@
 import { executeStandardCall } from "../../model-function/executeStandardCall.js";
 import { ToolCallArgumentsValidationError } from "../ToolCallArgumentsValidationError.js";
 import { ToolCallGenerationError } from "../ToolCallGenerationError.js";
-export async function generateToolCall(model, tool, prompt, options) {
+export async function generateToolCall({ model, tool, prompt, fullResponse, ...options }) {
     // Note: PROMPT must not be a function.
     const expandedPrompt = typeof prompt === "function"
         ? prompt(tool)
         : prompt;
-    const fullResponse = await executeStandardCall({
+    const callResponse = await executeStandardCall({
         functionType: "generate-tool-call",
         input: expandedPrompt,
         model,
@@ -51,11 +51,11 @@ export async function generateToolCall(model, tool, prompt, options) {
             }
         },
     });
-    return options?.fullResponse
+    return fullResponse
         ? {
-            toolCall: fullResponse.value,
-            response: fullResponse.rawResponse,
-            metadata: fullResponse.metadata,
+            toolCall: callResponse.value,
+            rawResponse: callResponse.rawResponse,
+            metadata: callResponse.metadata,
         }
-        : fullResponse.value;
+        : callResponse.value;
 }