modelfusion 0.102.0 → 0.104.0

package/model-provider/ollama/OllamaChatModel.js

@@ -6,6 +6,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.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 { 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";
@@ -89,8 +90,7 @@ export class OllamaChatModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...textGenerationModelProperties,
             "temperature",
             "mirostat",
             "mirostatEta",
@@ -116,7 +116,12 @@ export class OllamaChatModel extends AbstractModel {
         });
         return {
             response,
-            texts: [response.message.content],
+            textGenerationResults: [
+                {
+                    text: response.message.content,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

package/model-provider/ollama/OllamaChatPromptTemplate.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = exports.identity = void 0;
-const ChatPrompt_js_1 = require("../../model-function/generate-text/prompt-template/ChatPrompt.cjs");
 /**
  * OllamaChatPrompt identity chat format.
  */
@@ -42,7 +41,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 });
@@ -60,17 +58,15 @@ function extractContent(input) {
     if (typeof input === "string") {
         return { content: input, images: undefined };
     }
-    else {
-        const images = [];
-        let content = "";
-        for (const part of input) {
-            if (part.type === "text") {
-                content += part.text;
-            }
-            else {
-                images.push(part.base64Image);
-            }
+    const images = [];
+    let content = "";
+    for (const part of input) {
+        if (part.type === "text") {
+            content += part.text;
+        }
+        else {
+            images.push(part.base64Image);
         }
-        return { content, images };
     }
+    return { content, images };
 }

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

@@ -1,6 +1,6 @@
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
-import { MultiModalChatPrompt, TextChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
-import { MultiModalInstructionPrompt, 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 { OllamaChatPrompt } from "./OllamaChatModel.js";
 /**
  * OllamaChatPrompt identity chat format.
@@ -13,8 +13,8 @@ export declare function text(): TextGenerationPromptTemplate<string, OllamaChatP
 /**
  * Formats an instruction prompt as an Ollama chat prompt.
  */
-export declare function instruction(): TextGenerationPromptTemplate<MultiModalInstructionPrompt | TextInstructionPrompt, OllamaChatPrompt>;
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, OllamaChatPrompt>;
 /**
  * Formats a chat prompt as an Ollama chat prompt.
  */
-export declare function chat(): TextGenerationPromptTemplate<MultiModalChatPrompt | TextChatPrompt, OllamaChatPrompt>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, OllamaChatPrompt>;

package/model-provider/ollama/OllamaChatPromptTemplate.js

@@ -1,4 +1,3 @@
-import { validateChatPrompt, } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
 /**
  * OllamaChatPrompt identity chat format.
  */
@@ -36,7 +35,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 });
@@ -53,17 +51,15 @@ function extractContent(input) {
     if (typeof input === "string") {
         return { content: input, images: undefined };
     }
-    else {
-        const images = [];
-        let content = "";
-        for (const part of input) {
-            if (part.type === "text") {
-                content += part.text;
-            }
-            else {
-                images.push(part.base64Image);
-            }
+    const images = [];
+    let content = "";
+    for (const part of input) {
+        if (part.type === "text") {
+            content += part.text;
+        }
+        else {
+            images.push(part.base64Image);
         }
-        return { content, images };
     }
+    return { content, images };
 }

package/model-provider/ollama/OllamaCompletionModel.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");
@@ -90,8 +91,7 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "contextWindowSize",
             "temperature",
             "mirostat",
@@ -121,7 +121,12 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: [response.response],
+            textGenerationResults: [
+                {
+                    text: response.response,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

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

@@ -65,7 +65,10 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
             prompt_eval_duration?: number | undefined;
             context?: number[] | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: "unknown";
+        }[];
     }>;
     doStreamText(prompt: OllamaCompletionPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;

package/model-provider/ollama/OllamaCompletionModel.js

@@ -6,6 +6,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.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 { 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";
@@ -87,8 +88,7 @@ export class OllamaCompletionModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...textGenerationModelProperties,
             "contextWindowSize",
             "temperature",
             "mirostat",
@@ -118,7 +118,12 @@ export class OllamaCompletionModel extends AbstractModel {
         });
         return {
             response,
-            texts: [response.response],
+            textGenerationResults: [
+                {
+                    text: response.response,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -8,6 +8,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 TextPromptTemplate_js_1 = require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -228,9 +229,7 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "suffix",
             "temperature",
             "topP",
@@ -251,7 +250,12 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.text),
+            textGenerationResults: response.choices.map((choice) => {
+                return {
+                    finishReason: this.translateFinishReason(choice.finish_reason),
+                    text: choice.text,
+                };
+            }),
             usage: {
                 promptTokens: response.usage.prompt_tokens,
                 completionTokens: response.usage.completion_tokens,
@@ -259,6 +263,18 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
             },
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/openai/OpenAICompletionModel.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";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 /**
  * @see https://platform.openai.com/docs/models/
@@ -162,25 +163,29 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
             }[];
             system_fingerprint?: string | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            finishReason: TextGenerationFinishReason;
+            text: string;
+        }[];
         usage: {
             promptTokens: number;
             completionTokens: number;
             totalTokens: number;
         };
     }>;
+    private translateFinishReason;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, OpenAICompletionModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, string, OpenAICompletionModelSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
     withChatPrompt(options?: {
         user?: string;
         assistant?: string;
-    }): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, OpenAICompletionModelSettings, this>;
+    }): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, string, OpenAICompletionModelSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
     withSettings(additionalSettings: Partial<OpenAICompletionModelSettings>): this;
 }

package/model-provider/openai/OpenAICompletionModel.js

@@ -5,6 +5,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { chat, instruction, } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -222,9 +223,7 @@ export class OpenAICompletionModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "suffix",
             "temperature",
             "topP",
@@ -245,7 +244,12 @@ export class OpenAICompletionModel extends AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.text),
+            textGenerationResults: response.choices.map((choice) => {
+                return {
+                    finishReason: this.translateFinishReason(choice.finish_reason),
+                    text: choice.text,
+                };
+            }),
             usage: {
                 promptTokens: response.usage.prompt_tokens,
                 completionTokens: response.usage.completion_tokens,
@@ -253,6 +257,18 @@ export class OpenAICompletionModel extends AbstractModel {
             },
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/openai/chat/AbstractOpenAIChatModel.cjs

@@ -80,10 +80,28 @@ class AbstractOpenAIChatModel 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),
+            })),
             usage: this.extractUsage(response),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            case "function_call":
