modelfusion 0.103.0 → 0.105.0

package/model-provider/anthropic/AnthropicPromptTemplate.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const ChatPrompt_js_1 = require("../../model-function/generate-text/prompt-template/ChatPrompt.cjs");
+const ContentPart_js_1 = require("../../model-function/generate-text/prompt-template/ContentPart.cjs");
+const InvalidPromptError_js_1 = require("../../model-function/generate-text/prompt-template/InvalidPromptError.cjs");
 const HUMAN_PREFIX = "\n\nHuman:";
 const ASSISTANT_PREFIX = "\n\nAssistant:";
 /**
@@ -26,9 +27,10 @@ exports.text = text;
 function instruction() {
     return {
         format(prompt) {
+            const instruction = (0, ContentPart_js_1.validateContentIsString)(prompt.instruction, prompt);
             let text = prompt.system ?? "";
             text += HUMAN_PREFIX;
-            text += prompt.instruction;
+            text += instruction;
             text += ASSISTANT_PREFIX;
             if (prompt.responsePrefix != null) {
                 text += prompt.responsePrefix;
@@ -47,13 +49,13 @@ exports.instruction = instruction;
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             let text = prompt.system ?? "";
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
+                        const textContent = (0, ContentPart_js_1.validateContentIsString)(content, prompt);
                         text += HUMAN_PREFIX;
-                        text += content;
+                        text += textContent;
                         break;
                     }
                     case "assistant": {
@@ -61,6 +63,9 @@ function chat() {
                         text += content;
                         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-provider/anthropic/AnthropicPromptTemplate.d.ts

@@ -1,6 +1,6 @@
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
-import { TextChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
-import { TextInstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
+import { ChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
+import { InstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
 /**
  * Formats a text prompt as an Anthropic prompt.
  */
@@ -8,10 +8,10 @@ export declare function text(): TextGenerationPromptTemplate<string, string>;
 /**
  * Formats an instruction prompt as an Anthropic prompt.
  */
-export declare function instruction(): TextGenerationPromptTemplate<TextInstructionPrompt, string>;
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as an Anthropic prompt.
  *
  * @see https://docs.anthropic.com/claude/docs/constructing-a-prompt
  */
-export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, string>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, string>;

package/model-provider/anthropic/AnthropicPromptTemplate.js

@@ -1,4 +1,5 @@
-import { validateChatPrompt, } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
+import { validateContentIsString } from "../../model-function/generate-text/prompt-template/ContentPart.js";
+import { InvalidPromptError } from "../../model-function/generate-text/prompt-template/InvalidPromptError.js";
 const HUMAN_PREFIX = "\n\nHuman:";
 const ASSISTANT_PREFIX = "\n\nAssistant:";
 /**
@@ -22,9 +23,10 @@ export function text() {
 export function instruction() {
     return {
         format(prompt) {
+            const instruction = validateContentIsString(prompt.instruction, prompt);
             let text = prompt.system ?? "";
             text += HUMAN_PREFIX;
-            text += prompt.instruction;
+            text += instruction;
             text += ASSISTANT_PREFIX;
             if (prompt.responsePrefix != null) {
                 text += prompt.responsePrefix;
@@ -42,13 +44,13 @@ export function instruction() {
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             let text = prompt.system ?? "";
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
+                        const textContent = validateContentIsString(content, prompt);
                         text += HUMAN_PREFIX;
-                        text += content;
+                        text += textContent;
                         break;
                     }
                     case "assistant": {
@@ -56,6 +58,9 @@ export function chat() {
                         text += content;
                         break;
                     }
+                    case "tool": {
+                        throw new InvalidPromptError("Tool messages are not supported.", prompt);
+                    }
                     default: {
                         const _exhaustiveCheck = role;
                         throw new Error(`Unsupported role: ${_exhaustiveCheck}`);

package/model-provider/anthropic/AnthropicTextGenerationModel.cjs

@@ -85,7 +85,7 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
                         model: this.settings.model,
                         prompt,
                         stream: responseFormat.stream,
-                        max_tokens_to_sample: this.settings.maxGenerationTokens,
+                        max_tokens_to_sample: this.settings.maxGenerationTokens ?? 100,
                         temperature: this.settings.temperature,
                         top_k: this.settings.topK,
                         top_p: this.settings.topP,
@@ -140,6 +140,10 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             responseFormat: exports.AnthropicTextGenerationResponseFormat.deltaIterable,
         });
     }
+    extractTextDelta(delta) {
+        const chunk = delta;
+        return chunk.completion;
+    }
     /**
      * Returns this model with a text prompt template.
      */
