modelfusion 0.105.0 → 0.106.0

package/model-provider/llamacpp/LlamaCppTextGenerationModel.d.ts

@@ -58,14 +58,14 @@ export declare class LlamaCppTextGenerationModel<CONTEXT_WINDOW_SIZE extends num
     countPromptTokens(prompt: LlamaCppTextGenerationPrompt): Promise<number>;
     doGenerateTexts(prompt: LlamaCppTextGenerationPrompt, options?: FunctionOptions): Promise<{
         response: {
-            stop: true;
             model: string;
-            prompt: string;
+            stop: true;
             content: string;
+            prompt: string;
             generation_settings: {
-                stop: string[];
                 model: string;
                 stream: boolean;
+                stop: string[];
                 seed: number;
                 mirostat: number;
                 frequency_penalty: number;
@@ -117,14 +117,14 @@ export declare class LlamaCppTextGenerationModel<CONTEXT_WINDOW_SIZE extends num
         };
     }>;
     doStreamText(prompt: LlamaCppTextGenerationPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<{
-        stop: true;
         model: string;
-        prompt: string;
+        stop: true;
         content: string;
+        prompt: string;
         generation_settings: {
-            stop: string[];
             model: string;
             stream: boolean;
+            stop: string[];
             seed: number;
             mirostat: number;
             frequency_penalty: number;
@@ -208,9 +208,9 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
         top_p: z.ZodNumber;
         typical_p: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
-        stop: string[];
         model: string;
         stream: boolean;
+        stop: string[];
         seed: number;
         mirostat: number;
         frequency_penalty: number;
@@ -232,9 +232,9 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
         top_p: number;
         typical_p: number;
     }, {
-        stop: string[];
         model: string;
         stream: boolean;
+        stop: string[];
         seed: number;
         mirostat: number;
         frequency_penalty: number;
@@ -295,14 +295,14 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
     tokens_predicted: z.ZodNumber;
     truncated: z.ZodBoolean;
 }, "strip", z.ZodTypeAny, {
-    stop: true;
     model: string;
-    prompt: string;
+    stop: true;
     content: string;
+    prompt: string;
     generation_settings: {
-        stop: string[];
         model: string;
         stream: boolean;
+        stop: string[];
         seed: number;
         mirostat: number;
         frequency_penalty: number;
@@ -343,14 +343,14 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
     tokens_predicted: number;
     truncated: boolean;
 }, {
-    stop: true;
     model: string;
-    prompt: string;
+    stop: true;
     content: string;
+    prompt: string;
     generation_settings: {
-        stop: string[];
         model: string;
         stream: boolean;
+        stop: string[];
         seed: number;
         mirostat: number;
         frequency_penalty: number;
@@ -393,14 +393,14 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
 }>;
 export type LlamaCppTextGenerationResponse = z.infer<typeof llamaCppTextGenerationResponseSchema>;
 declare const llamaCppTextStreamChunkSchema: import("../../core/schema/ZodSchema.js").ZodSchema<{
-    stop: true;
     model: string;
-    prompt: string;
+    stop: true;
     content: string;
+    prompt: string;
     generation_settings: {
-        stop: string[];
         model: string;
         stream: boolean;
+        stop: string[];
         seed: number;
         mirostat: number;
         frequency_penalty: number;
@@ -456,14 +456,14 @@ export declare const LlamaCppTextGenerationResponseFormat: {
     json: {
         stream: false;
         handler: ResponseHandler<{
-            stop: true;
             model: string;
-            prompt: string;
+            stop: true;
             content: string;
+            prompt: string;
             generation_settings: {
-                stop: string[];
                 model: string;
                 stream: boolean;
+                stop: string[];
                 seed: number;
                 mirostat: number;
                 frequency_penalty: number;
@@ -514,14 +514,14 @@ export declare const LlamaCppTextGenerationResponseFormat: {
         handler: ({ response }: {
             response: Response;
         }) => Promise<AsyncIterable<Delta<{
-            stop: true;
             model: string;
-            prompt: string;
+            stop: true;
             content: string;
+            prompt: string;
             generation_settings: {
-                stop: string[];
                 model: string;
                 stream: boolean;
+                stop: string[];
                 seed: number;
                 mirostat: number;
                 frequency_penalty: number;

package/model-provider/mistral/MistralTextEmbeddingModel.d.ts

@@ -32,16 +32,16 @@ export declare class MistralTextEmbeddingModel extends AbstractModel<MistralText
     doEmbedValues(texts: string[], options?: FunctionOptions): Promise<{
         response: {
             object: string;
-            usage: {
-                prompt_tokens: number;
-                total_tokens: number;
-            };
-            model: string;
             data: {
                 object: string;
                 embedding: number[];
                 index: number;
             }[];
+            usage: {
+                prompt_tokens: number;
+                total_tokens: number;
+            };
+            model: string;
             id: string;
         };
         embeddings: number[][];
@@ -77,29 +77,29 @@ declare const MistralTextEmbeddingResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: string;
-    usage: {
-        prompt_tokens: number;
-        total_tokens: number;
-    };
-    model: string;
     data: {
         object: string;
         embedding: number[];
         index: number;
     }[];
-    id: string;
-}, {
-    object: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
     model: string;
+    id: string;
+}, {
+    object: string;
     data: {
         object: string;
         embedding: number[];
         index: number;
     }[];
+    usage: {
+        prompt_tokens: number;
+        total_tokens: number;
+    };
+    model: string;
     id: string;
 }>;
 export type MistralTextEmbeddingResponse = z.infer<typeof MistralTextEmbeddingResponseSchema>;

package/model-provider/ollama/OllamaChatModel.d.ts

@@ -8,7 +8,8 @@ import { PromptTemplateTextStreamingModel } from "../../model-function/generate-
 import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
 import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
 export type OllamaChatMessage = {
     role: "system" | "user" | "assistant";
@@ -38,11 +39,11 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     get settingsForEvent(): Partial<OllamaChatModelSettings>;
     doGenerateTexts(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<{
         response: {
-            model: string;
             message: {
                 role: string;
                 content: string;
             };
+            model: string;
             done: true;
             created_at: string;
             total_duration: number;
@@ -58,11 +59,11 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
         }[];
     }>;
     doStreamText(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
-        model: string;
         message: {
             role: string;
             content: string;
         };
+        model: string;
         done: false;
         created_at: string;
     } | {
@@ -115,11 +116,11 @@ declare const ollamaChatResponseSchema: z.ZodObject<{
     eval_count: z.ZodNumber;
     eval_duration: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
-    model: string;
     message: {
         role: string;
         content: string;
     };
+    model: string;
     done: true;
     created_at: string;
     total_duration: number;
@@ -129,11 +130,11 @@ declare const ollamaChatResponseSchema: z.ZodObject<{
     load_duration?: number | undefined;
     prompt_eval_duration?: number | undefined;
 }, {
-    model: string;
     message: {
         role: string;
         content: string;
     };
+    model: string;
     done: true;
     created_at: string;
     total_duration: number;
@@ -145,11 +146,11 @@ declare const ollamaChatResponseSchema: z.ZodObject<{
 }>;
 export type OllamaChatResponse = z.infer<typeof ollamaChatResponseSchema>;
 declare const ollamaChatStreamChunkSchema: ZodSchema<{
-    model: string;
     message: {
         role: string;
         content: string;
     };
+    model: string;
     done: false;
     created_at: string;
 } | {
@@ -179,11 +180,11 @@ export declare const OllamaChatResponseFormat: {
             requestBodyValues: unknown;
             response: Response;
         }) => Promise<{
-            model: string;
             message: {
                 role: string;
                 content: string;
             };
+            model: string;
             done: true;
             created_at: string;
             total_duration: number;
@@ -203,11 +204,11 @@ export declare const OllamaChatResponseFormat: {
         handler: ({ response }: {
             response: Response;
         }) => Promise<AsyncIterable<import("../../index.js").Delta<{
-            model: string;
             message: {
                 role: string;
                 content: string;
             };
+            model: string;
             done: false;
             created_at: string;
         } | {

package/model-provider/ollama/OllamaChatModel.js

@@ -8,7 +8,7 @@ import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { chat, instruction, text } from "./OllamaChatPromptTemplate.js";

package/model-provider/ollama/OllamaCompletionModel.d.ts

@@ -8,7 +8,8 @@ import { PromptTemplateTextStreamingModel } from "../../model-function/generate-
 import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
 import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
 export interface OllamaCompletionPrompt {
     /**

package/model-provider/ollama/OllamaCompletionModel.js

@@ -8,7 +8,7 @@ import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { failedOllamaCallResponseHandler } from "./OllamaError.js";

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

@@ -132,13 +132,7 @@ describe("streamStructure", () => {
             raw: true,
         })
             .withTextPromptTemplate(TextPrompt.instruction())
-            .asStructureGenerationModel((0, jsonStructurePrompt_js_1.jsonStructurePrompt)((instruction, schema) => ({
-            system: "JSON schema: \n" +
-                JSON.stringify(schema.getJsonSchema()) +
-                "\n\n" +
-                "Respond only using JSON that matches the above schema.",
-            instruction,
-        }))), (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })), "generate a name");
+            .asStructureGenerationModel(jsonStructurePrompt_js_1.jsonStructurePrompt.text()), (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })), "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

@@ -107,13 +107,7 @@ describe("streamStructure", () => {
             raw: true,
         })
             .withTextPromptTemplate(TextPrompt.instruction())
-            .asStructureGenerationModel(jsonStructurePrompt((instruction, schema) => ({
-            system: "JSON schema: \n" +
-                JSON.stringify(schema.getJsonSchema()) +
-                "\n\n" +
-                "Respond only using JSON that matches the above schema.",
-            instruction,
-        }))), zodSchema(z.object({ name: z.string() })), "generate a name");
+            .asStructureGenerationModel(jsonStructurePrompt.text()), zodSchema(z.object({ name: z.string() })), "generate a name");
         // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
             { isComplete: false, value: {} },

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

@@ -52,16 +52,16 @@ export declare class OpenAITextEmbeddingModel extends AbstractModel<OpenAITextEm
     doEmbedValues(texts: string[], options?: FunctionOptions): Promise<{
         response: {
             object: "list";
-            usage: {
-                prompt_tokens: number;
-                total_tokens: number;
-            };
-            model: string;
             data: {
                 object: "embedding";
                 embedding: number[];
                 index: number;
             }[];
+            usage: {
+                prompt_tokens: number;
+                total_tokens: number;
+            };
+            model: string;
         };
         embeddings: number[][];
     }>;
@@ -95,28 +95,28 @@ declare const openAITextEmbeddingResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: "list";
-    usage: {
-        prompt_tokens: number;
-        total_tokens: number;
-    };
-    model: string;
     data: {
         object: "embedding";
         embedding: number[];
         index: number;
     }[];
-}, {
-    object: "list";
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
     model: string;
+}, {
+    object: "list";
     data: {
         object: "embedding";
         embedding: number[];
         index: number;
     }[];
+    usage: {
+        prompt_tokens: number;
+        total_tokens: number;
+    };
+    model: string;
 }>;
 export type OpenAITextEmbeddingResponse = z.infer<typeof openAITextEmbeddingResponseSchema>;
 export {};

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

@@ -64,6 +64,9 @@ export declare class OpenAITranscriptionModel extends AbstractModel<OpenAITransc
     doTranscribe(data: OpenAITranscriptionInput, options?: FunctionOptions): Promise<{
         response: {
             text: string;
+            task: "transcribe";
+            language: string;
+            duration: number;
             segments: {
                 text: string;
                 id: number;
@@ -77,9 +80,6 @@ export declare class OpenAITranscriptionModel extends AbstractModel<OpenAITransc
                 no_speech_prob: number;
                 transient?: boolean | undefined;
             }[];
-            task: "transcribe";
-            language: string;
-            duration: number;
         };
         transcription: string;
     }>;
@@ -141,6 +141,9 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
     text: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     text: string;
+    task: "transcribe";
+    language: string;
+    duration: number;
     segments: {
         text: string;
         id: number;
@@ -154,11 +157,11 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
         no_speech_prob: number;
         transient?: boolean | undefined;
     }[];
+}, {
+    text: string;
     task: "transcribe";
     language: string;
     duration: number;
-}, {
-    text: string;
     segments: {
         text: string;
         id: number;
@@ -172,9 +175,6 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
         no_speech_prob: number;
         transient?: boolean | undefined;
     }[];
-    task: "transcribe";
-    language: string;
-    duration: number;
 }>;
 export type OpenAITranscriptionVerboseJsonResponse = z.infer<typeof openAITranscriptionVerboseJsonSchema>;
 export type OpenAITranscriptionResponseFormatType<T> = {
@@ -192,6 +192,9 @@ export declare const OpenAITranscriptionResponseFormat: {
         type: "verbose_json";
         handler: ResponseHandler<{
             text: string;
+            task: "transcribe";
+            language: string;
+            duration: number;
             segments: {
                 text: string;
                 id: number;
@@ -205,9 +208,6 @@ export declare const OpenAITranscriptionResponseFormat: {
                 no_speech_prob: number;
                 transient?: boolean | undefined;
             }[];
-            task: "transcribe";
-            language: string;
-            duration: number;
         }>;
     };
     text: {

package/model-provider/openai/index.cjs

@@ -34,7 +34,6 @@ __exportStar(require("./OpenAIChatMessage.cjs"), exports);
 __exportStar(require("./OpenAIChatModel.cjs"), exports);
 exports.OpenAIChatPrompt = __importStar(require("./OpenAIChatPromptTemplate.cjs"));
 __exportStar(require("./OpenAICompletionModel.cjs"), exports);
-__exportStar(require("./OpenAICostCalculator.cjs"), exports);
 exports.openai = __importStar(require("./OpenAIFacade.cjs"));
 __exportStar(require("./OpenAIImageGenerationModel.cjs"), exports);
 __exportStar(require("./OpenAISpeechModel.cjs"), exports);

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

@@ -5,7 +5,6 @@ export * from "./OpenAIChatMessage.js";
 export * from "./OpenAIChatModel.js";
 export * as OpenAIChatPrompt from "./OpenAIChatPromptTemplate.js";
 export * from "./OpenAICompletionModel.js";
-export * from "./OpenAICostCalculator.js";
 export { OpenAIErrorData } from "./OpenAIError.js";
 export * as openai from "./OpenAIFacade.js";
 export * from "./OpenAIImageGenerationModel.js";

package/model-provider/openai/index.js

@@ -5,7 +5,6 @@ export * from "./OpenAIChatMessage.js";
 export * from "./OpenAIChatModel.js";
 export * as OpenAIChatPrompt from "./OpenAIChatPromptTemplate.js";
 export * from "./OpenAICompletionModel.js";
-export * from "./OpenAICostCalculator.js";
 export * as openai from "./OpenAIFacade.js";
 export * from "./OpenAIImageGenerationModel.js";
 export * from "./OpenAISpeechModel.js";

package/model-provider/stability/StabilityImageGenerationModel.d.ts

@@ -69,8 +69,8 @@ export declare class StabilityImageGenerationModel extends AbstractModel<Stabili
     doGenerateImages(prompt: StabilityImageGenerationPrompt, options?: FunctionOptions): Promise<{
         response: {
             artifacts: {
-                finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
                 base64: string;
+                finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
                 seed: number;
             }[];
         };
@@ -86,24 +86,24 @@ declare const stabilityImageGenerationResponseSchema: z.ZodObject<{
         seed: z.ZodNumber;
         finishReason: z.ZodEnum<["SUCCESS", "ERROR", "CONTENT_FILTERED"]>;
     }, "strip", z.ZodTypeAny, {
-        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         base64: string;
+        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         seed: number;
     }, {
-        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         base64: string;
+        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         seed: number;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     artifacts: {
-        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         base64: string;
+        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         seed: number;
     }[];
 }, {
     artifacts: {
-        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         base64: string;
+        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         seed: number;
     }[];
 }>;

package/package.json

@@ -1,20 +1,19 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.105.0",
+  "version": "0.106.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [
+    "ai",
     "llm",
+    "multimodal",
     "embedding",
     "openai",
-    "huggingface",
-    "gpt-3",
     "gpt-4",
-    "whisper",
-    "chatbot",
-    "ai",
-    "multimodal"
+    "ollama",
+    "llamacpp",
+    "whisper"
   ],
   "homepage": "https://modelfusion.dev/",
   "repository": {
@@ -47,21 +46,12 @@
       "types": "./extension/index.d.ts",
       "import": "./extension/index.js",
       "require": "./extension/index.cjs"
-    },
-    "./browser": {
-      "types": "./browser/index.d.ts",
-      "import": "./browser/index.js",
-      "require": "./browser/index.cjs"
-    },
-    "./fastify-server": {
-      "types": "./server/fastify/index.d.ts",
-      "import": "./server/fastify/index.js",
-      "require": "./server/fastify/index.cjs"
     }
   },
   "scripts": {
     "lint": "eslint --ext .ts src",
     "clean": "rimraf build dist .turbo node_modules",
+    "clean:build": "rimraf build dist",
     "build": "pnpm build:esm && pnpm build:cjs && pnpm build:copy-files",
     "build:esm": "tsc --outDir dist/",
     "build:cjs": "tsc --outDir build/cjs/ -p tsconfig.cjs.json && node bin/prepare-cjs.js",
@@ -70,7 +60,7 @@
     "test:watch": "vitest watch --config vitest.config.js",
     "test:coverage": "vitest run --config vitest.config.js --coverage",
     "test:coverage:ui": "vitest --config vitest.config.js --coverage --ui",
-    "dist": "pnpm clean && pnpm lint && pnpm test && pnpm build"
+    "dist": "pnpm clean:build && pnpm lint && pnpm test && pnpm build"
   },
   "dependencies": {
     "eventsource-parser": "1.1.1",
@@ -90,7 +80,6 @@
     "@vitest/ui": "1.1.0",
     "eslint": "^8.45.0",
     "eslint-config-prettier": "9.1.0",
-    "fastify": "^4.0.0",
-    "msw": "2.0.10"
+    "msw": "2.0.11"
   }
 }

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

@@ -37,7 +37,7 @@ class TextGenerationToolCallModel {
         try {
             return {
                 response,
-                toolCall: this.format.extractToolCall(text),
+                toolCall: this.format.extractToolCall(text, tool),
                 usage: metadata?.usage,
             };
         }

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

@@ -4,7 +4,7 @@ import { ToolDefinition } from "../ToolDefinition.js";
 import { ToolCallGenerationModel } from "./ToolCallGenerationModel.js";
 export interface ToolCallPromptTemplate<SOURCE_PROMPT, TARGET_PROMPT> {
     createPrompt: (prompt: SOURCE_PROMPT, tool: ToolDefinition<string, unknown>) => TARGET_PROMPT;
-    extractToolCall: (response: string) => {
+    extractToolCall: (response: string, tool: ToolDefinition<string, unknown>) => {
         id: string;
         args: unknown;
     } | null;

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

@@ -34,7 +34,7 @@ export class TextGenerationToolCallModel {
         try {
             return {
                 response,
-                toolCall: this.format.extractToolCall(text),
+                toolCall: this.format.extractToolCall(text, tool),
                 usage: metadata?.usage,
             };
         }