+            case "tool_calls":
+                return "tool-calls";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/openai/chat/AbstractOpenAIChatModel.d.ts

@@ -5,6 +5,7 @@ import { ResponseHandler } from "../../../core/api/postToApi.js";
 import { AbstractModel } from "../../../model-function/AbstractModel.js";
 import { Delta } from "../../../model-function/Delta.js";
 import { TextGenerationModelSettings } from "../../../model-function/generate-text/TextGenerationModel.js";
+import { TextGenerationFinishReason } from "../../../model-function/generate-text/TextGenerationResult.js";
 import { ToolDefinition } from "../../../tool/ToolDefinition.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 export interface AbstractOpenAIChatCallSettings {
@@ -126,13 +127,17 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             }[];
             system_fingerprint?: string | null | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
         usage: {
             promptTokens: number;
             completionTokens: number;
             totalTokens: number;
         };
     }>;
+    private translateFinishReason;
     doStreamText(prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
         response: {

package/model-provider/openai/chat/AbstractOpenAIChatModel.js

@@ -77,10 +77,28 @@ export class AbstractOpenAIChatModel 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),
+            })),
             usage: this.extractUsage(response),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            case "function_call":
+            case "tool_calls":
+                return "tool-calls";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/openai/chat/OpenAIChatFunctionCallStructureGenerationModel.d.ts

@@ -27,11 +27,11 @@ OpenAIChatSettings> {
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../../index.js").MultiModalInstructionPrompt | import("../../../index.js").TextInstructionPrompt, OpenAIChatPrompt>>;
+    withInstructionPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../../index.js").InstructionPrompt, OpenAIChatPrompt>>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../../index.js").TextChatPrompt | import("../../../index.js").MultiModalChatPrompt, OpenAIChatPrompt>>;
+    withChatPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../../index.js").ChatPrompt, OpenAIChatPrompt>>;
     withPromptTemplate<TARGET_PROMPT_FORMAT extends TextGenerationPromptTemplate<unknown, OpenAIChatPrompt>>(promptTemplate: TARGET_PROMPT_FORMAT): OpenAIChatFunctionCallStructureGenerationModel<TARGET_PROMPT_FORMAT>;
     withSettings(additionalSettings: Partial<OpenAIChatSettings>): this;
     /**

package/model-provider/openai/chat/OpenAIChatMessage.d.ts

@@ -1,4 +1,4 @@
-import { MultiModalInput } from "../../../model-function/generate-text/prompt-template/Content.js";
+import { Content } from "../../../model-function/generate-text/prompt-template/Content.js";
 import { ToolCall } from "../../../tool/ToolCall.js";
 export type OpenAIChatMessage = {
     role: "system";
@@ -50,7 +50,7 @@ export declare const OpenAIChatMessage: {
     /**
      * Creates a user chat message. The message can be a string or a multi-modal input.
      */