@@ -179,14 +183,13 @@ const anthropicTextGenerationResponseSchema = zod_1.z.object({
     stop_reason: zod_1.z.string(),
     model: zod_1.z.string(),
 });
-const anthropicTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const anthropicTextStreamChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     completion: zod_1.z.string(),
     stop_reason: zod_1.z.string().nullable(),
     model: zod_1.z.string(),
 }));
 async function createAnthropicFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
-    let content = "";
     // process the stream asynchonously (no 'await' on purpose):
     (0, parseEventSourceStream_js_1.parseEventSourceStream)({ stream })
         .then(async (events) => {
@@ -203,18 +206,9 @@ async function createAnthropicFullDeltaIterableQueue(stream) {
                 const data = event.data;
                 const eventData = (0, parseJSON_js_1.parseJSON)({
                     text: data,
-                    schema: anthropicTextStreamingResponseSchema,
-                });
-                content += eventData.completion;
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content,
-                        isComplete: eventData.stop_reason != null,
-                        delta: eventData.completion,
-                    },
-                    valueDelta: eventData.completion,
+                    schema: anthropicTextStreamChunkSchema,
                 });
+                queue.push({ type: "delta", deltaValue: eventData });
                 if (eventData.stop_reason != null) {
                     queue.close();
                 }

package/model-provider/anthropic/AnthropicTextGenerationModel.d.ts

@@ -62,7 +62,12 @@ export declare class AnthropicTextGenerationModel extends AbstractModel<Anthropi
         }[];
     }>;
     private translateFinishReason;
-    doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
+    doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<{
+        model: string;
+        completion: string;
+        stop_reason: string | null;
+    }>>>;
+    extractTextDelta(delta: unknown): string;
     /**
      * Returns this model with a text prompt template.
      */
@@ -70,11 +75,11 @@ export declare class AnthropicTextGenerationModel extends AbstractModel<Anthropi
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, AnthropicTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, string, AnthropicTextGenerationModelSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, AnthropicTextGenerationModelSettings, this>;
+    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, string, AnthropicTextGenerationModelSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, AnthropicTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<AnthropicTextGenerationModelSettings>): this;
 }
@@ -116,7 +121,11 @@ export declare const AnthropicTextGenerationResponseFormat: {
         stream: true;
         handler: ({ response }: {
             response: Response;
-        }) => Promise<AsyncIterable<Delta<string>>>;
+        }) => Promise<AsyncIterable<Delta<{
+            model: string;
+            completion: string;
+            stop_reason: string | null;
+        }>>>;
     };
 };
 export {};

package/model-provider/anthropic/AnthropicTextGenerationModel.js

@@ -82,7 +82,7 @@ export class AnthropicTextGenerationModel extends AbstractModel {
                         model: this.settings.model,
                         prompt,
                         stream: responseFormat.stream,
-                        max_tokens_to_sample: this.settings.maxGenerationTokens,
+                        max_tokens_to_sample: this.settings.maxGenerationTokens ?? 100,
                         temperature: this.settings.temperature,
                         top_k: this.settings.topK,
                         top_p: this.settings.topP,
@@ -137,6 +137,10 @@ export class AnthropicTextGenerationModel extends AbstractModel {
             responseFormat: AnthropicTextGenerationResponseFormat.deltaIterable,
         });
     }
+    extractTextDelta(delta) {
+        const chunk = delta;
+        return chunk.completion;
+    }
     /**
      * Returns this model with a text prompt template.
      */
@@ -175,14 +179,13 @@ const anthropicTextGenerationResponseSchema = z.object({
     stop_reason: z.string(),
     model: z.string(),
 });
