modelfusion 0.103.0 → 0.104.0

package/model-function/generate-text/prompt-template/TextPromptTemplate.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("./ChatPrompt.cjs");
+const Content_js_1 = require("./Content.cjs");
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
@@ -20,7 +20,7 @@ const instruction = () => ({
         if (prompt.system != null) {
             text += `${prompt.system}\n\n`;
         }
-        text += `${prompt.instruction}\n\n`;
+        text += `${(0, Content_js_1.validateContentIsString)(prompt.instruction, prompt)}\n\n`;
         if (prompt.responsePrefix != null) {
             text += prompt.responsePrefix;
         }
@@ -37,14 +37,13 @@ exports.instruction = instruction;
  */
 const chat = ({ user = "user", assistant = "assistant", system, } = {}) => ({
     format(prompt) {
-        (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
         let text = prompt.system != null
             ? `${system != null ? `${system}:` : ""}${prompt.system}\n\n`
             : "";
         for (const { role, content } of prompt.messages) {
             switch (role) {
                 case "user": {
-                    text += `${user}:\n${content}\n\n`;
+                    text += `${user}:\n${(0, Content_js_1.validateContentIsString)(content, prompt)}\n\n`;
                     break;
                 }
                 case "assistant": {

package/model-function/generate-text/prompt-template/TextPromptTemplate.d.ts

@@ -1,6 +1,6 @@
 import { TextGenerationPromptTemplate } from "../TextGenerationPromptTemplate.js";
-import { TextChatPrompt } from "./ChatPrompt.js";
-import { TextInstructionPrompt } from "./InstructionPrompt.js";
+import { ChatPrompt } from "./ChatPrompt.js";
+import { InstructionPrompt } from "./InstructionPrompt.js";
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
@@ -8,7 +8,7 @@ export declare const text: () => TextGenerationPromptTemplate<string, string>;
 /**
  * Formats an instruction prompt as a basic text prompt.
  */
-export declare const instruction: () => TextGenerationPromptTemplate<TextInstructionPrompt, string>;
+export declare const instruction: () => TextGenerationPromptTemplate<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as a basic text prompt.
  *
@@ -20,4 +20,4 @@ export declare const chat: (options?: {
     user?: string;
     assistant?: string;
     system?: string;
-}) => TextGenerationPromptTemplate<TextChatPrompt, string>;
+}) => TextGenerationPromptTemplate<ChatPrompt, string>;

package/model-function/generate-text/prompt-template/TextPromptTemplate.js

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "./ChatPrompt.js";
+import { validateContentIsString } from "./Content.js";
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
@@ -16,7 +16,7 @@ export const instruction = () => ({
         if (prompt.system != null) {
             text += `${prompt.system}\n\n`;
         }
-        text += `${prompt.instruction}\n\n`;
+        text += `${validateContentIsString(prompt.instruction, prompt)}\n\n`;
         if (prompt.responsePrefix != null) {
             text += prompt.responsePrefix;
         }
@@ -32,14 +32,13 @@ export const instruction = () => ({
  */
 export const chat = ({ user = "user", assistant = "assistant", system, } = {}) => ({
     format(prompt) {
-        validateChatPrompt(prompt);
         let text = prompt.system != null
             ? `${system != null ? `${system}:` : ""}${prompt.system}\n\n`
             : "";
         for (const { role, content } of prompt.messages) {
             switch (role) {
                 case "user": {
-                    text += `${user}:\n${content}\n\n`;
+                    text += `${user}:\n${validateContentIsString(content, prompt)}\n\n`;
                     break;
                 }
                 case "assistant": {

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = void 0;
-const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
+const Content_js_1 = require("./Content.cjs");
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";
@@ -21,14 +21,14 @@ const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             let text = prompt.system != null
                 ? `${prompt.system}\n\n`
                 : `${DEFAULT_SYSTEM_MESSAGE}\n\n`;
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += `USER: ${content}\n`;
+                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
+                        text += `USER: ${textContent}\n`;
                         break;
                     }
                     case "assistant": {

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.d.ts

@@ -1,5 +1,5 @@
 import { TextGenerationPromptTemplate } from "../TextGenerationPromptTemplate.js";
-import { TextChatPrompt } from "./ChatPrompt.js";
+import { ChatPrompt } from "./ChatPrompt.js";
 /**
  * Formats a chat prompt as a Vicuna prompt.
  *
@@ -13,4 +13,4 @@ import { TextChatPrompt } from "./ChatPrompt.js";
  * ASSISTANT:
  * ```
  */
-export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, string>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, string>;

package/model-function/generate-text/prompt-template/VicunaPromptTemplate.js

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "./ChatPrompt.js";
+import { validateContentIsString } from "./Content.js";
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";
@@ -18,14 +18,14 @@ const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             let text = prompt.system != null
                 ? `${prompt.system}\n\n`
                 : `${DEFAULT_SYSTEM_MESSAGE}\n\n`;
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
-                        text += `USER: ${content}\n`;
+                        const textContent = validateContentIsString(content, prompt);
+                        text += `USER: ${textContent}\n`;
                         break;
                     }
                     case "assistant": {

package/model-function/generate-text/prompt-template/trimChatPrompt.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trimChatPrompt = void 0;
-const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *
@@ -14,7 +13,6 @@ const ChatPrompt_js_1 = require("./ChatPrompt.cjs");
  */
 async function trimChatPrompt({ prompt, model, tokenLimit = model.contextWindowSize -
     (model.settings.maxGenerationTokens ?? model.contextWindowSize / 4), }) {
-    (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
     let minimalPrompt = {
         system: prompt.system,
         messages: [prompt.messages[prompt.messages.length - 1]], // last user message

package/model-function/generate-text/prompt-template/trimChatPrompt.d.ts

@@ -1,5 +1,5 @@
 import { HasContextWindowSize, HasTokenizer, TextGenerationModel, TextGenerationModelSettings } from "../TextGenerationModel.js";
-import { TextChatPrompt } from "./ChatPrompt.js";
+import { ChatPrompt } from "./ChatPrompt.js";
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *
@@ -11,7 +11,7 @@ import { TextChatPrompt } from "./ChatPrompt.js";
  * @see https://modelfusion.dev/guide/function/generate-text#limiting-the-chat-length
  */
 export declare function trimChatPrompt({ prompt, model, tokenLimit, }: {
-    prompt: TextChatPrompt;
-    model: TextGenerationModel<TextChatPrompt, TextGenerationModelSettings> & HasTokenizer<TextChatPrompt> & HasContextWindowSize;
+    prompt: ChatPrompt;
+    model: TextGenerationModel<ChatPrompt, TextGenerationModelSettings> & HasTokenizer<ChatPrompt> & HasContextWindowSize;
     tokenLimit?: number;
-}): Promise<TextChatPrompt>;
+}): Promise<ChatPrompt>;

package/model-function/generate-text/prompt-template/trimChatPrompt.js

@@ -1,4 +1,3 @@
-import { validateChatPrompt } from "./ChatPrompt.js";
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *
@@ -11,7 +10,6 @@ import { validateChatPrompt } from "./ChatPrompt.js";
  */
 export async function trimChatPrompt({ prompt, model, tokenLimit = model.contextWindowSize -
     (model.settings.maxGenerationTokens ?? model.contextWindowSize / 4), }) {
-    validateChatPrompt(prompt);
     let minimalPrompt = {
         system: prompt.system,
         messages: [prompt.messages[prompt.messages.length - 1]], // last user message

package/model-provider/anthropic/AnthropicPromptTemplate.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");
 const HUMAN_PREFIX = "\n\nHuman:";
 const ASSISTANT_PREFIX = "\n\nAssistant:";
 /**
@@ -26,9 +26,10 @@ exports.text = text;
 function instruction() {
     return {
         format(prompt) {
+            const instruction = (0, Content_js_1.validateContentIsString)(prompt.instruction, prompt);
             let text = prompt.system ?? "";
             text += HUMAN_PREFIX;
-            text += prompt.instruction;
+            text += instruction;
             text += ASSISTANT_PREFIX;
             if (prompt.responsePrefix != null) {
                 text += prompt.responsePrefix;
@@ -47,13 +48,13 @@ exports.instruction = instruction;
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             let text = prompt.system ?? "";
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
+                        const textContent = (0, Content_js_1.validateContentIsString)(content, prompt);
                         text += HUMAN_PREFIX;
-                        text += content;
+                        text += textContent;
                         break;
                     }
                     case "assistant": {

package/model-provider/anthropic/AnthropicPromptTemplate.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";
 /**
  * Formats a text prompt as an Anthropic prompt.
  */
@@ -8,10 +8,10 @@ export declare function text(): TextGenerationPromptTemplate<string, string>;
 /**
  * Formats an instruction prompt as an Anthropic prompt.
  */
-export declare function instruction(): TextGenerationPromptTemplate<TextInstructionPrompt, string>;
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as an Anthropic prompt.
  *
  * @see https://docs.anthropic.com/claude/docs/constructing-a-prompt
  */
-export declare function chat(): TextGenerationPromptTemplate<TextChatPrompt, string>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, string>;

package/model-provider/anthropic/AnthropicPromptTemplate.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";
 const HUMAN_PREFIX = "\n\nHuman:";
 const ASSISTANT_PREFIX = "\n\nAssistant:";
 /**
@@ -22,9 +22,10 @@ export function text() {
 export function instruction() {
     return {
         format(prompt) {
+            const instruction = validateContentIsString(prompt.instruction, prompt);
             let text = prompt.system ?? "";
             text += HUMAN_PREFIX;
-            text += prompt.instruction;
+            text += instruction;
             text += ASSISTANT_PREFIX;
             if (prompt.responsePrefix != null) {
                 text += prompt.responsePrefix;
@@ -42,13 +43,13 @@ export function instruction() {
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             let text = prompt.system ?? "";
             for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
+                        const textContent = validateContentIsString(content, prompt);
                         text += HUMAN_PREFIX;
-                        text += content;
+                        text += textContent;
                         break;
                     }
                     case "assistant": {

package/model-provider/anthropic/AnthropicTextGenerationModel.d.ts

@@ -70,11 +70,11 @@ export declare class AnthropicTextGenerationModel extends AbstractModel<Anthropi
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, AnthropicTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, string, AnthropicTextGenerationModelSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, AnthropicTextGenerationModelSettings, this>;
+    withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, string, AnthropicTextGenerationModelSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, AnthropicTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<AnthropicTextGenerationModelSettings>): this;
 }

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.d.ts

@@ -49,7 +49,7 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     }>;
     withTextPrompt(): PromptTemplateImageGenerationModel<string, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, Automatic1111ImageGenerationPrompt>): PromptTemplateImageGenerationModel<INPUT_PROMPT, Automatic1111ImageGenerationPrompt, Automatic1111ImageGenerationSettings, this>;
-    withSettings(additionalSettings: Automatic1111ImageGenerationSettings): this;
+    withSettings(additionalSettings: Partial<Automatic1111ImageGenerationSettings>): this;
 }
 declare const Automatic1111ImageGenerationResponseSchema: z.ZodObject<{
     images: z.ZodArray<z.ZodString, "many">;

package/model-provider/cohere/CohereTextGenerationModel.d.ts

@@ -91,14 +91,14 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, CohereTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, string, CohereTextGenerationModelSettings, this>;
     /**
      * Returns this model with a chat prompt template.
      */
     withChatPrompt(options?: {
         user?: string;
         assistant?: string;
-    }): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, CohereTextGenerationModelSettings, this>;
+    }): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, string, CohereTextGenerationModelSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, CohereTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<CohereTextGenerationModelSettings>): this;
 }

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = void 0;
-const ChatPrompt_js_1 = require("../../model-function/generate-text/prompt-template/ChatPrompt.cjs");
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";
@@ -16,23 +15,28 @@ function instruction() {
             let text = "";
             text += `${prompt.system ?? DEFAULT_SYSTEM_MESSAGE}\n\n`;
             text += `USER: `;
-            // construct text and image mapping:
-            let imageCounter = 1;
             const images = {};
-            for (const content of prompt.instruction) {
-                switch (content.type) {
-                    case "text": {
-                        text += content.text;
-                        break;
-                    }
-                    case "image": {
-                        text += `[img-${imageCounter}]`;
-                        images[imageCounter.toString()] = content.base64Image;
-                        imageCounter++;
-                        break;
+            if (typeof prompt.instruction === "string") {
+                text += `${prompt.instruction}\n`;
+            }
+            else {
+                // construct text and image mapping:
+                let imageCounter = 1;
+                for (const content of prompt.instruction) {
+                    switch (content.type) {
+                        case "text": {
+                            text += content.text;
+                            break;
+                        }
+                        case "image": {
+                            text += `[img-${imageCounter}]`;
+                            images[imageCounter.toString()] = content.base64Image;
+                            imageCounter++;
+                            break;
+                        }
                     }
+                    text += `${content}\n`;
                 }
-                text += `${content}\n`;
             }
             text += `\nASSISTANT: `;
             return { text, images };
@@ -44,7 +48,6 @@ exports.instruction = instruction;
 function chat() {
     return {
         format(prompt) {
-            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             let text = "";
             text += `${prompt.system ?? DEFAULT_SYSTEM_MESSAGE}\n\n`;
             // construct text and image mapping:
@@ -54,6 +57,10 @@ function chat() {
                 switch (role) {
                     case "user": {
                         text += `USER: `;
+                        if (typeof content === "string") {
+                            text += content;
+                            break;
+                        }
                         for (const part of content) {
                             switch (part.type) {
                                 case "text": {

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

@@ -1,11 +1,11 @@
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
-import { MultiModalChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
-import { MultiModalInstructionPrompt } 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 { LlamaCppTextGenerationPrompt } from "./LlamaCppTextGenerationModel.js";
 /**
  * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
  *
  * @see https://github.com/SkunkworksAI/BakLLaVA
  */
-export declare function instruction(): TextGenerationPromptTemplate<MultiModalInstructionPrompt, LlamaCppTextGenerationPrompt>;
-export declare function chat(): TextGenerationPromptTemplate<MultiModalChatPrompt, LlamaCppTextGenerationPrompt>;
+export declare function instruction(): TextGenerationPromptTemplate<InstructionPrompt, LlamaCppTextGenerationPrompt>;
+export declare function chat(): TextGenerationPromptTemplate<ChatPrompt, LlamaCppTextGenerationPrompt>;

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.js

@@ -1,4 +1,3 @@
-import { validateChatPrompt, } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";
@@ -13,23 +12,28 @@ export function instruction() {
             let text = "";
             text += `${prompt.system ?? DEFAULT_SYSTEM_MESSAGE}\n\n`;
             text += `USER: `;
-            // construct text and image mapping:
-            let imageCounter = 1;
             const images = {};
-            for (const content of prompt.instruction) {
-                switch (content.type) {
-                    case "text": {
-                        text += content.text;
-                        break;
-                    }
-                    case "image": {
-                        text += `[img-${imageCounter}]`;
-                        images[imageCounter.toString()] = content.base64Image;
-                        imageCounter++;
-                        break;
+            if (typeof prompt.instruction === "string") {
+                text += `${prompt.instruction}\n`;
+            }
+            else {
+                // construct text and image mapping:
+                let imageCounter = 1;
+                for (const content of prompt.instruction) {
+                    switch (content.type) {
+                        case "text": {
+                            text += content.text;
+                            break;
+                        }
+                        case "image": {
+                            text += `[img-${imageCounter}]`;
+                            images[imageCounter.toString()] = content.base64Image;
+                            imageCounter++;
+                            break;
+                        }
                     }
+                    text += `${content}\n`;
                 }
-                text += `${content}\n`;
             }
             text += `\nASSISTANT: `;
             return { text, images };
@@ -40,7 +44,6 @@ export function instruction() {
 export function chat() {
     return {
         format(prompt) {
-            validateChatPrompt(prompt);
             let text = "";
             text += `${prompt.system ?? DEFAULT_SYSTEM_MESSAGE}\n\n`;
             // construct text and image mapping:
@@ -50,6 +53,10 @@ export function chat() {
                 switch (role) {
                     case "user": {
                         text += `USER: `;
+                        if (typeof content === "string") {
+                            text += content;
+                            break;
+                        }
                         for (const part of content) {
                             switch (part.type) {
                                 case "text": {

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

@@ -93,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/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.d.ts

@@ -67,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;
 }