modelfusion 0.104.0 → 0.106.0

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.cjs

@@ -12,8 +12,7 @@ const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/gene
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
 const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.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 OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaChatPromptTemplate_js_1 = require("./OllamaChatPromptTemplate.cjs");
 const OllamaError_js_1 = require("./OllamaError.cjs");
@@ -133,6 +132,10 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
             responseFormat: exports.OllamaChatResponseFormat.deltaIterable,
         });
     }
+    extractTextDelta(delta) {
+        const chunk = delta;
+        return chunk.done === true ? undefined : chunk.message.content;
+    }
     asToolCallGenerationModel(promptTemplate) {
         return new TextGenerationToolCallModel_js_1.TextGenerationToolCallModel({
             model: this,
@@ -194,7 +197,7 @@ const ollamaChatResponseSchema = zod_1.z.object({
     eval_count: zod_1.z.number(),
     eval_duration: zod_1.z.number(),
 });
-const ollamaChatStreamSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminatedUnion("done", [
+const ollamaChatStreamChunkSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminatedUnion("done", [
     zod_1.z.object({
         done: zod_1.z.literal(false),
         model: zod_1.z.string(),
@@ -216,45 +219,6 @@ const ollamaChatStreamSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.discriminate
         eval_duration: zod_1.z.number(),
     }),
 ]));
-async function createOllamaFullDeltaIterableQueue(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: ollamaChatStreamSchema,
-        process(event) {
-            if (event.done === true) {
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content: accumulatedText,
-                        isComplete: true,
-                        delta: "",
-                    },
-                    valueDelta: "",
-                });
-            }
-            else {
-                const deltaText = event.message.content;
-                accumulatedText += deltaText;
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content: accumulatedText,
-                        isComplete: false,
-                        delta: deltaText,
-                    },
-                    valueDelta: deltaText,
-                });
-            }
-        },
-        onDone() {
-            queue.close();
-        },
-    });
-    return queue;
-}
 exports.OllamaChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -303,6 +267,6 @@ exports.OllamaChatResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: async ({ response }) => createOllamaFullDeltaIterableQueue(response.body),
+        handler: (0, createJsonStreamResponseHandler_js_1.createJsonStreamResponseHandler)(ollamaChatStreamChunkSchema),
     },
 };

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

@@ -2,13 +2,14 @@ import { z } from "zod";
 import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.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 { 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;
@@ -57,7 +58,26 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
             finishReason: "unknown";
         }[];
     }>;
-    doStreamText(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
+    doStreamText(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+        message: {
+            role: string;
+            content: string;
+        };
+        model: string;
+        done: false;
+        created_at: string;
+    } | {
+        model: string;
+        done: true;
+        created_at: string;
+        total_duration: number;
+        prompt_eval_count: number;
+        eval_count: number;
+        eval_duration: number;
+        load_duration?: number | undefined;
+        prompt_eval_duration?: number | undefined;
+    }>>>;
+    extractTextDelta(delta: unknown): string | undefined;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaChatPrompt, this>;
     asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsOrGenerateTextPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, OllamaChatPrompt, this>;
     /**
@@ -96,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;
@@ -110,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;
@@ -125,11 +145,26 @@ declare const ollamaChatResponseSchema: z.ZodObject<{
     prompt_eval_duration?: number | undefined;
 }>;
 export type OllamaChatResponse = z.infer<typeof ollamaChatResponseSchema>;
-export type OllamaChatDelta = {
-    content: string;
-    isComplete: boolean;
-    delta: string;
-};
+declare const ollamaChatStreamChunkSchema: ZodSchema<{
+    message: {
+        role: string;
+        content: string;
+    };
+    model: string;
+    done: false;
+    created_at: string;
+} | {
+    model: string;
+    done: true;
+    created_at: string;
+    total_duration: number;
+    prompt_eval_count: number;
+    eval_count: number;
+    eval_duration: number;
+    load_duration?: number | undefined;
+    prompt_eval_duration?: number | undefined;
+}>;
+export type OllamaChatStreamChunk = (typeof ollamaChatStreamChunkSchema)["_type"];
 export type OllamaChatResponseFormatType<T> = {
     stream: boolean;
     handler: ResponseHandler<T>;
@@ -145,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;
@@ -165,10 +200,28 @@ export declare const OllamaChatResponseFormat: {
      * of the response stream.
      */
     deltaIterable: {
-        stream: true;
+        stream: boolean;
         handler: ({ response }: {
             response: Response;
-        }) => Promise<AsyncIterable<Delta<string>>>;
+        }) => Promise<AsyncIterable<import("../../index.js").Delta<{
+            message: {
+                role: string;
+                content: string;
+            };
+            model: string;
+            done: false;
+            created_at: string;
+        } | {
+            model: string;
+            done: true;
+            created_at: string;
+            total_duration: number;
+            prompt_eval_count: number;
+            eval_count: number;
+            eval_duration: number;
+            load_duration?: number | undefined;
+            prompt_eval_duration?: number | undefined;
+        }>>>;
     };
 };
 export {};