-const anthropicTextStreamingResponseSchema = new ZodSchema(z.object({
+const anthropicTextStreamChunkSchema = new ZodSchema(z.object({
     completion: z.string(),
     stop_reason: z.string().nullable(),
     model: z.string(),
 }));
 async function createAnthropicFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue();
-    let content = "";
     // process the stream asynchonously (no 'await' on purpose):
     parseEventSourceStream({ stream })
         .then(async (events) => {
@@ -199,18 +202,9 @@ async function createAnthropicFullDeltaIterableQueue(stream) {
                 const data = event.data;
                 const eventData = parseJSON({
                     text: data,
-                    schema: anthropicTextStreamingResponseSchema,
-                });
-                content += eventData.completion;
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content,
-                        isComplete: eventData.stop_reason != null,
-                        delta: eventData.completion,
-                    },
-                    valueDelta: eventData.completion,
+                    schema: anthropicTextStreamChunkSchema,
                 });
+                queue.push({ type: "delta", deltaValue: eventData });
                 if (eventData.stop_reason != null) {
                     queue.close();
                 }

package/model-provider/anthropic/AnthropicTextGenerationModel.test.cjs

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const streamText_js_1 = require("../../model-function/generate-text/streamText.cjs");
+const StreamingTestServer_js_1 = require("../../test/StreamingTestServer.cjs");
+const arrayFromAsync_js_1 = require("../../test/arrayFromAsync.cjs");
+const AnthropicApiConfiguration_js_1 = require("./AnthropicApiConfiguration.cjs");
+const AnthropicTextGenerationModel_js_1 = require("./AnthropicTextGenerationModel.cjs");
+describe("streamText", () => {
+    const server = new StreamingTestServer_js_1.StreamingTestServer("https://api.anthropic.com/v1/complete");
+    server.setupTestEnvironment();
+    it("should return a text stream", async () => {
+        server.responseChunks = [
+            `event: completion\n` +
+                `data: {"type":"completion","id":"compl_01Vtux5THXXB3eXhFSA5eTY6",` +
+                `"completion":" Hello","stop_reason":null,"model":"claude-instant-1.2",` +
+                `"stop":null,"log_id":"compl_01Vtux5THXXB3eXhFSA5eTY6"}\n\n`,
+            `event: completion\n` +
+                `data: {"type":"completion","id":"compl_01Vtux5THXXB3eXhFSA5eTY6",` +
+                `"completion":", ","stop_reason":null,"model":"claude-instant-1.2",` +
+                `"stop":null,"log_id":"compl_01Vtux5THXXB3eXhFSA5eTY6"}\n\n`,
+            `event: completion\n` +
+                `data: {"type":"completion","id":"compl_01Vtux5THXXB3eXhFSA5eTY6",` +
+                `"completion":"world!","stop_reason":null,"model":"claude-instant-1.2",` +
+                `"stop":null,"log_id":"compl_01Vtux5THXXB3eXhFSA5eTY6"}\n\n`,
+            `event: ping\ndata: {"type": "ping"}\n\n`,
+            `event: completion\n` +
+                `data: {"type":"completion","id":"compl_01Vtux5THXXB3eXhFSA5eTY6",` +
+                `"completion":"","stop_reason":"stop_sequence","model":"claude-instant-1.2",` +
+                `"stop":"\\n\\nHuman:","log_id":"compl_01Vtux5THXXB3eXhFSA5eTY6"}\n\n`,
+        ];
+        const stream = await (0, streamText_js_1.streamText)(new AnthropicTextGenerationModel_js_1.AnthropicTextGenerationModel({
+            api: new AnthropicApiConfiguration_js_1.AnthropicApiConfiguration({
+                apiKey: "test-key",
+            }),
+            model: "claude-instant-1",
+        }).withTextPrompt(), "hello");
+        // note: space moved to last chunk bc of trimming
+        expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
+            "Hello",
+            ",",
+            " world!",
+        ]);
+    });
+});

package/model-provider/anthropic/AnthropicTextGenerationModel.test.js

@@ -0,0 +1,42 @@
+import { streamText } from "../../model-function/generate-text/streamText.js";
+import { StreamingTestServer } from "../../test/StreamingTestServer.js";
+import { arrayFromAsync } from "../../test/arrayFromAsync.js";
+import { AnthropicApiConfiguration } from "./AnthropicApiConfiguration.js";
+import { AnthropicTextGenerationModel } from "./AnthropicTextGenerationModel.js";
+describe("streamText", () => {
+    const server = new StreamingTestServer("https://api.anthropic.com/v1/complete");
+    server.setupTestEnvironment();
+    it("should return a text stream", async () => {
+        server.responseChunks = [
+            `event: completion\n` +
+                `data: {"type":"completion","id":"compl_01Vtux5THXXB3eXhFSA5eTY6",` +
+                `"completion":" Hello","stop_reason":null,"model":"claude-instant-1.2",` +
+                `"stop":null,"log_id":"compl_01Vtux5THXXB3eXhFSA5eTY6"}\n\n`,
+            `event: completion\n` +
+                `data: {"type":"completion","id":"compl_01Vtux5THXXB3eXhFSA5eTY6",` +
+                `"completion":", ","stop_reason":null,"model":"claude-instant-1.2",` +
+                `"stop":null,"log_id":"compl_01Vtux5THXXB3eXhFSA5eTY6"}\n\n`,
+            `event: completion\n` +
+                `data: {"type":"completion","id":"compl_01Vtux5THXXB3eXhFSA5eTY6",` +
+                `"completion":"world!","stop_reason":null,"model":"claude-instant-1.2",` +
+                `"stop":null,"log_id":"compl_01Vtux5THXXB3eXhFSA5eTY6"}\n\n`,
+            `event: ping\ndata: {"type": "ping"}\n\n`,
+            `event: completion\n` +
+                `data: {"type":"completion","id":"compl_01Vtux5THXXB3eXhFSA5eTY6",` +
+                `"completion":"","stop_reason":"stop_sequence","model":"claude-instant-1.2",` +
+                `"stop":"\\n\\nHuman:","log_id":"compl_01Vtux5THXXB3eXhFSA5eTY6"}\n\n`,
+        ];
+        const stream = await streamText(new AnthropicTextGenerationModel({
+            api: new AnthropicApiConfiguration({
+                apiKey: "test-key",
+            }),
+            model: "claude-instant-1",
+        }).withTextPrompt(), "hello");
+        // note: space moved to last chunk bc of trimming
+        expect(await arrayFromAsync(stream)).toStrictEqual([
+            "Hello",
+            ",",
+            " world!",
+        ]);
+    });
+});

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.d.ts

@@ -49,7 +49,7 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     }>;
     withTextPrompt(): PromptTemplateImageGenerationModel<string, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, Automatic1111ImageGenerationPrompt>): PromptTemplateImageGenerationModel<INPUT_PROMPT, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