-    user(content: string | MultiModalInput, options?: {
+    user(content: Content, options?: {
         name?: string;
     }): OpenAIChatMessage;
     /**

package/model-provider/openai/chat/OpenAIChatModel.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIChatModel = exports.calculateOpenAIChatCostInMillicents = exports.isOpenAIChatModel = exports.getOpenAIChatModelInformation = exports.OPENAI_CHAT_MODELS = void 0;
 const StructureFromTextStreamingModel_js_1 = require("../../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../../model-function/generate-text/TextGenerationModel.cjs");
 const TikTokenTokenizer_js_1 = require("../TikTokenTokenizer.cjs");
 const AbstractOpenAIChatModel_js_1 = require("./AbstractOpenAIChatModel.cjs");
 const OpenAIChatFunctionCallStructureGenerationModel_js_1 = require("./OpenAIChatFunctionCallStructureGenerationModel.cjs");
@@ -196,9 +197,7 @@ class OpenAIChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpenAIChatMod
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

package/model-provider/openai/chat/OpenAIChatModel.d.ts

@@ -151,11 +151,11 @@ export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatS
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../../index.js").MultiModalInstructionPrompt | import("../../../index.js").TextInstructionPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../../index.js").InstructionPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../../index.js").TextChatPrompt | import("../../../index.js").MultiModalChatPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;
+    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../../index.js").ChatPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, OpenAIChatSettings, this>;
     withSettings(additionalSettings: Partial<OpenAIChatSettings>): this;
 }

package/model-provider/openai/chat/OpenAIChatModel.js

@@ -1,5 +1,6 @@
 import { StructureFromTextStreamingModel } from "../../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../../model-function/generate-text/TextGenerationModel.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";
 import { AbstractOpenAIChatModel, } from "./AbstractOpenAIChatModel.js";
 import { OpenAIChatFunctionCallStructureGenerationModel } from "./OpenAIChatFunctionCallStructureGenerationModel.js";
@@ -190,9 +191,7 @@ export class OpenAIChatModel extends AbstractOpenAIChatModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

package/model-provider/openai/chat/OpenAIChatPromptTemplate.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = exports.identity = void 0;
-const ChatPrompt_js_1 = require("../../../model-function/generate-text/prompt-template/ChatPrompt.cjs");
 const OpenAIChatMessage_js_1 = require("./OpenAIChatMessage.cjs");
 /**
  * OpenAIMessage[] identity chat format.
@@ -43,7 +42,6 @@ exports.instruction = instruction;
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             const messages = [];
             if (prompt.system != null) {
                 messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.system(prompt.system));

package/model-provider/openai/chat/OpenAIChatPromptTemplate.d.ts

@@ -1,6 +1,6 @@
 import { TextGenerationPromptTemplate } from "../../../model-function/generate-text/TextGenerationPromptTemplate.js";
-import { MultiModalChatPrompt, TextChatPrompt } from "../../../model-function/generate-text/prompt-template/ChatPrompt.js";
-import { MultiModalInstructionPrompt, 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 { OpenAIChatPrompt } from "./AbstractOpenAIChatModel.js";
 /**
  * OpenAIMessage[] identity chat format.
@@ -13,8 +13,8 @@ export declare function text(): TextGenerationPromptTemplate<string, OpenAIChatP
 /**
  * Formats an instruction prompt as an OpenAI chat prompt.
  */
-export declare function instruction(): TextGenerationPromptTemplate<MultiModalInstructionPrompt | TextInstructionPrompt, OpenAIChatPrompt>;
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, OpenAIChatPrompt>;
 /**
  * Formats a chat prompt as an OpenAI chat prompt.
  */
-export declare function chat(): TextGenerationPromptTemplate<MultiModalChatPrompt | TextChatPrompt, OpenAIChatPrompt>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, OpenAIChatPrompt>;

package/model-provider/openai/chat/OpenAIChatPromptTemplate.js

@@ -1,4 +1,3 @@
-import { validateChatPrompt, } from "../../../model-function/generate-text/prompt-template/ChatPrompt.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 /**
  * OpenAIMessage[] identity chat format.
@@ -37,7 +36,6 @@ export function instruction() {
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             const messages = [];
             if (prompt.system != null) {
                 messages.push(OpenAIChatMessage.system(prompt.system));

package/model-provider/openai-compatible/OpenAICompatibleChatModel.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAICompatibleChatModel = void 0;
 const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const AbstractOpenAIChatModel_js_1 = require("../openai/chat/AbstractOpenAIChatModel.cjs");
 const OpenAIChatPromptTemplate_js_1 = require("../openai/chat/OpenAIChatPromptTemplate.cjs");
 /**
@@ -43,9 +44,7 @@ class OpenAICompatibleChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpe
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "stopSequences",
-            "maxGenerationTokens",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

package/model-provider/openai-compatible/OpenAICompatibleChatModel.d.ts

@@ -35,11 +35,11 @@ export declare class OpenAICompatibleChatModel extends AbstractOpenAIChatModel<O
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").MultiModalInstructionPrompt | import("../../index.js").TextInstructionPrompt, OpenAIChatPrompt, OpenAICompatibleChatSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, OpenAIChatPrompt, OpenAICompatibleChatSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt | import("../../index.js").MultiModalChatPrompt, OpenAIChatPrompt, OpenAICompatibleChatSettings, this>;
+    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, OpenAIChatPrompt, OpenAICompatibleChatSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, OpenAICompatibleChatSettings, this>;
     withSettings(additionalSettings: Partial<OpenAICompatibleChatSettings>): this;
 }

package/model-provider/openai-compatible/OpenAICompatibleChatModel.js

@@ -1,5 +1,6 @@
 import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { AbstractOpenAIChatModel, } from "../openai/chat/AbstractOpenAIChatModel.js";
 import { chat, instruction, text, } from "../openai/chat/OpenAIChatPromptTemplate.js";
 /**
@@ -40,9 +41,7 @@ export class OpenAICompatibleChatModel extends AbstractOpenAIChatModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "stopSequences",
-            "maxGenerationTokens",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",