modelfusion 0.132.0 → 0.134.0

package/model-provider/ollama/OllamaChatModel.js

@@ -1,286 +0,0 @@
-import { z } from "zod";
-import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
-import { postJsonToApi } from "../../core/api/postToApi.js";
-import { zodSchema } from "../../core/schema/ZodSchema.js";
-import { safeParseJSON } from "../../core/schema/parseJSON.js";
-import { validateTypes } from "../../core/schema/validateTypes.js";
-import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.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 { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.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";
-/**
- * Text generation model that uses the Ollama chat API.
- */
-export class OllamaChatModel extends AbstractModel {
-    constructor(settings) {
-        super({ settings });
-        Object.defineProperty(this, "provider", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: "ollama"
-        });
-        Object.defineProperty(this, "tokenizer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: undefined
-        });
-        Object.defineProperty(this, "countPromptTokens", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: undefined
-        });
-        Object.defineProperty(this, "contextWindowSize", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: undefined
-        });
-    }
-    get modelName() {
-        return this.settings.model;
-    }
-    async callAPI(prompt, callOptions, options) {
-        const { responseFormat } = options;
-        const api = this.settings.api ?? new OllamaApiConfiguration();
-        const abortSignal = callOptions.run?.abortSignal;
-        return callWithRetryAndThrottle({
-            retry: api.retry,
-            throttle: api.throttle,
-            call: async () => postJsonToApi({
-                url: api.assembleUrl(`/api/chat`),
-                headers: api.headers({
-                    functionType: callOptions.functionType,
-                    functionId: callOptions.functionId,
-                    run: callOptions.run,
-                    callId: callOptions.callId,
-                }),
-                body: {
-                    stream: responseFormat.stream,
-                    model: this.settings.model,
-                    messages: prompt,
-                    format: this.settings.format,
-                    options: {
-                        mirostat: this.settings.mirostat,
-                        mirostat_eta: this.settings.mirostatEta,
-                        mirostat_tau: this.settings.mirostatTau,
-                        num_gpu: this.settings.numGpu,
-                        num_gqa: this.settings.numGqa,
-                        num_predict: this.settings.maxGenerationTokens,
-                        num_threads: this.settings.numThreads,
-                        repeat_last_n: this.settings.repeatLastN,
-                        repeat_penalty: this.settings.repeatPenalty,
-                        seed: this.settings.seed,
-                        stop: this.settings.stopSequences,
-                        temperature: this.settings.temperature,
-                        tfs_z: this.settings.tfsZ,
-                        top_k: this.settings.topK,
-                        top_p: this.settings.topP,
-                    },
-                    template: this.settings.template,
-                },
-                failedResponseHandler: failedOllamaCallResponseHandler,
-                successfulResponseHandler: responseFormat.handler,
-                abortSignal,
-            }),
-        });
-    }
-    get settingsForEvent() {
-        const eventSettingProperties = [
-            ...textGenerationModelProperties,
-            "temperature",
-            "mirostat",
-            "mirostatEta",
-            "mirostatTau",
-            "numGqa",
-            "numGpu",
-            "numThreads",
-            "repeatLastN",
-            "repeatPenalty",
-            "seed",
-            "tfsZ",
-            "topK",
-            "topP",
-            "template",
-            "format",
-        ];
-        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
-    }
-    async doGenerateTexts(prompt, options) {
-        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
-            responseFormat: OllamaChatResponseFormat.json,
-        }));
-    }
-    restoreGeneratedTexts(rawResponse) {
-        return this.processTextGenerationResponse(validateTypes({
-            value: rawResponse,
-            schema: zodSchema(ollamaChatResponseSchema),
-        }));
-    }
-    processTextGenerationResponse(rawResponse) {
-        return {
-            rawResponse,
-            textGenerationResults: [
-                {
-                    text: rawResponse.message.content,
-                    finishReason: "unknown",
-                },
-            ],
-        };
-    }
-    doStreamText(prompt, options) {
-        return this.callAPI(prompt, options, {
-            responseFormat: OllamaChatResponseFormat.deltaIterable,
-        });
-    }
-    extractTextDelta(delta) {
-        const chunk = delta;
-        return chunk.done === true ? undefined : chunk.message.content;
-    }
-    asToolCallGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallModel({
-            model: this,
-            format: promptTemplate,
-        });
-    }
-    asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsModel({
-            model: this,
-            template: promptTemplate,
-        });
-    }
-    asObjectGenerationModel(promptTemplate) {
-        return "adaptModel" in promptTemplate
-            ? new ObjectFromTextStreamingModel({
-                model: promptTemplate.adaptModel(this),
-                template: promptTemplate,
-            })
-            : new ObjectFromTextStreamingModel({
-                model: this,
-                template: promptTemplate,
-            });
-    }
-    withTextPrompt() {
-        return this.withPromptTemplate(text());
-    }
-    withInstructionPrompt() {
-        return this.withPromptTemplate(instruction());
-    }
-    withChatPrompt() {
-        return this.withPromptTemplate(chat());
-    }
-    withPromptTemplate(promptTemplate) {
-        return new PromptTemplateTextStreamingModel({
-            model: this.withSettings({
-                stopSequences: [
-                    ...(this.settings.stopSequences ?? []),
-                    ...promptTemplate.stopSequences,
-                ],
-            }),
-            promptTemplate,
-        });
-    }
-    withJsonOutput() {
-        return this.withSettings({ format: "json" });
-    }
-    withSettings(additionalSettings) {
-        return new OllamaChatModel(Object.assign({}, this.settings, additionalSettings));
-    }
-}
-const ollamaChatResponseSchema = z.object({
-    model: z.string(),
-    created_at: z.string(),
-    done: z.literal(true),
-    message: z.object({
-        role: z.string(),
-        content: z.string(),
-    }),
-    total_duration: z.number(),
-    load_duration: z.number().optional(),
-    prompt_eval_count: z.number().optional(),
-    prompt_eval_duration: z.number().optional(),
-    eval_count: z.number(),
-    eval_duration: z.number(),
-});
-const ollamaChatStreamChunkSchema = z.discriminatedUnion("done", [
-    z.object({
-        done: z.literal(false),
-        model: z.string(),
-        created_at: z.string(),
-        message: z.object({
-            role: z.string(),
-            content: z.string(),
-        }),
-    }),
-    z.object({
-        done: z.literal(true),
-        model: z.string(),
-        created_at: z.string(),
-        total_duration: z.number(),
-        load_duration: z.number().optional(),
-        prompt_eval_count: z.number().optional(),
-        prompt_eval_duration: z.number().optional(),
-        eval_count: z.number(),
-        eval_duration: z.number(),
-    }),
-]);
-export const OllamaChatResponseFormat = {
-    /**
-     * Returns the response as a JSON object.
-     */
-    json: {
-        stream: false,
-        handler: (async ({ response, url, requestBodyValues }) => {
-            const responseBody = await response.text();
-            const parsedResult = safeParseJSON({
-                text: responseBody,
-                schema: zodSchema(z.union([
-                    ollamaChatResponseSchema,
-                    z.object({
-                        done: z.literal(false),
-                        model: z.string(),
-                        created_at: z.string(),
-                    }),
-                ])),
-            });
-            if (!parsedResult.success) {
-                throw new ApiCallError({
-                    message: "Invalid JSON response",
-                    cause: parsedResult.error,
-                    statusCode: response.status,
-                    responseBody,
-                    url,
-                    requestBodyValues,
-                });
-            }
-            if (parsedResult.value.done === false) {
-                throw new ApiCallError({
-                    message: "Incomplete Ollama response received",
-                    statusCode: response.status,
-                    responseBody,
-                    url,
-                    requestBodyValues,
-                    isRetryable: true,
-                });
-            }
-            return parsedResult.value;
-        }),
-    },
-    /**
-     * Returns an async iterable over the full deltas (all choices, including full current state at time of event)
-     * of the response stream.
-     */
-    deltaIterable: {
-        stream: true,
-        handler: createJsonStreamResponseHandler(zodSchema(ollamaChatStreamChunkSchema)),
-    },
-};

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