-    withSettings(additionalSettings: Automatic1111ImageGenerationSettings): this;
+    withSettings(additionalSettings: Partial<Automatic1111ImageGenerationSettings>): this;
 }
 declare const Automatic1111ImageGenerationResponseSchema: z.ZodObject<{
     images: z.ZodArray<z.ZodString, "many">;

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -10,8 +10,7 @@ const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/gene
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const TextPromptTemplate_js_1 = require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
-const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
-const parseJsonStream_js_1 = require("../../util/streaming/parseJsonStream.cjs");
+const createJsonStreamResponseHandler_js_1 = require("../../util/streaming/createJsonStreamResponseHandler.cjs");
 const CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereError_js_1 = require("./CohereError.cjs");
 const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");
@@ -163,8 +162,9 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             responseFormat: exports.CohereTextGenerationResponseFormat.deltaIterable,
         });
     }
-    extractTextDelta(fullDelta) {
-        return fullDelta.delta;
+    extractTextDelta(delta) {
+        const chunk = delta;
+        return chunk.is_finished === true ? "" : chunk.text;
     }
     /**
      * Returns this model with an instruction prompt template.
@@ -210,7 +210,7 @@ const cohereTextGenerationResponseSchema = zod_1.z.object({
     })
         .optional(),
 });
-const cohereTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminatedUnion("is_finished", [
+const cohereTextStreamChunkSchema = (0, ZodSchema_js_1.zodSchema)(zod_1.z.discriminatedUnion("is_finished", [
     zod_1.z.object({
         text: zod_1.z.string(),
         is_finished: zod_1.z.literal(false),
@@ -221,44 +221,6 @@ const cohereTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.d
         response: cohereTextGenerationResponseSchema,
     }),
 ]));
-async function createCohereTextGenerationFullDeltaIterableQueue(stream) {
-    const queue = new AsyncQueue_js_1.AsyncQueue();
-    let accumulatedText = "";
-    // process the stream asynchonously (no 'await' on purpose):
-    (0, parseJsonStream_js_1.parseJsonStream)({
-        stream,
-        schema: cohereTextStreamingResponseSchema,
-        process(event) {
-            if (event.is_finished === true) {
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content: accumulatedText,
-                        isComplete: true,
-                        delta: "",
-                    },
-                    valueDelta: "",
-                });
-            }
-            else {
-                accumulatedText += event.text;
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content: accumulatedText,
-                        isComplete: false,
-                        delta: event.text,
-                    },
-                    valueDelta: event.text,
-                });
-            }
-        },
-        onDone() {
-            queue.close();
-        },
-    });
-    return queue;
-}
 exports.CohereTextGenerationResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -273,6 +235,6 @@ exports.CohereTextGenerationResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: async ({ response }) => createCohereTextGenerationFullDeltaIterableQueue(response.body),
+        handler: (0, createJsonStreamResponseHandler_js_1.createJsonStreamResponseHandler)(cohereTextStreamChunkSchema),
     },
 };

package/model-provider/cohere/CohereTextGenerationModel.d.ts

@@ -3,7 +3,6 @@ import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { Delta } from "../../model-function/Delta.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
@@ -86,19 +85,39 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
         }[];
     }>;
     private translateFinishReason;
-    doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
-    extractTextDelta(fullDelta: CohereTextGenerationDelta): string | undefined;
+    doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+        text: string;
+        is_finished: false;
+    } | {
+        response: {
+            prompt: string;
+            id: string;
+            generations: {
+                text: string;
+                id: string;
+                finish_reason?: string | undefined;
+            }[];
+            meta?: {
+                api_version: {
+                    version: string;
+                };
+            } | undefined;
+        };
+        finish_reason: string;
+        is_finished: true;
+    }>>>;
+    extractTextDelta(delta: unknown): string;
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, CohereTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, string, CohereTextGenerationModelSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
     withChatPrompt(options?: {
         user?: string;
         assistant?: string;
-    }): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, CohereTextGenerationModelSettings, this>;
+    }): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, string, CohereTextGenerationModelSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, CohereTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<CohereTextGenerationModelSettings>): this;
 }
@@ -163,11 +182,6 @@ declare const cohereTextGenerationResponseSchema: z.ZodObject<{
     } | undefined;
 }>;
 export type CohereTextGenerationResponse = z.infer<typeof cohereTextGenerationResponseSchema>;
-export type CohereTextGenerationDelta = {
-    content: string;
-    isComplete: boolean;
-    delta: string;
-};
 export type CohereTextGenerationResponseFormatType<T> = {
     stream: boolean;
     handler: ResponseHandler<T>;
@@ -177,7 +191,7 @@ export declare const CohereTextGenerationResponseFormat: {
      * Returns the response as a JSON object.
      */
     json: {
-        stream: false;
+        stream: boolean;
         handler: ResponseHandler<{
             prompt: string;
             id: string;
@@ -198,10 +212,30 @@ export declare const CohereTextGenerationResponseFormat: {
      * of the response stream.
      */
     deltaIterable: {
-        stream: true;
+        stream: boolean;
         handler: ({ response }: {
             response: Response;
-        }) => Promise<AsyncIterable<Delta<string>>>;
+        }) => Promise<AsyncIterable<import("../../index.js").Delta<{
+            text: string;
+            is_finished: false;
+        } | {
+            response: {
+                prompt: string;
+                id: string;
+                generations: {
+                    text: string;
+                    id: string;
+                    finish_reason?: string | undefined;
+                }[];
+                meta?: {
+                    api_version: {
+                        version: string;
+                    };
+                } | undefined;
+            };
+            finish_reason: string;
+            is_finished: true;
+        }>>>;
     };
 };
 export {};

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -1,14 +1,13 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 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 { chat, instruction, } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
-import { AsyncQueue } from "../../util/AsyncQueue.js";
-import { parseJsonStream } from "../../util/streaming/parseJsonStream.js";
+import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
@@ -160,8 +159,9 @@ export class CohereTextGenerationModel extends AbstractModel {
             responseFormat: CohereTextGenerationResponseFormat.deltaIterable,
         });
     }