package/model-provider/ollama/OllamaChatModel.js

@@ -8,9 +8,8 @@ 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 { AsyncQueue } from "../../util/AsyncQueue.js";
-import { parseJsonStream } from "../../util/streaming/parseJsonStream.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";
 import { failedOllamaCallResponseHandler } from "./OllamaError.js";
@@ -130,6 +129,10 @@ export class OllamaChatModel extends AbstractModel {
             responseFormat: OllamaChatResponseFormat.deltaIterable,
         });
     }
+    extractTextDelta(delta) {
+        const chunk = delta;
+        return chunk.done === true ? undefined : chunk.message.content;
+    }
     asToolCallGenerationModel(promptTemplate) {
         return new TextGenerationToolCallModel({
             model: this,
@@ -190,7 +193,7 @@ const ollamaChatResponseSchema = z.object({
     eval_count: z.number(),
     eval_duration: z.number(),
 });
-const ollamaChatStreamSchema = new ZodSchema(z.discriminatedUnion("done", [
+const ollamaChatStreamChunkSchema = new ZodSchema(z.discriminatedUnion("done", [
     z.object({
         done: z.literal(false),
         model: z.string(),
@@ -212,45 +215,6 @@ const ollamaChatStreamSchema = new ZodSchema(z.discriminatedUnion("done", [
         eval_duration: z.number(),
     }),
 ]));
-async function createOllamaFullDeltaIterableQueue(stream) {
-    const queue = new AsyncQueue();
-    let accumulatedText = "";
-    // process the stream asynchonously (no 'await' on purpose):
-    parseJsonStream({
-        stream,
-        schema: ollamaChatStreamSchema,
-        process(event) {
-            if (event.done === true) {
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content: accumulatedText,
-                        isComplete: true,
-                        delta: "",
-                    },
-                    valueDelta: "",
-                });
-            }
-            else {
-                const deltaText = event.message.content;
-                accumulatedText += deltaText;
-                queue.push({
-                    type: "delta",
-                    fullDelta: {
-                        content: accumulatedText,
-                        isComplete: false,
-                        delta: deltaText,
-                    },
-                    valueDelta: deltaText,
-                });
-            }
-        },
-        onDone() {
-            queue.close();
-        },
-    });
-    return queue;
-}
 export const OllamaChatResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -299,6 +263,6 @@ export const OllamaChatResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: async ({ response }) => createOllamaFullDeltaIterableQueue(response.body),
+        handler: createJsonStreamResponseHandler(ollamaChatStreamChunkSchema),
     },
 };

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

@@ -0,0 +1,27 @@
+"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 OllamaChatModel_js_1 = require("./OllamaChatModel.cjs");
+describe("streamText", () => {
+    const server = new StreamingTestServer_js_1.StreamingTestServer("http://127.0.0.1:11434/api/chat");
+    server.setupTestEnvironment();
+    it("should return a text stream", async () => {
+        server.responseChunks = [
+            `{"model":"mistral:text","created_at":"2023-12-24T16:49:17.948267Z","message":{"role":"assistant","content":"Hello"},"done":false}\n`,
+            `{"model":"mistral:text","created_at":"2023-12-24T16:49:17.948267Z","message":{"role":"assistant","content":", "},"done":false}\n`,
+            `{"model":"mistral:text","created_at":"2023-12-24T16:49:17.948267Z","message":{"role":"assistant","content":"world!"},"done":false}\n`,
+            `{"model":"mistral:text","created_at":"2023-12-24T16:49:19.927399Z","message":{"role":"assistant","content":""},` +
+                `"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 (0, streamText_js_1.streamText)(new OllamaChatModel_js_1.OllamaChatModel({ model: "mistral:text" }).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/ollama/OllamaChatModel.test.js

@@ -0,0 +1,25 @@
+import { streamText } from "../../model-function/generate-text/streamText.js";
+import { StreamingTestServer } from "../../test/StreamingTestServer.js";
+import { arrayFromAsync } from "../../test/arrayFromAsync.js";
+import { OllamaChatModel } from "./OllamaChatModel.js";
+describe("streamText", () => {
+    const server = new StreamingTestServer("http://127.0.0.1:11434/api/chat");
+    server.setupTestEnvironment();
+    it("should return a text stream", async () => {
+        server.responseChunks = [
+            `{"model":"mistral:text","created_at":"2023-12-24T16:49:17.948267Z","message":{"role":"assistant","content":"Hello"},"done":false}\n`,
+            `{"model":"mistral:text","created_at":"2023-12-24T16:49:17.948267Z","message":{"role":"assistant","content":", "},"done":false}\n`,
+            `{"model":"mistral:text","created_at":"2023-12-24T16:49:17.948267Z","message":{"role":"assistant","content":"world!"},"done":false}\n`,
+            `{"model":"mistral:text","created_at":"2023-12-24T16:49:19.927399Z","message":{"role":"assistant","content":""},` +
+                `"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");
+        // note: space moved to last chunk bc of trimming
+        expect(await arrayFromAsync(stream)).toStrictEqual([
+            "Hello",
+            ",",
+            " world!",
+        ]);
+    });
+});

package/model-provider/ollama/OllamaChatPromptTemplate.cjs

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = exports.identity = void 0;
+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");
 /**
  * OllamaChatPrompt identity chat format.
  */
@@ -26,9 +28,15 @@ function instruction() {
         format(prompt) {
             const messages = [];
             if (prompt.system != null) {
-                messages.push({ role: "system", content: prompt.system });
+                messages.push({
+                    role: "system",
+                    content: prompt.system,
+                });
             }
-            messages.push({ role: "user", ...extractContent(prompt.instruction) });
+            messages.push({
+                role: "user",
+                ...extractUserContent(prompt.instruction),
+            });
             return messages;
         },
         stopSequences: [],
@@ -46,7 +54,29 @@ function chat() {
                 messages.push({ role: "system", content: prompt.system });
             }
             for (const { role, content } of prompt.messages) {
-                messages.push({ role, ...extractContent(content) });
+                switch (role) {
+                    case "user": {
+                        messages.push({
+                            role: "user",
+                            ...extractUserContent(content),
+                        });
+                        break;
+                    }
+                    case "assistant": {
+                        messages.push({
+                            role: "assistant",
+                            content: (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}`);
+                    }
+                }
             }
             return messages;
         },
@@ -54,7 +84,7 @@ function chat() {
     };
 }
 exports.chat = chat;
-function extractContent(input) {
+function extractUserContent(input) {
     if (typeof input === "string") {
         return { content: input, images: undefined };
     }

package/model-provider/ollama/OllamaChatPromptTemplate.js

@@ -1,3 +1,5 @@
+import { validateContentIsString } from "../../model-function/generate-text/prompt-template/ContentPart.js";
+import { InvalidPromptError } from "../../model-function/generate-text/prompt-template/InvalidPromptError.js";
 /**
  * OllamaChatPrompt identity chat format.
  */
@@ -21,9 +23,15 @@ export function instruction() {
         format(prompt) {
             const messages = [];
             if (prompt.system != null) {
-                messages.push({ role: "system", content: prompt.system });
+                messages.push({
+                    role: "system",
+                    content: prompt.system,
+                });
             }
-            messages.push({ role: "user", ...extractContent(prompt.instruction) });
+            messages.push({
+                role: "user",
+                ...extractUserContent(prompt.instruction),
+            });
             return messages;
         },
         stopSequences: [],
@@ -40,14 +48,36 @@ export function chat() {
                 messages.push({ role: "system", content: prompt.system });
             }
             for (const { role, content } of prompt.messages) {
-                messages.push({ role, ...extractContent(content) });
+                switch (role) {
+                    case "user": {
+                        messages.push({
+                            role: "user",
+                            ...extractUserContent(content),
+                        });
+                        break;
+                    }
+                    case "assistant": {
+                        messages.push({
+                            role: "assistant",
+                            content: 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}`);
+                    }
+                }
             }
             return messages;
         },
         stopSequences: [],
     };
 }
-function extractContent(input) {
+function extractUserContent(input) {
     if (typeof input === "string") {
         return { content: input, images: undefined };
     }