@@ -1,32 +0,0 @@
-"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)({
-            model: new OllamaChatModel_js_1.OllamaChatModel({
-                model: "mistral:text",
-            }).withTextPrompt(),
-            prompt: "hello",
-        });
-        // note: space moved to last chunk bc of trimming
-        expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
-            "Hello",
-            ",",
-            " world!",
-        ]);
-    });
-});

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

@@ -1 +0,0 @@
-export {};

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

@@ -1,30 +0,0 @@
-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({
-            model: new OllamaChatModel({
-                model: "mistral:text",
-            }).withTextPrompt(),
-            prompt: "hello",
-        });
-        // note: space moved to last chunk bc of trimming
-        expect(await arrayFromAsync(stream)).toStrictEqual([
-            "Hello",
-            ",",
-            " world!",
-        ]);
-    });
-});

package/model-provider/ollama/OllamaChatPromptTemplate.cjs

@@ -1,103 +0,0 @@
-"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");
-const DataContent_js_1 = require("../../util/format/DataContent.cjs");
-/**
- * OllamaChatPrompt identity chat format.
- */
-function identity() {
-    return { format: (prompt) => prompt, stopSequences: [] };
-}
-exports.identity = identity;
-/**
- * Formats a text prompt as an Ollama chat prompt.
- */
-function text() {
-    return {
-        format: (prompt) => [{ role: "user", content: prompt }],
-        stopSequences: [],
-    };
-}
-exports.text = text;
-/**
- * Formats an instruction prompt as an Ollama chat prompt.
- */
-function instruction() {
-    return {
-        format(prompt) {
-            const messages = [];
-            if (prompt.system != null) {
-                messages.push({
-                    role: "system",
-                    content: prompt.system,
-                });
-            }
-            messages.push({
-                role: "user",
-                ...extractUserContent(prompt.instruction),
-            });
-            return messages;
-        },
-        stopSequences: [],
-    };
-}
-exports.instruction = instruction;
-/**
- * Formats a chat prompt as an Ollama chat prompt.
- */
-function chat() {
-    return {
-        format(prompt) {
-            const messages = [];
-            if (prompt.system != null) {
-                messages.push({ role: "system", content: prompt.system });
-            }
-            for (const { role, content } of prompt.messages) {
-                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;
-        },
-        stopSequences: [],
-    };
-}
-exports.chat = chat;
-function extractUserContent(input) {
-    if (typeof input === "string") {
-        return { content: input, images: undefined };
-    }
-    const images = [];
-    let content = "";
-    for (const part of input) {
-        if (part.type === "text") {
-            content += part.text;
-        }
-        else {
-            images.push((0, DataContent_js_1.convertDataContentToBase64String)(part.image));
-        }
-    }
-    return { content, images };
-}

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

@@ -1,20 +0,0 @@
-import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
-import { ChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
-import { InstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
-import { OllamaChatPrompt } from "./OllamaChatModel.js";
-/**
- * OllamaChatPrompt identity chat format.
- */
-export declare function identity(): TextGenerationPromptTemplate<OllamaChatPrompt, OllamaChatPrompt>;
-/**
- * Formats a text prompt as an Ollama chat prompt.
- */
-export declare function text(): TextGenerationPromptTemplate<string, OllamaChatPrompt>;
-/**
- * Formats an instruction prompt as an Ollama chat prompt.
- */
-export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, OllamaChatPrompt>;
-/**
- * Formats a chat prompt as an Ollama chat prompt.
- */
-export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, OllamaChatPrompt>;

package/model-provider/ollama/OllamaChatPromptTemplate.js

@@ -1,96 +0,0 @@
-import { validateContentIsString } from "../../model-function/generate-text/prompt-template/ContentPart.js";
-import { InvalidPromptError } from "../../model-function/generate-text/prompt-template/InvalidPromptError.js";
-import { convertDataContentToBase64String } from "../../util/format/DataContent.js";
-/**
- * OllamaChatPrompt identity chat format.
- */
-export function identity() {
-    return { format: (prompt) => prompt, stopSequences: [] };
-}
-/**
- * Formats a text prompt as an Ollama chat prompt.
- */
-export function text() {
-    return {
-        format: (prompt) => [{ role: "user", content: prompt }],
-        stopSequences: [],
-    };
-}
-/**
- * Formats an instruction prompt as an Ollama chat prompt.
- */
-export function instruction() {
-    return {
-        format(prompt) {
-            const messages = [];
-            if (prompt.system != null) {
-                messages.push({
-                    role: "system",
-                    content: prompt.system,
-                });
-            }
-            messages.push({
-                role: "user",
-                ...extractUserContent(prompt.instruction),
-            });
-            return messages;
-        },
-        stopSequences: [],
-    };
-}
-/**
- * Formats a chat prompt as an Ollama chat prompt.
- */
-export function chat() {
-    return {
-        format(prompt) {
-            const messages = [];
-            if (prompt.system != null) {
-                messages.push({ role: "system", content: prompt.system });
-            }
-            for (const { role, content } of prompt.messages) {
-                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 extractUserContent(input) {
-    if (typeof input === "string") {
-        return { content: input, images: undefined };
-    }
-    const images = [];
-    let content = "";
-    for (const part of input) {
-        if (part.type === "text") {
-            content += part.text;
-        }
-        else {
-            images.push(convertDataContentToBase64String(part.image));
-        }
-    }
-    return { content, images };
-}