modelfusion 0.133.0 → 0.135.0

package/model-provider/ollama/OllamaApiConfiguration.js

@@ -1,18 +0,0 @@
-import { BaseUrlApiConfigurationWithDefaults, } from "../../core/api/BaseUrlApiConfiguration.js";
-/**
- * Creates an API configuration for the Ollama API.
- * It calls the API at http://127.0.0.1:11434 by default.
- */
-export class OllamaApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
-    constructor(settings = {}) {
-        super({
-            ...settings,
-            baseUrlDefaults: {
-                protocol: "http",
-                host: "127.0.0.1",
-                port: "11434",
-                path: "",
-            },
-        });
-    }
-}

package/model-provider/ollama/OllamaChatModel.cjs

@@ -1,290 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OllamaChatResponseFormat = exports.OllamaChatModel = void 0;
-const zod_1 = require("zod");
-const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
-const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
-const postToApi_js_1 = require("../../core/api/postToApi.cjs");
-const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
-const validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
-const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const ObjectFromTextStreamingModel_js_1 = require("../../model-function/generate-object/ObjectFromTextStreamingModel.cjs");
-const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
-const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
-const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
-const TextGenerationToolCallsModel_js_1 = require("../../tool/generate-tool-calls/TextGenerationToolCallsModel.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");
-/**
- * Text generation model that uses the Ollama chat API.
- */
-class OllamaChatModel extends AbstractModel_js_1.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_js_1.OllamaApiConfiguration();
-        const abortSignal = callOptions.run?.abortSignal;
-        return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: api.retry,
-            throttle: api.throttle,
-            call: async () => (0, postToApi_js_1.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: OllamaError_js_1.failedOllamaCallResponseHandler,
-                successfulResponseHandler: responseFormat.handler,
-                abortSignal,
-            }),
-        });
-    }
-    get settingsForEvent() {
-        const eventSettingProperties = [
-            ...TextGenerationModel_js_1.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: exports.OllamaChatResponseFormat.json,
-        }));
-    }
-    restoreGeneratedTexts(rawResponse) {
-        return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
-            value: rawResponse,
-            schema: (0, ZodSchema_js_1.zodSchema)(ollamaChatResponseSchema),
-        }));
-    }
-    processTextGenerationResponse(rawResponse) {
-        return {
-            rawResponse,
-            textGenerationResults: [
-                {
-                    text: rawResponse.message.content,
-                    finishReason: "unknown",
-                },
-            ],
-        };
-    }
-    doStreamText(prompt, options) {
-        return this.callAPI(prompt, options, {
-            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,
-            format: promptTemplate,
-        });
-    }
-    asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsModel_js_1.TextGenerationToolCallsModel({
-            model: this,
-            template: promptTemplate,
-        });
-    }
-    asObjectGenerationModel(promptTemplate) {
-        return "adaptModel" in promptTemplate
-            ? new ObjectFromTextStreamingModel_js_1.ObjectFromTextStreamingModel({
-                model: promptTemplate.adaptModel(this),
-                template: promptTemplate,
-            })
-            : new ObjectFromTextStreamingModel_js_1.ObjectFromTextStreamingModel({
-                model: this,
-                template: promptTemplate,
-            });
-    }
-    withTextPrompt() {
-        return this.withPromptTemplate((0, OllamaChatPromptTemplate_js_1.text)());
-    }
-    withInstructionPrompt() {
-        return this.withPromptTemplate((0, OllamaChatPromptTemplate_js_1.instruction)());
-    }
-    withChatPrompt() {
-        return this.withPromptTemplate((0, OllamaChatPromptTemplate_js_1.chat)());
-    }
-    withPromptTemplate(promptTemplate) {
-        return new PromptTemplateTextStreamingModel_js_1.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));
-    }
-}
-exports.OllamaChatModel = OllamaChatModel;
-const ollamaChatResponseSchema = zod_1.z.object({
-    model: zod_1.z.string(),
-    created_at: zod_1.z.string(),
-    done: zod_1.z.literal(true),
-    message: zod_1.z.object({
-        role: zod_1.z.string(),
-        content: zod_1.z.string(),
-    }),
-    total_duration: zod_1.z.number(),
-    load_duration: zod_1.z.number().optional(),
-    prompt_eval_count: zod_1.z.number().optional(),
-    prompt_eval_duration: zod_1.z.number().optional(),
-    eval_count: zod_1.z.number(),
-    eval_duration: zod_1.z.number(),
-});
-const ollamaChatStreamChunkSchema = zod_1.z.discriminatedUnion("done", [
-    zod_1.z.object({
-        done: zod_1.z.literal(false),
-        model: zod_1.z.string(),
-        created_at: zod_1.z.string(),
-        message: zod_1.z.object({
-            role: zod_1.z.string(),
-            content: zod_1.z.string(),
-        }),
-    }),
-    zod_1.z.object({
-        done: zod_1.z.literal(true),
-        model: zod_1.z.string(),
-        created_at: zod_1.z.string(),
-        total_duration: zod_1.z.number(),
-        load_duration: zod_1.z.number().optional(),
-        prompt_eval_count: zod_1.z.number().optional(),
-        prompt_eval_duration: zod_1.z.number().optional(),
-        eval_count: zod_1.z.number(),
-        eval_duration: zod_1.z.number(),
-    }),
-]);
-exports.OllamaChatResponseFormat = {
-    /**
-     * Returns the response as a JSON object.
-     */
-    json: {
-        stream: false,
-        handler: (async ({ response, url, requestBodyValues }) => {
-            const responseBody = await response.text();
-            const parsedResult = (0, parseJSON_js_1.safeParseJSON)({
-                text: responseBody,
-                schema: (0, ZodSchema_js_1.zodSchema)(zod_1.z.union([
-                    ollamaChatResponseSchema,
-                    zod_1.z.object({
-                        done: zod_1.z.literal(false),
-                        model: zod_1.z.string(),
-                        created_at: zod_1.z.string(),
-                    }),
-                ])),
-            });
-            if (!parsedResult.success) {
-                throw new ApiCallError_js_1.ApiCallError({
-                    message: "Invalid JSON response",
-                    cause: parsedResult.error,
-                    statusCode: response.status,
-                    responseBody,
-                    url,
-                    requestBodyValues,
-                });
-            }
-            if (parsedResult.value.done === false) {
-                throw new ApiCallError_js_1.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: (0, createJsonStreamResponseHandler_js_1.createJsonStreamResponseHandler)((0, ZodSchema_js_1.zodSchema)(ollamaChatStreamChunkSchema)),
-    },
-};

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

@@ -1,285 +0,0 @@
-import { z } from "zod";
-import { FunctionCallOptions } 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 { FlexibleObjectFromTextPromptTemplate, ObjectFromTextPromptTemplate } from "../../model-function/generate-object/ObjectFromTextPromptTemplate.js";
-import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.js";
-import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
-import { TextStreamingBaseModel, 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 { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
-import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
-import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
-export type OllamaChatMessage = {
-    role: "system" | "user" | "assistant";
-    content: string;
-    /**
-     Images. Supports base64-encoded `png` and `jpeg` images up to 100MB in size.
-     */
-    images?: Array<string>;
-};
-export type OllamaChatPrompt = Array<OllamaChatMessage>;
-export interface OllamaChatModelSettings extends OllamaTextGenerationSettings {
-    api?: ApiConfiguration;
-}
-/**
- * Text generation model that uses the Ollama chat API.
- */
-export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettings> implements TextStreamingBaseModel<OllamaChatPrompt, OllamaChatModelSettings> {
-    constructor(settings: OllamaChatModelSettings);
-    readonly provider = "ollama";
-    get modelName(): string;
-    readonly tokenizer: undefined;
-    readonly countPromptTokens: undefined;
-    readonly contextWindowSize: undefined;
-    callAPI<RESPONSE>(prompt: OllamaChatPrompt, callOptions: FunctionCallOptions, options: {
-        responseFormat: OllamaChatResponseFormatType<RESPONSE>;
-    }): Promise<RESPONSE>;
-    get settingsForEvent(): Partial<OllamaChatModelSettings>;
-    doGenerateTexts(prompt: OllamaChatPrompt, options: FunctionCallOptions): Promise<{
-        rawResponse: {
-            message: {
-                role: string;
-                content: string;
-            };
-            model: string;
-            done: true;
-            created_at: string;
-            total_duration: number;
-            eval_count: number;
-            eval_duration: number;
-            load_duration?: number | undefined;
-            prompt_eval_count?: number | undefined;
-            prompt_eval_duration?: number | undefined;
-        };
-        textGenerationResults: {
-            text: string;
-            finishReason: "unknown";
-        }[];
-    }>;
-    restoreGeneratedTexts(rawResponse: unknown): {
-        rawResponse: {
-            message: {
-                role: string;
-                content: string;
-            };
-            model: string;
-            done: true;
-            created_at: string;
-            total_duration: number;
-            eval_count: number;
-            eval_duration: number;
-            load_duration?: number | undefined;
-            prompt_eval_count?: number | undefined;
-            prompt_eval_duration?: number | undefined;
-        };
-        textGenerationResults: {
-            text: string;
-            finishReason: "unknown";
-        }[];
-    };
-    private processTextGenerationResponse;
-    doStreamText(prompt: OllamaChatPrompt, options: FunctionCallOptions): 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;
-        eval_count: number;
-        eval_duration: number;
-        load_duration?: number | undefined;
-        prompt_eval_count?: 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: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaChatPrompt, this>;
-    asObjectGenerationModel<INPUT_PROMPT, OllamaChatPrompt>(promptTemplate: ObjectFromTextPromptTemplate<INPUT_PROMPT, OllamaChatPrompt> | FlexibleObjectFromTextPromptTemplate<INPUT_PROMPT, unknown>): ObjectFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | ObjectFromTextStreamingModel<INPUT_PROMPT, OllamaChatPrompt, TextStreamingModel<OllamaChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
-    withTextPrompt(): PromptTemplateTextStreamingModel<string, OllamaChatPrompt, OllamaChatModelSettings, this>;
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;
-    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;
-    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, OllamaChatPrompt, OllamaChatModelSettings, this>;
-    withJsonOutput(): this;
-    withSettings(additionalSettings: Partial<OllamaChatModelSettings>): this;
-}
-declare const ollamaChatResponseSchema: z.ZodObject<{
-    model: z.ZodString;
-    created_at: z.ZodString;
-    done: z.ZodLiteral<true>;
-    message: z.ZodObject<{
-        role: z.ZodString;
-        content: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        role: string;
-        content: string;
-    }, {
-        role: string;
-        content: string;
-    }>;
-    total_duration: z.ZodNumber;
-    load_duration: z.ZodOptional<z.ZodNumber>;
-    prompt_eval_count: z.ZodOptional<z.ZodNumber>;
-    prompt_eval_duration: z.ZodOptional<z.ZodNumber>;
-    eval_count: z.ZodNumber;
-    eval_duration: z.ZodNumber;
-}, "strip", z.ZodTypeAny, {
-    message: {
-        role: string;
-        content: string;
-    };
-    model: string;
-    done: true;
-    created_at: string;
-    total_duration: number;
-    eval_count: number;
-    eval_duration: number;
-    load_duration?: number | undefined;
-    prompt_eval_count?: number | undefined;
-    prompt_eval_duration?: number | undefined;
-}, {
-    message: {
-        role: string;
-        content: string;
-    };
-    model: string;
-    done: true;
-    created_at: string;
-    total_duration: number;
-    eval_count: number;
-    eval_duration: number;
-    load_duration?: number | undefined;
-    prompt_eval_count?: number | undefined;
-    prompt_eval_duration?: number | undefined;
-}>;
-export type OllamaChatResponse = z.infer<typeof ollamaChatResponseSchema>;
-declare const ollamaChatStreamChunkSchema: z.ZodDiscriminatedUnion<"done", [z.ZodObject<{
-    done: z.ZodLiteral<false>;
-    model: z.ZodString;
-    created_at: z.ZodString;
-    message: z.ZodObject<{
-        role: z.ZodString;
-        content: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        role: string;
-        content: string;
-    }, {
-        role: string;
-        content: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    message: {
-        role: string;
-        content: string;
-    };
-    model: string;
-    done: false;
-    created_at: string;
-}, {
-    message: {
-        role: string;
-        content: string;
-    };
-    model: string;
-    done: false;
-    created_at: string;
-}>, z.ZodObject<{
-    done: z.ZodLiteral<true>;
-    model: z.ZodString;
-    created_at: z.ZodString;
-    total_duration: z.ZodNumber;
-    load_duration: z.ZodOptional<z.ZodNumber>;
-    prompt_eval_count: z.ZodOptional<z.ZodNumber>;
-    prompt_eval_duration: z.ZodOptional<z.ZodNumber>;
-    eval_count: z.ZodNumber;
-    eval_duration: z.ZodNumber;
-}, "strip", z.ZodTypeAny, {
-    model: string;
-    done: true;
-    created_at: string;
-    total_duration: number;
-    eval_count: number;
-    eval_duration: number;
-    load_duration?: number | undefined;
-    prompt_eval_count?: number | undefined;
-    prompt_eval_duration?: number | undefined;
-}, {
-    model: string;
-    done: true;
-    created_at: string;
-    total_duration: number;
-    eval_count: number;
-    eval_duration: number;
-    load_duration?: number | undefined;
-    prompt_eval_count?: number | undefined;
-    prompt_eval_duration?: number | undefined;
-}>]>;
-export type OllamaChatStreamChunk = z.infer<typeof ollamaChatStreamChunkSchema>;
-export type OllamaChatResponseFormatType<T> = {
-    stream: boolean;
-    handler: ResponseHandler<T>;
-};
-export declare const OllamaChatResponseFormat: {
-    /**
-     * Returns the response as a JSON object.
-     */
-    json: {
-        stream: false;
-        handler: ({ response, url, requestBodyValues }: {
-            url: string;
-            requestBodyValues: unknown;
-            response: Response;
-        }) => Promise<{
-            message: {
-                role: string;
-                content: string;
-            };
-            model: string;
-            done: true;
-            created_at: string;
-            total_duration: number;
-            eval_count: number;
-            eval_duration: number;
-            load_duration?: number | undefined;
-            prompt_eval_count?: number | undefined;
-            prompt_eval_duration?: number | undefined;
-        }>;
-    };
-    /**
-     * Returns an async iterable over the full deltas (all choices, including full current state at time of event)
-     * of the response stream.
-     */
-    deltaIterable: {
-        stream: boolean;
-        handler: ({ response }: {
-            response: Response;
-        }) => 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;
-            eval_count: number;
-            eval_duration: number;
-            load_duration?: number | undefined;
-            prompt_eval_count?: number | undefined;
-            prompt_eval_duration?: number | undefined;
-        }>>>;
-    };
-};
-export {};