modelfusion 0.102.0 → 0.104.0

package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs

@@ -7,6 +7,7 @@ const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
@@ -37,25 +38,52 @@ class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         return this.settings.contextWindowSize;
     }
     async callAPI(prompt, options) {
+        const api = this.settings.api ?? new LlamaCppApiConfiguration_js_1.LlamaCppApiConfiguration();
+        const responseFormat = options.responseFormat;
+        const abortSignal = options.run?.abortSignal;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callLlamaCppTextGenerationAPI({
-                ...this.settings,
-                // mapping
-                nPredict: this.settings.maxGenerationTokens,
-                stop: this.settings.stopSequences,
-                // other
-                abortSignal: options.run?.abortSignal,
-                prompt,
-                responseFormat: options.responseFormat,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => (0, postToApi_js_1.postJsonToApi)({
+                url: api.assembleUrl(`/completion`),
+                headers: api.headers,
+                body: {
+                    stream: responseFormat.stream,
+                    prompt: prompt.text,
+                    image_data: prompt.images != null
+                        ? Object.entries(prompt.images).map(([id, data]) => ({
+                            id: +id,
+                            data,
+                        }))
+                        : undefined,
+                    cache_prompt: this.settings.cachePrompt,
+                    temperature: this.settings.temperature,
+                    top_k: this.settings.topK,
+                    top_p: this.settings.topP,
+                    n_predict: this.settings.maxGenerationTokens,
+                    n_keep: this.settings.nKeep,
+                    stop: this.settings.stopSequences,
+                    tfs_z: this.settings.tfsZ,
+                    typical_p: this.settings.typicalP,
+                    repeat_penalty: this.settings.repeatPenalty,
+                    repeat_last_n: this.settings.repeatLastN,
+                    penalize_nl: this.settings.penalizeNl,
+                    mirostat: this.settings.mirostat,
+                    mirostat_tau: this.settings.mirostatTau,
+                    mirostat_eta: this.settings.mirostatEta,
+                    seed: this.settings.seed,
+                    ignore_eos: this.settings.ignoreEos,
+                    logit_bias: this.settings.logitBias,
+                },
+                failedResponseHandler: LlamaCppError_js_1.failedLlamaCppCallResponseHandler,
+                successfulResponseHandler: responseFormat.handler,
+                abortSignal,
             }),
         });
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "contextWindowSize",
             "cachePrompt",
             "temperature",
@@ -87,7 +115,16 @@ class LlamaCppTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: [response.content],
+            textGenerationResults: [
+                {
+                    text: response.content,
+                    finishReason: response.stopped_eos || response.stopped_word
+                        ? "stop"
+                        : response.stopped_limit
+                            ? "length"
+                            : "unknown",
+                },
+            ],
             usage: {
                 promptTokens: response.tokens_evaluated,
                 completionTokens: response.tokens_predicted,
@@ -198,43 +235,6 @@ const llamaCppTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z
     }),
     llamaCppTextGenerationResponseSchema,
 ]));
