modelfusion 0.104.0 → 0.105.0

package/model-function/generate-text/prompt-template/ChatMLPromptTemplate.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const Content_js_1 = require("./Content.cjs");
+const ContentPart_js_1 = require("./ContentPart.cjs");
+const InvalidPromptError_js_1 = require("./InvalidPromptError.cjs");
 const START_SEGMENT = "<|im_start|>";
 const END_SEGMENT = "<|im_end|>";
 function segmentStart(role) {
@@ -40,7 +41,7 @@ function instruction() {
     return {
         stopSequences: [END_SEGMENT],
         format(prompt) {
-            const instruction = (0, Content_js_1.validateContentIsString)(prompt.instruction, prompt);
+            const instruction = (0, ContentPart_js_1.validateContentIsString)(prompt.instruction, prompt);
             return (segment("system", prompt.system) +
                 segment("user", instruction) +
                 segmentStart("assistant") +
@@ -69,14 +70,16 @@ function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
-                        text += segment("user", textContent);
+                        text += segment("user", (0, ContentPart_js_1.validateContentIsString)(content, prompt));
                         break;
                     }
                     case "assistant": {
-                        text += segment("assistant", content);
+                        text += segment("assistant", (0, ContentPart_js_1.validateContentIsString)(content, prompt));
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError_js_1.InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/ChatMLPromptTemplate.js

@@ -1,4 +1,5 @@
-import { validateContentIsString } from "./Content.js";
+import { validateContentIsString } from "./ContentPart.js";
+import { InvalidPromptError } from "./InvalidPromptError.js";
 const START_SEGMENT = "<|im_start|>";
 const END_SEGMENT = "<|im_end|>";
 function segmentStart(role) {
@@ -64,14 +65,16 @@ export function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        const textContent = validateContentIsString(content, prompt);
-                        text += segment("user", textContent);
+                        text += segment("user", validateContentIsString(content, prompt));
                         break;
                     }
                     case "assistant": {
-                        text += segment("assistant", content);
+                        text += segment("assistant", validateContentIsString(content, prompt));
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/ChatPrompt.cjs

@@ -1,2 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChatMessage = void 0;
+exports.ChatMessage = {
+    user({ text }) {
+        return {
+            role: "user",
+            content: text,
+        };
+    },
+    tool({ toolResults, }) {
+        return {
+            role: "tool",
+            content: createToolContent({ toolResults }),
+        };
+    },
+    assistant({ text, toolResults, }) {
+        return {
+            role: "assistant",
+            content: createAssistantContent({ text, toolResults }),
+        };
+    },
+};
+function createToolContent({ toolResults, }) {
+    const toolContent = [];
+    for (const { result, toolCall } of toolResults ?? []) {
+        toolContent.push({
+            type: "tool-response",
+            id: toolCall.id,
+            response: result,
+        });
+    }
+    return toolContent;
+}
+function createAssistantContent({ text, toolResults, }) {
+    const content = [];
+    if (text != null) {
+        content.push({ type: "text", text });
+    }
+    for (const { toolCall } of toolResults ?? []) {
+        content.push({ type: "tool-call", ...toolCall });
+    }
+    return content;
+}

package/model-function/generate-text/prompt-template/ChatPrompt.d.ts

@@ -1,10 +1,14 @@
-import { Content } from "./Content.js";
+import { ToolCallResult } from "../../../tool/ToolCallResult.js";
+import { ImagePart, TextPart, ToolCallPart, ToolResponsePart } from "./ContentPart.js";
 /**
- * A chat prompt is a combination of a system message and a list of user and assistant messages.
+ * A chat prompt is a combination of a system message and a list
+ * of user, assistant, and tool messages.
  *
  * The user messages can contain multi-modal content.
+ * The assistant messages can contain tool calls.
  *
- * Note: Not all models and prompt formats support multi-modal inputs.
+ * Note: Not all models and prompt formats support multi-modal inputs and tool calls.
+ * The validation happens at runtime.
  *
  * @example
  * ```ts
@@ -22,6 +26,9 @@ export interface ChatPrompt {
     system?: string;
     messages: Array<ChatMessage>;
 }
+export type UserContent = string | Array<TextPart | ImagePart>;
+export type AssistantContent = string | Array<TextPart | ToolCallPart>;
+export type ToolContent = Array<ToolResponsePart>;
 /**
  * A message in a chat prompt.
  *
@@ -29,8 +36,23 @@ export interface ChatPrompt {
  */
 export type ChatMessage = {
     role: "user";
-    content: Content;
+    content: UserContent;
 } | {
     role: "assistant";
-    content: string;
+    content: AssistantContent;
+} | {
+    role: "tool";
+    content: ToolContent;
+};
+export declare const ChatMessage: {
+    user({ text }: {
+        text: string;
+    }): ChatMessage;
+    tool({ toolResults, }: {
+        toolResults: ToolCallResult<string, unknown, unknown>[] | null;
+    }): ChatMessage;
+    assistant({ text, toolResults, }: {
+        text: string | null;
+        toolResults: ToolCallResult<string, unknown, unknown>[] | null;
+    }): ChatMessage;
 };

package/model-function/generate-text/prompt-template/ChatPrompt.js

@@ -1 +1,41 @@
-export {};
+export const ChatMessage = {
+    user({ text }) {
+        return {
+            role: "user",
+            content: text,
+        };
+    },
+    tool({ toolResults, }) {
+        return {
+            role: "tool",
+            content: createToolContent({ toolResults }),
+        };
+    },
+    assistant({ text, toolResults, }) {
+        return {
+            role: "assistant",
+            content: createAssistantContent({ text, toolResults }),
+        };
+    },
+};
+function createToolContent({ toolResults, }) {
+    const toolContent = [];
+    for (const { result, toolCall } of toolResults ?? []) {
+        toolContent.push({
+            type: "tool-response",
+            id: toolCall.id,
+            response: result,
+        });
+    }
+    return toolContent;
+}
+function createAssistantContent({ text, toolResults, }) {
+    const content = [];
+    if (text != null) {
+        content.push({ type: "text", text });
+    }
+    for (const { toolCall } of toolResults ?? []) {
+        content.push({ type: "tool-call", ...toolCall });
+    }
+    return content;
+}

package/model-function/generate-text/prompt-template/{Content.cjs → ContentPart.cjs}

@@ -4,7 +4,7 @@ exports.validateContentIsString = void 0;
 const InvalidPromptError_js_1 = require("./InvalidPromptError.cjs");
 function validateContentIsString(content, prompt) {
     if (typeof content !== "string") {
-        throw new InvalidPromptError_js_1.InvalidPromptError("only text prompts are are supported by this prompt template", prompt);
+        throw new InvalidPromptError_js_1.InvalidPromptError("Only text prompts are are supported by this prompt template.", prompt);
     }
     return content;
 }

package/model-function/generate-text/prompt-template/ContentPart.d.ts

@@ -0,0 +1,30 @@
+export interface TextPart {
+    type: "text";
+    /**
+     * The text content.
+     */
+    text: string;
+}
+export interface ImagePart {
+    type: "image";
+    /**
+     * Base-64 encoded image.
+     */
+    base64Image: string;
+    /**
+     * Optional mime type of the image.
+     */
+    mimeType?: string;
+}
+export interface ToolCallPart {
+    type: "tool-call";
+    id: string;
+    name: string;
+    args: unknown;
+}
+export interface ToolResponsePart {
+    type: "tool-response";
+    id: string;
+    response: unknown;
+}
+export declare function validateContentIsString(content: string | unknown, prompt: unknown): string;

package/model-function/generate-text/prompt-template/{Content.js → ContentPart.js}

@@ -1,7 +1,7 @@
 import { InvalidPromptError } from "./InvalidPromptError.js";
 export function validateContentIsString(content, prompt) {
     if (typeof content !== "string") {
-        throw new InvalidPromptError("only text prompts are are supported by this prompt template", prompt);
+        throw new InvalidPromptError("Only text prompts are are supported by this prompt template.", prompt);
     }
     return content;
 }

package/model-function/generate-text/prompt-template/InstructionPrompt.d.ts

@@ -1,4 +1,4 @@
-import { Content } from "./Content.js";
+import { ImagePart, TextPart } from "./ContentPart";
 /**
  * A single text instruction prompt. It can contain an optional system message to define
  * the role and behavior of the language model.
@@ -22,10 +22,11 @@ export interface InstructionPrompt {
     /**
      * The instruction for the model.
      */
-    instruction: Content;
+    instruction: InstructionContent;
     /**
      * Response prefix that will be injected in the prompt at the beginning of the response.
      * This is useful for guiding the model by starting its response with a specific text.
      */
     responsePrefix?: string;
 }
+export type InstructionContent = string | Array<TextPart | ImagePart>;

package/model-function/generate-text/prompt-template/Llama2PromptTemplate.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateLlama2Prompt = exports.chat = exports.instruction = exports.text = void 0;
-const Content_js_1 = require("./Content.cjs");
+const ContentPart_js_1 = require("./ContentPart.cjs");
 const InvalidPromptError_js_1 = require("./InvalidPromptError.cjs");
 // see https://github.com/facebookresearch/llama/blob/6c7fe276574e78057f917549435a2554000a876d/llama/generation.py#L44
 const BEGIN_SEGMENT = "<s>";
@@ -48,7 +48,7 @@ function instruction() {
     return {
         stopSequences: [END_SEGMENT],
         format(prompt) {
-            const instruction = (0, Content_js_1.validateContentIsString)(prompt.instruction, prompt);
+            const instruction = (0, ContentPart_js_1.validateContentIsString)(prompt.instruction, prompt);
             return `${BEGIN_SEGMENT}${BEGIN_INSTRUCTION}${prompt.system != null
                 ? `${BEGIN_SYSTEM}${prompt.system}${END_SYSTEM}`
                 : ""}${instruction}${END_INSTRUCTION}${prompt.responsePrefix ?? ""}`;
@@ -80,14 +80,17 @@ function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
+                        const textContent = (0, ContentPart_js_1.validateContentIsString)(content, prompt);
                         text += `${BEGIN_SEGMENT}${BEGIN_INSTRUCTION}${textContent}${END_INSTRUCTION}`;
                         break;
                     }
                     case "assistant": {
-                        text += `${content}${END_SEGMENT}`;
+                        text += `${(0, ContentPart_js_1.validateContentIsString)(content, prompt)}${END_SEGMENT}`;
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError_js_1.InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/Llama2PromptTemplate.js

@@ -1,4 +1,4 @@
-import { validateContentIsString } from "./Content.js";
+import { validateContentIsString } from "./ContentPart.js";
 import { InvalidPromptError } from "./InvalidPromptError.js";
 // see https://github.com/facebookresearch/llama/blob/6c7fe276574e78057f917549435a2554000a876d/llama/generation.py#L44
 const BEGIN_SEGMENT = "<s>";
@@ -80,9 +80,12 @@ export function chat() {
                         break;
                     }
                     case "assistant": {
-                        text += `${content}${END_SEGMENT}`;
+                        text += `${validateContentIsString(content, prompt)}${END_SEGMENT}`;
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/NeuralChatPromptTemplate.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const Content_js_1 = require("./Content.cjs");
+const ContentPart_js_1 = require("./ContentPart.cjs");
+const InvalidPromptError_js_1 = require("./InvalidPromptError.cjs");
 const roleNames = {
     system: "System",
     user: "User",
@@ -36,7 +37,7 @@ exports.text = text;
 const instruction = () => ({
     stopSequences: [],
     format(prompt) {
-        const instruction = (0, Content_js_1.validateContentIsString)(prompt.instruction, prompt);
+        const instruction = (0, ContentPart_js_1.validateContentIsString)(prompt.instruction, prompt);
         return (segment("system", prompt.system) +
             segment("user", instruction) +
             segmentStart("assistant") +
@@ -58,14 +59,17 @@ function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
+                        const textContent = (0, ContentPart_js_1.validateContentIsString)(content, prompt);
                         text += segment("user", textContent);
                         break;
                     }
                     case "assistant": {
-                        text += segment("assistant", content);
+                        text += segment("assistant", (0, ContentPart_js_1.validateContentIsString)(content, prompt));
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError_js_1.InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/NeuralChatPromptTemplate.js

@@ -1,4 +1,5 @@
-import { validateContentIsString } from "./Content.js";
+import { validateContentIsString } from "./ContentPart.js";
+import { InvalidPromptError } from "./InvalidPromptError.js";
 const roleNames = {
     system: "System",
     user: "User",
@@ -58,9 +59,12 @@ export function chat() {
                         break;
                     }
                     case "assistant": {
-                        text += segment("assistant", content);
+                        text += segment("assistant", validateContentIsString(content, prompt));
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/TextPromptTemplate.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const Content_js_1 = require("./Content.cjs");
+const ContentPart_js_1 = require("./ContentPart.cjs");
+const InvalidPromptError_js_1 = require("./InvalidPromptError.cjs");
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
@@ -20,7 +21,7 @@ const instruction = () => ({
         if (prompt.system != null) {
             text += `${prompt.system}\n\n`;
         }
-        text += `${(0, Content_js_1.validateContentIsString)(prompt.instruction, prompt)}\n\n`;
+        text += `${(0, ContentPart_js_1.validateContentIsString)(prompt.instruction, prompt)}\n\n`;
         if (prompt.responsePrefix != null) {
             text += prompt.responsePrefix;
         }
@@ -43,13 +44,16 @@ const chat = ({ user = "user", assistant = "assistant", system, } = {}) => ({
         for (const { role, content } of prompt.messages) {
             switch (role) {
                 case "user": {
-                    text += `${user}:\n${(0, Content_js_1.validateContentIsString)(content, prompt)}\n\n`;
+                    text += `${user}:\n${(0, ContentPart_js_1.validateContentIsString)(content, prompt)}\n\n`;
                     break;
                 }
                 case "assistant": {
-                    text += `${assistant}:\n${content}\n\n`;
+                    text += `${assistant}:\n${(0, ContentPart_js_1.validateContentIsString)(content, prompt)}\n\n`;
                     break;
                 }
+                case "tool": {
+                    throw new InvalidPromptError_js_1.InvalidPromptError("Tool messages are not supported.", prompt);
+                }
                 default: {
                     const _exhaustiveCheck = role;
                     throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/TextPromptTemplate.js

@@ -1,4 +1,5 @@
-import { validateContentIsString } from "./Content.js";
+import { validateContentIsString } from "./ContentPart.js";
+import { InvalidPromptError } from "./InvalidPromptError.js";
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
@@ -42,9 +43,12 @@ export const chat = ({ user = "user", assistant = "assistant", system, } = {}) =
                     break;
                 }
                 case "assistant": {
-                    text += `${assistant}:\n${content}\n\n`;
+                    text += `${assistant}:\n${validateContentIsString(content, prompt)}\n\n`;
                     break;
                 }
+                case "tool": {
+                    throw new InvalidPromptError("Tool messages are not supported.", prompt);
+                }
                 default: {
                     const _exhaustiveCheck = role;
                     throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = void 0;
-const Content_js_1 = require("./Content.cjs");
+const ContentPart_js_1 = require("./ContentPart.cjs");
+const InvalidPromptError_js_1 = require("./InvalidPromptError.cjs");
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";
@@ -27,14 +28,17 @@ function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
+                        const textContent = (0, ContentPart_js_1.validateContentIsString)(content, prompt);
                         text += `USER: ${textContent}\n`;
                         break;
                     }
                     case "assistant": {
-                        text += `ASSISTANT: ${content}\n`;
+                        text += `ASSISTANT: ${(0, ContentPart_js_1.validateContentIsString)(content, prompt)}\n`;
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError_js_1.InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.js

@@ -1,4 +1,5 @@
-import { validateContentIsString } from "./Content.js";
+import { validateContentIsString } from "./ContentPart.js";
+import { InvalidPromptError } from "./InvalidPromptError.js";
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";
@@ -29,9 +30,12 @@ export function chat() {
                         break;
                     }
                     case "assistant": {
-                        text += `ASSISTANT: ${content}\n`;
+                        text += `ASSISTANT: ${validateContentIsString(content, prompt)}\n`;
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-function/generate-text/prompt-template/index.cjs

@@ -30,7 +30,7 @@ exports.VicunaPrompt = exports.TextPrompt = exports.NeuralChatPrompt = exports.L
 exports.AlpacaPrompt = __importStar(require("./AlpacaPromptTemplate.cjs"));
 exports.ChatMLPrompt = __importStar(require("./ChatMLPromptTemplate.cjs"));
 __exportStar(require("./ChatPrompt.cjs"), exports);
-__exportStar(require("./Content.cjs"), exports);
+__exportStar(require("./ContentPart.cjs"), exports);
 __exportStar(require("./InstructionPrompt.cjs"), exports);
 __exportStar(require("./InvalidPromptError.cjs"), exports);
 exports.Llama2Prompt = __importStar(require("./Llama2PromptTemplate.cjs"));

package/model-function/generate-text/prompt-template/index.d.ts

@@ -1,7 +1,7 @@
 export * as AlpacaPrompt from "./AlpacaPromptTemplate.js";
 export * as ChatMLPrompt from "./ChatMLPromptTemplate.js";
 export * from "./ChatPrompt.js";
-export * from "./Content.js";
+export * from "./ContentPart.js";
 export * from "./InstructionPrompt.js";
 export * from "./InvalidPromptError.js";
 export * as Llama2Prompt from "./Llama2PromptTemplate.js";

package/model-function/generate-text/prompt-template/index.js

@@ -1,7 +1,7 @@
 export * as AlpacaPrompt from "./AlpacaPromptTemplate.js";
 export * as ChatMLPrompt from "./ChatMLPromptTemplate.js";
 export * from "./ChatPrompt.js";
-export * from "./Content.js";
+export * from "./ContentPart.js";
 export * from "./InstructionPrompt.js";
 export * from "./InvalidPromptError.js";
 export * as Llama2Prompt from "./Llama2PromptTemplate.js";

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

@@ -5,9 +5,12 @@ const executeStreamCall_js_1 = require("../executeStreamCall.cjs");
 async function streamText(model, prompt, options) {
     const shouldTrimWhitespace = model.settings.trimWhitespace ?? true;
     let accumulatedText = "";
-    let lastFullDelta;
     let isFirstDelta = true;
     let trailingWhitespace = "";
+    let resolveText;
+    const textPromise = new Promise((resolve) => {
+        resolveText = resolve;
+    });
     const fullResponse = await (0, executeStreamCall_js_1.executeStreamCall)({
         functionType: "stream-text",
         input: prompt,
@@ -15,39 +18,35 @@ async function streamText(model, prompt, options) {
         options,
         startStream: async (options) => model.doStreamText(prompt, options),
         processDelta: (delta) => {
-            lastFullDelta = delta.fullDelta;
-            let textDelta = delta.valueDelta;
-            if (textDelta != null && textDelta.length > 0) {
-                if (shouldTrimWhitespace) {
-                    if (isFirstDelta) {
-                        // remove leading whitespace:
-                        textDelta = textDelta.trimStart();
-                    }
-                    else {
-                        // restore trailing whitespace from previous chunk:
-                        textDelta = trailingWhitespace + textDelta;
-                    }
-                    // trim trailing whitespace and store it for the next chunk:
-                    const trailingWhitespaceMatch = textDelta.match(/\s+$/);
-                    trailingWhitespace = trailingWhitespaceMatch
-                        ? trailingWhitespaceMatch[0]
-                        : "";
-                    textDelta = textDelta.trimEnd();
-                }
-                isFirstDelta = false;
-                accumulatedText += textDelta;
-                return textDelta;
+            let textDelta = model.extractTextDelta(delta.deltaValue);
+            if (textDelta == null || textDelta.length === 0) {
+                return undefined;
+            }
+            if (shouldTrimWhitespace) {
+                textDelta = isFirstDelta
+                    ? // remove leading whitespace:
+                        textDelta.trimStart()
+                    : // restore trailing whitespace from previous chunk:
+                        trailingWhitespace + textDelta;
+                // trim trailing whitespace and store it for the next chunk:
+                const trailingWhitespaceMatch = textDelta.match(/\s+$/);
+                trailingWhitespace = trailingWhitespaceMatch
+                    ? trailingWhitespaceMatch[0]
+                    : "";
+                textDelta = textDelta.trimEnd();
             }
-            return undefined;
+            isFirstDelta = false;
+            accumulatedText += textDelta;
+            return textDelta;
+        },
+        onDone: () => {
+            resolveText(accumulatedText);
         },
-        getResult: () => ({
-            response: lastFullDelta,
-            value: accumulatedText,
-        }),
     });
     return options?.fullResponse
         ? {
             textStream: fullResponse.value,
+            text: textPromise,
             metadata: fullResponse.metadata,
         }
         : fullResponse.value;

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

@@ -33,5 +33,6 @@ export declare function streamText<PROMPT>(model: TextStreamingModel<PROMPT>, pr
     fullResponse: true;
 }): Promise<{
     textStream: AsyncIterable<string>;
+    text: PromiseLike<string>;
     metadata: Omit<ModelCallMetadata, "durationInMs" | "finishTimestamp">;
 }>;