-    extractTextDelta(fullDelta) {
-        return fullDelta.delta;
+    extractTextDelta(delta) {
+        const chunk = delta;
+        return chunk.is_finished === true ? "" : chunk.text;
     }
     /**
      * Returns this model with an instruction prompt template.
@@ -206,7 +206,7 @@ const cohereTextGenerationResponseSchema = z.object({
     })
         .optional(),
 });
-const cohereTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("is_finished", [
+const cohereTextStreamChunkSchema = zodSchema(z.discriminatedUnion("is_finished", [
     z.object({
         text: z.string(),
         is_finished: z.literal(false),
@@ -217,44 +217,6 @@ const cohereTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("is
         response: cohereTextGenerationResponseSchema,
     }),
 ]));
-async function createCohereTextGenerationFullDeltaIterableQueue(stream) {
-    const queue = new AsyncQueue();
-    let accumulatedText = "";
-    // process the stream asynchonously (no 'await' on purpose):
-    parseJsonStream({
-        stream,
-        schema: cohereTextStreamingResponseSchema,
-        process(event) {
-            if (event.is_finished === true) {
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content: accumulatedText,
-                        isComplete: true,
-                        delta: "",
-                    },
-                    valueDelta: "",
-                });
-            }
-            else {
-                accumulatedText += event.text;
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content: accumulatedText,
-                        isComplete: false,
-                        delta: event.text,
-                    },
-                    valueDelta: event.text,
-                });
-            }
-        },
-        onDone() {
-            queue.close();
-        },
-    });
-    return queue;
-}
 export const CohereTextGenerationResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -269,6 +231,6 @@ export const CohereTextGenerationResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: async ({ response }) => createCohereTextGenerationFullDeltaIterableQueue(response.body),
+        handler: createJsonStreamResponseHandler(cohereTextStreamChunkSchema),
     },
 };