-async function callLlamaCppTextGenerationAPI({ api = new LlamaCppApiConfiguration_js_1.LlamaCppApiConfiguration(), abortSignal, responseFormat, prompt, cachePrompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
-    return (0, postToApi_js_1.postJsonToApi)({
-        url: api.assembleUrl(`/completion`),
-        headers: api.headers,
-        body: {
-            stream: responseFormat.stream,
-            prompt: prompt.text,
-            cache_prompt: cachePrompt,
-            temperature,
-            top_k: topK,
-            top_p: topP,
-            n_predict: nPredict,
-            n_keep: nKeep,
-            stop,
-            tfs_z: tfsZ,
-            typical_p: typicalP,
-            repeat_penalty: repeatPenalty,
-            repeat_last_n: repeatLastN,
-            penalize_nl: penalizeNl,
-            mirostat,
-            mirostat_tau: mirostatTau,
-            mirostat_eta: mirostatEta,
-            seed,
-            ignore_eos: ignoreEos,
-            logit_bias: logitBias,
-            image_data: prompt.images != null
-                ? Object.entries(prompt.images).map(([id, data]) => ({
-                    id: +id,
-                    data,
-                }))
-                : undefined,
-        },
-        failedResponseHandler: LlamaCppError_js_1.failedLlamaCppCallResponseHandler,
-        successfulResponseHandler: responseFormat.handler,
-        abortSignal,
-    });
-}
 async function createLlamaCppFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
     let content = "";

package/model-provider/llamacpp/LlamaCppTextGenerationModel.d.ts

@@ -58,16 +58,16 @@ export declare class LlamaCppTextGenerationModel<CONTEXT_WINDOW_SIZE extends num
     countPromptTokens(prompt: LlamaCppTextGenerationPrompt): Promise<number>;
     doGenerateTexts(prompt: LlamaCppTextGenerationPrompt, options?: FunctionOptions): Promise<{
         response: {
+            stop: true;
             model: string;
             prompt: string;
             content: string;
-            stop: true;
             generation_settings: {
+                stop: string[];
                 model: string;
                 stream: boolean;
                 seed: number;
                 mirostat: number;
-                stop: string[];
                 frequency_penalty: number;
                 ignore_eos: boolean;
                 logit_bias: number[];
@@ -106,7 +106,10 @@ export declare class LlamaCppTextGenerationModel<CONTEXT_WINDOW_SIZE extends num
             tokens_predicted: number;
             truncated: boolean;
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: "length" | "stop" | "unknown";
+        }[];
         usage: {
             promptTokens: number;
             completionTokens: number;
@@ -153,11 +156,11 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
         top_p: z.ZodNumber;
         typical_p: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
+        stop: string[];
         model: string;
         stream: boolean;
         seed: number;
         mirostat: number;
-        stop: string[];
         frequency_penalty: number;
         ignore_eos: boolean;
         logit_bias: number[];
@@ -177,11 +180,11 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
         top_p: number;
         typical_p: number;
     }, {
+        stop: string[];
         model: string;
         stream: boolean;
         seed: number;
         mirostat: number;
-        stop: string[];
         frequency_penalty: number;
         ignore_eos: boolean;
         logit_bias: number[];
@@ -240,16 +243,16 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
     tokens_predicted: z.ZodNumber;
     truncated: z.ZodBoolean;
 }, "strip", z.ZodTypeAny, {
+    stop: true;
     model: string;
     prompt: string;
     content: string;
-    stop: true;
     generation_settings: {
+        stop: string[];
         model: string;
         stream: boolean;
         seed: number;
         mirostat: number;
-        stop: string[];
         frequency_penalty: number;
         ignore_eos: boolean;
         logit_bias: number[];
@@ -288,16 +291,16 @@ declare const llamaCppTextGenerationResponseSchema: z.ZodObject<{
     tokens_predicted: number;
     truncated: boolean;
 }, {
+    stop: true;
     model: string;
     prompt: string;
     content: string;
-    stop: true;
     generation_settings: {
+        stop: string[];
         model: string;
         stream: boolean;
         seed: number;
         mirostat: number;
-        stop: string[];
         frequency_penalty: number;
         ignore_eos: boolean;
         logit_bias: number[];
@@ -353,16 +356,16 @@ export declare const LlamaCppTextGenerationResponseFormat: {
     json: {
         stream: false;
         handler: ResponseHandler<{
+            stop: true;
             model: string;
             prompt: string;
             content: string;
-            stop: true;
             generation_settings: {
+                stop: string[];
                 model: string;
                 stream: boolean;
                 seed: number;
                 mirostat: number;
-                stop: string[];
                 frequency_penalty: number;
                 ignore_eos: boolean;
                 logit_bias: number[];

package/model-provider/llamacpp/LlamaCppTextGenerationModel.js

@@ -4,6 +4,7 @@ import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postTo
 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 { AsyncQueue } from "../../util/AsyncQueue.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
@@ -34,25 +35,52 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
         return this.settings.contextWindowSize;
     }
     async callAPI(prompt, options) {
+        const api = this.settings.api ?? new LlamaCppApiConfiguration();
+        const responseFormat = options.responseFormat;
+        const abortSignal = options.run?.abortSignal;
         return callWithRetryAndThrottle({
-            retry: this.settings.api?.retry,
-            throttle: this.settings.api?.throttle,
-            call: async () => callLlamaCppTextGenerationAPI({
-                ...this.settings,
-                // mapping
-                nPredict: this.settings.maxGenerationTokens,
-                stop: this.settings.stopSequences,
-                // other
-                abortSignal: options.run?.abortSignal,
-                prompt,
-                responseFormat: options.responseFormat,
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl(`/completion`),
+                headers: api.headers,
+                body: {
+                    stream: responseFormat.stream,
+                    prompt: prompt.text,
+                    image_data: prompt.images != null
+                        ? Object.entries(prompt.images).map(([id, data]) => ({
+                            id: +id,
+                            data,
+                        }))
+                        : undefined,
+                    cache_prompt: this.settings.cachePrompt,
+                    temperature: this.settings.temperature,
+                    top_k: this.settings.topK,
+                    top_p: this.settings.topP,
+                    n_predict: this.settings.maxGenerationTokens,
+                    n_keep: this.settings.nKeep,
+                    stop: this.settings.stopSequences,
+                    tfs_z: this.settings.tfsZ,
+                    typical_p: this.settings.typicalP,
+                    repeat_penalty: this.settings.repeatPenalty,
+                    repeat_last_n: this.settings.repeatLastN,
+                    penalize_nl: this.settings.penalizeNl,
+                    mirostat: this.settings.mirostat,
+                    mirostat_tau: this.settings.mirostatTau,
+                    mirostat_eta: this.settings.mirostatEta,
+                    seed: this.settings.seed,
+                    ignore_eos: this.settings.ignoreEos,
+                    logit_bias: this.settings.logitBias,
+                },
+                failedResponseHandler: failedLlamaCppCallResponseHandler,
+                successfulResponseHandler: responseFormat.handler,
+                abortSignal,
             }),
         });
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...textGenerationModelProperties,
             "contextWindowSize",
             "cachePrompt",
             "temperature",
@@ -84,7 +112,16 @@ export class LlamaCppTextGenerationModel extends AbstractModel {
         });
         return {
             response,
-            texts: [response.content],
+            textGenerationResults: [
+                {
+                    text: response.content,
+                    finishReason: response.stopped_eos || response.stopped_word
+                        ? "stop"
+                        : response.stopped_limit
+                            ? "length"
+                            : "unknown",
+                },
+            ],
             usage: {
                 promptTokens: response.tokens_evaluated,
                 completionTokens: response.tokens_predicted,
@@ -194,43 +231,6 @@ const llamaCppTextStreamingResponseSchema = new ZodSchema(z.discriminatedUnion("
     }),
     llamaCppTextGenerationResponseSchema,
 ]));
-async function callLlamaCppTextGenerationAPI({ api = new LlamaCppApiConfiguration(), abortSignal, responseFormat, prompt, cachePrompt, temperature, topK, topP, nPredict, nKeep, stop, tfsZ, typicalP, repeatPenalty, repeatLastN, penalizeNl, mirostat, mirostatTau, mirostatEta, seed, ignoreEos, logitBias, }) {
-    return postJsonToApi({
-        url: api.assembleUrl(`/completion`),
-        headers: api.headers,
-        body: {
-            stream: responseFormat.stream,
-            prompt: prompt.text,
-            cache_prompt: cachePrompt,
-            temperature,
-            top_k: topK,
-            top_p: topP,
-            n_predict: nPredict,
-            n_keep: nKeep,
-            stop,
-            tfs_z: tfsZ,
-            typical_p: typicalP,
-            repeat_penalty: repeatPenalty,
-            repeat_last_n: repeatLastN,
-            penalize_nl: penalizeNl,
-            mirostat,
-            mirostat_tau: mirostatTau,
-            mirostat_eta: mirostatEta,
-            seed,
-            ignore_eos: ignoreEos,
-            logit_bias: logitBias,
-            image_data: prompt.images != null
-                ? Object.entries(prompt.images).map(([id, data]) => ({
-                    id: +id,
-                    data,
-                }))
-                : undefined,
-        },
-        failedResponseHandler: failedLlamaCppCallResponseHandler,
-        successfulResponseHandler: responseFormat.handler,
-        abortSignal,
-    });
-}
 async function createLlamaCppFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue();
     let content = "";

package/model-provider/mistral/MistralChatModel.cjs

@@ -75,6 +75,9 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
     get settingsForEvent() {
         const eventSettingProperties = [
             "maxGenerationTokens",
+            "stopSequences",
+            "numberOfGenerations",
+            "trimWhitespace",
             "temperature",
             "topP",
             "safeMode",
@@ -89,9 +92,23 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.message.content),
+            textGenerationResults: response.choices.map((choice) => ({
+                text: choice.message.content,
+                finishReason: this.translateFinishReason(choice.finish_reason),
+            })),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+            case "model_length":
+                return "length";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,
@@ -118,7 +135,7 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
-            model: this,
+            model: this, // stop tokens are not supported by this model
             promptTemplate,
         });
     }

package/model-provider/mistral/MistralChatModel.d.ts

@@ -7,6 +7,7 @@ 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";
+import { TextGenerationFinishReason } from "../../model-function/generate-text/TextGenerationResult.js";
 export type MistralChatMessage = {
     role: "system" | "user" | "assistant";
     content: string;
@@ -78,8 +79,12 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
                 index: number;
             }[];
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
     }>;
+    private translateFinishReason;
     doStreamText(prompt: MistralChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
      * Returns this model with a text prompt template.
@@ -88,11 +93,11 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, MistralChatPrompt, MistralChatModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, MistralChatPrompt, MistralChatModelSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, MistralChatPrompt, MistralChatModelSettings, this>;
+    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, MistralChatPrompt, MistralChatModelSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, MistralChatPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, MistralChatPrompt, MistralChatModelSettings, this>;
     withSettings(additionalSettings: Partial<MistralChatModelSettings>): this;
 }

package/model-provider/mistral/MistralChatModel.js

@@ -72,6 +72,9 @@ export class MistralChatModel extends AbstractModel {
     get settingsForEvent() {
         const eventSettingProperties = [
             "maxGenerationTokens",
+            "stopSequences",
+            "numberOfGenerations",
+            "trimWhitespace",
             "temperature",
             "topP",
             "safeMode",
@@ -86,9 +89,23 @@ export class MistralChatModel extends AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.message.content),
+            textGenerationResults: response.choices.map((choice) => ({
+                text: choice.message.content,
+                finishReason: this.translateFinishReason(choice.finish_reason),
+            })),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+            case "model_length":
+                return "length";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,
@@ -115,7 +132,7 @@ export class MistralChatModel extends AbstractModel {
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel({
-            model: this,
+            model: this, // stop tokens are not supported by this model
             promptTemplate,
         });
     }

package/model-provider/mistral/MistralPromptTemplate.cjs

@@ -1,7 +1,7 @@
 "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 Content_js_1 = require("../../model-function/generate-text/prompt-template/Content.cjs");
 /**
  * Formats a text prompt as a Mistral prompt.
  */
@@ -22,7 +22,8 @@ function instruction() {
             if (prompt.system != null) {
                 messages.push({ role: "system", content: prompt.system });
             }
-            messages.push({ role: "user", content: prompt.instruction });
+            const instruction = (0, Content_js_1.validateContentIsString)(prompt.instruction, prompt);
+            messages.push({ role: "user", content: instruction });
             return messages;
         },
         stopSequences: [],
@@ -35,7 +36,6 @@ exports.instruction = instruction;
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             const messages = [];
             if (prompt.system != null) {
                 messages.push({ role: "system", content: prompt.system });
@@ -43,7 +43,8 @@ function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        messages.push({ role: "user", content });
+                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
+                        messages.push({ role: "user", content: textContent });
                         break;
                     }
                     case "assistant": {

package/model-provider/mistral/MistralPromptTemplate.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";
 import { MistralChatPrompt } from "./MistralChatModel.js";
 /**
  * Formats a text prompt as a Mistral prompt.
@@ -9,8 +9,8 @@ export declare function text(): TextGenerationPromptTemplate<string, MistralChat
 /**
  * Formats an instruction prompt as a Mistral prompt.
  */
-export declare function instruction(): TextGenerationPromptTemplate<TextInstructionPrompt, MistralChatPrompt>;
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, MistralChatPrompt>;
 /**
  * Formats a chat prompt as a Mistral prompt.
  */
-export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, MistralChatPrompt>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, MistralChatPrompt>;

package/model-provider/mistral/MistralPromptTemplate.js

@@ -1,4 +1,4 @@
-import { validateChatPrompt, } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
+import { validateContentIsString } from "../../model-function/generate-text/prompt-template/Content.js";
 /**
  * Formats a text prompt as a Mistral prompt.
  */
@@ -18,7 +18,8 @@ export function instruction() {
             if (prompt.system != null) {
                 messages.push({ role: "system", content: prompt.system });
             }
-            messages.push({ role: "user", content: prompt.instruction });
+            const instruction = validateContentIsString(prompt.instruction, prompt);
+            messages.push({ role: "user", content: instruction });
             return messages;
         },
         stopSequences: [],
@@ -30,7 +31,6 @@ export function instruction() {
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             const messages = [];
             if (prompt.system != null) {
                 messages.push({ role: "system", content: prompt.system });
@@ -38,7 +38,8 @@ export function chat() {
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        messages.push({ role: "user", content });
+                        const textContent = validateContentIsString(content, prompt);
+                        messages.push({ role: "user", content: textContent });
                         break;
                     }
                     case "assistant": {

package/model-provider/ollama/OllamaChatModel.cjs

@@ -9,6 +9,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.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 TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -92,8 +93,7 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "temperature",
             "mirostat",
             "mirostatEta",
@@ -119,7 +119,12 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: [response.message.content],
+            textGenerationResults: [
+                {
+                    text: response.message.content,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

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

@@ -52,7 +52,10 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
             load_duration?: number | undefined;
             prompt_eval_duration?: number | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: "unknown";
+        }[];
     }>;
     doStreamText(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaChatPrompt, this>;
@@ -64,11 +67,11 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").MultiModalInstructionPrompt | import("../../index.js").TextInstructionPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt | import("../../index.js").MultiModalChatPrompt, 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>;
     withSettings(additionalSettings: Partial<OllamaChatModelSettings>): this;
 }