modelfusion 0.79.0 → 0.80.0

package/model-function/generate-text/prompt-format/TextPromptFormat.js

@@ -1,22 +1,22 @@
-import { validateChatPrompt } from "./validateChatPrompt.js";
+import { validateChatPrompt } from "./ChatPrompt.js";
 /**
  * Formats a text prompt as a basic text prompt. Does not change the text prompt in any way.
  */
 export const text = () => ({
     stopSequences: [],
-    format: (instruction) => instruction,
+    format: (prompt) => prompt,
 });
 /**
  * Formats an instruction prompt as a basic text prompt.
  */
 export const instruction = () => ({
     stopSequences: [],
-    format: (instruction) => {
+    format(prompt) {
         let text = "";
-        if (instruction.system != null) {
-            text += `${instruction.system}\n\n`;
+        if (prompt.system != null) {
+            text += `${prompt.system}\n\n`;
         }
-        text += instruction.instruction;
+        text += prompt.instruction;
         return text;
     },
 });
@@ -28,12 +28,12 @@ export const instruction = () => ({
  * @param system The label of the system in the chat. Optional, defaults to no prefix.
  */
 export const chat = ({ user = "user", assistant = "assistant", system, } = {}) => ({
-    format: (chatPrompt) => {
-        validateChatPrompt(chatPrompt);
-        let text = chatPrompt.system != null
-            ? `${system != null ? `${system}:` : ""}${chatPrompt.system}\n\n`
+    format(prompt) {
+        validateChatPrompt(prompt);
+        let text = prompt.system != null
+            ? `${system != null ? `${system}:` : ""}${prompt.system}\n\n`
             : "";
-        for (const { role, content } of chatPrompt.messages) {
+        for (const { role, content } of prompt.messages) {
             switch (role) {
                 case "user": {
                     text += `${user}:\n${content}\n\n`;

package/model-function/generate-text/prompt-format/VicunaPromptFormat.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = void 0;
-const validateChatPrompt_js_1 = require("./validateChatPrompt.cjs");
+const ChatPrompt_js_1 = require("./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.";
@@ -20,12 +20,12 @@ const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial
  */
 function chat() {
     return {
-        format: (chatPrompt) => {
-            (0, validateChatPrompt_js_1.validateChatPrompt)(chatPrompt);
-            let text = chatPrompt.system != null
-                ? `${chatPrompt.system}\n\n`
+        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 chatPrompt.messages) {
+            for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
                         text += `USER: ${content}\n`;

package/model-function/generate-text/prompt-format/VicunaPromptFormat.d.ts

@@ -1,5 +1,5 @@
-import { ChatPrompt } from "./ChatPrompt.js";
 import { TextGenerationPromptFormat } from "../TextGenerationPromptFormat.js";
+import { ChatPrompt } from "./ChatPrompt.js";
 /**
  * Formats a chat prompt as a Vicuna prompt.
  *

package/model-function/generate-text/prompt-format/VicunaPromptFormat.js

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "./validateChatPrompt.js";
+import { validateChatPrompt } from "./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.";
@@ -17,12 +17,12 @@ const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial
  */
 export function chat() {
     return {
-        format: (chatPrompt) => {
-            validateChatPrompt(chatPrompt);
-            let text = chatPrompt.system != null
-                ? `${chatPrompt.system}\n\n`
+        format(prompt) {
+            validateChatPrompt(prompt);
+            let text = prompt.system != null
+                ? `${prompt.system}\n\n`
                 : `${DEFAULT_SYSTEM_MESSAGE}\n\n`;
-            for (const { role, content } of chatPrompt.messages) {
+            for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
                         text += `USER: ${content}\n`;

package/model-function/generate-text/prompt-format/index.cjs

@@ -30,10 +30,10 @@ exports.VicunaPromptFormat = exports.TextPromptFormat = exports.Llama2PromptForm
 exports.AlpacaPromptFormat = __importStar(require("./AlpacaPromptFormat.cjs"));
 exports.ChatMLPromptFormat = __importStar(require("./ChatMLPromptFormat.cjs"));
 __exportStar(require("./ChatPrompt.cjs"), exports);
-__exportStar(require("./ChatPromptValidationError.cjs"), exports);
+__exportStar(require("./Content.cjs"), exports);
 __exportStar(require("./InstructionPrompt.cjs"), exports);
 exports.Llama2PromptFormat = __importStar(require("./Llama2PromptFormat.cjs"));
+__exportStar(require("./InvalidPromptError.cjs"), exports);
 exports.TextPromptFormat = __importStar(require("./TextPromptFormat.cjs"));
 exports.VicunaPromptFormat = __importStar(require("./VicunaPromptFormat.cjs"));
 __exportStar(require("./trimChatPrompt.cjs"), exports);
-__exportStar(require("./validateChatPrompt.cjs"), exports);

package/model-function/generate-text/prompt-format/index.d.ts

@@ -1,10 +1,10 @@
 export * as AlpacaPromptFormat from "./AlpacaPromptFormat.js";
 export * as ChatMLPromptFormat from "./ChatMLPromptFormat.js";
 export * from "./ChatPrompt.js";
-export * from "./ChatPromptValidationError.js";
+export * from "./Content.js";
 export * from "./InstructionPrompt.js";
 export * as Llama2PromptFormat from "./Llama2PromptFormat.js";
+export * from "./InvalidPromptError.js";
 export * as TextPromptFormat from "./TextPromptFormat.js";
 export * as VicunaPromptFormat from "./VicunaPromptFormat.js";
 export * from "./trimChatPrompt.js";
-export * from "./validateChatPrompt.js";

package/model-function/generate-text/prompt-format/index.js

@@ -1,10 +1,10 @@
 export * as AlpacaPromptFormat from "./AlpacaPromptFormat.js";
 export * as ChatMLPromptFormat from "./ChatMLPromptFormat.js";
 export * from "./ChatPrompt.js";
-export * from "./ChatPromptValidationError.js";
+export * from "./Content.js";
 export * from "./InstructionPrompt.js";
 export * as Llama2PromptFormat from "./Llama2PromptFormat.js";
+export * from "./InvalidPromptError.js";
 export * as TextPromptFormat from "./TextPromptFormat.js";
 export * as VicunaPromptFormat from "./VicunaPromptFormat.js";
 export * from "./trimChatPrompt.js";
-export * from "./validateChatPrompt.js";

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trimChatPrompt = void 0;
-const validateChatPrompt_js_1 = require("./validateChatPrompt.cjs");
+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 +14,7 @@ const validateChatPrompt_js_1 = require("./validateChatPrompt.cjs");
  */
 async function trimChatPrompt({ prompt, model, tokenLimit = model.contextWindowSize -
     (model.settings.maxCompletionTokens ?? model.contextWindowSize / 4), }) {
-    (0, validateChatPrompt_js_1.validateChatPrompt)(prompt);
+    (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-format/trimChatPrompt.d.ts

@@ -1,5 +1,5 @@
-import { ChatPrompt } from "./ChatPrompt.js";
 import { HasContextWindowSize, HasTokenizer, TextGenerationModel, TextGenerationModelSettings } from "../TextGenerationModel.js";
+import { ChatPrompt } from "./ChatPrompt.js";
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *

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

@@ -1,4 +1,4 @@
-import { validateChatPrompt } from "./validateChatPrompt.js";
+import { validateChatPrompt } from "./ChatPrompt.js";
 /**
  * Keeps only the most recent messages in the prompt, while leaving enough space for the completion.
  *

package/model-provider/anthropic/AnthropicPromptFormat.cjs

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const validateChatPrompt_js_1 = require("../../model-function/generate-text/prompt-format/validateChatPrompt.cjs");
+const ChatPrompt_js_1 = require("../../model-function/generate-text/prompt-format/ChatPrompt.cjs");
 /**
  * Formats a text prompt as an Anthropic prompt.
  */
 function text() {
     return {
-        format: (instruction) => {
+        format(prompt) {
             let text = "";
             text += "\n\nHuman:";
-            text += instruction;
+            text += prompt;
             text += "\n\nAssistant:";
             return text;
         },
@@ -23,10 +23,10 @@ exports.text = text;
  */
 function instruction() {
     return {
-        format: (instruction) => {
-            let text = instruction.system ?? "";
+        format(prompt) {
+            let text = prompt.system ?? "";
             text += "\n\nHuman:";
-            text += instruction.instruction;
+            text += prompt.instruction;
             text += "\n\nAssistant:";
             return text;
         },
@@ -41,10 +41,10 @@ exports.instruction = instruction;
  */
 function chat() {
     return {
-        format: (chatPrompt) => {
-            (0, validateChatPrompt_js_1.validateChatPrompt)(chatPrompt);
-            let text = chatPrompt.system ?? "";
-            for (const { role, content } of chatPrompt.messages) {
+        format(prompt) {
+            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
+            let text = prompt.system ?? "";
+            for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
                         text += `\n\nHuman:${content}`;

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

@@ -1,6 +1,6 @@
-import { ChatPrompt } from "../../model-function/generate-text/prompt-format/ChatPrompt.js";
-import { InstructionPrompt } from "../../model-function/generate-text/prompt-format/InstructionPrompt.js";
 import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
+import { ChatPrompt } from "../../model-function/generate-text/prompt-format/ChatPrompt.js";
+import { TextInstructionPrompt } from "../../model-function/generate-text/prompt-format/InstructionPrompt.js";
 /**
  * Formats a text prompt as an Anthropic prompt.
  */
@@ -8,7 +8,7 @@ export declare function text(): TextGenerationPromptFormat<string, string>;
 /**
  * Formats an instruction prompt as an Anthropic prompt.
  */
-export declare function instruction(): TextGenerationPromptFormat<InstructionPrompt, string>;
+export declare function instruction(): TextGenerationPromptFormat<TextInstructionPrompt, string>;
 /**
  * Formats a chat prompt as an Anthropic prompt.
  *

package/model-provider/anthropic/AnthropicPromptFormat.js

@@ -1,13 +1,13 @@
-import { validateChatPrompt } from "../../model-function/generate-text/prompt-format/validateChatPrompt.js";
+import { validateChatPrompt, } from "../../model-function/generate-text/prompt-format/ChatPrompt.js";
 /**
  * Formats a text prompt as an Anthropic prompt.
  */
 export function text() {
     return {
-        format: (instruction) => {
+        format(prompt) {
             let text = "";
             text += "\n\nHuman:";
-            text += instruction;
+            text += prompt;
             text += "\n\nAssistant:";
             return text;
         },
@@ -19,10 +19,10 @@ export function text() {
  */
 export function instruction() {
     return {
-        format: (instruction) => {
-            let text = instruction.system ?? "";
+        format(prompt) {
+            let text = prompt.system ?? "";
             text += "\n\nHuman:";
-            text += instruction.instruction;
+            text += prompt.instruction;
             text += "\n\nAssistant:";
             return text;
         },
@@ -36,10 +36,10 @@ export function instruction() {
  */
 export function chat() {
     return {
-        format: (chatPrompt) => {
-            validateChatPrompt(chatPrompt);
-            let text = chatPrompt.system ?? "";
-            for (const { role, content } of chatPrompt.messages) {
+        format(prompt) {
+            validateChatPrompt(prompt);
+            let text = prompt.system ?? "";
+            for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
                         text += `\n\nHuman:${content}`;

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

@@ -65,7 +65,7 @@ export declare class AnthropicTextGenerationModel extends AbstractModel<Anthropi
     /**
      * Returns this model with an instruction prompt format.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").InstructionPrompt, string, AnthropicTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, AnthropicTextGenerationModelSettings, this>;
     /**
      * Returns this model with a chat prompt format.
      */

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

@@ -87,7 +87,7 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
     /**
      * Returns this model with an instruction prompt format.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").InstructionPrompt, string, CohereTextGenerationModelSettings, this>;
+    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, CohereTextGenerationModelSettings, this>;
     /**
      * Returns this model with a chat prompt format.
      */

package/model-provider/llamacpp/LlamaCppBakLLaVA1Format.cjs

@@ -11,21 +11,30 @@ const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial
  */
 function instruction() {
     return {
-        format: (instruction) => {
+        format(prompt) {
             let text = "";
-            text += `${instruction.system ?? DEFAULT_SYSTEM_MESSAGE}\n\n`;
+            text += `${prompt.system ?? DEFAULT_SYSTEM_MESSAGE}\n\n`;
             text += `USER: `;
-            if (instruction.image != null) {
-                text += `[img-1]\n`;
+            // 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;
+                    }
+                }
+                text += `${content}\n`;
             }
-            text += `${instruction.instruction}\n`;
             text += `ASSISTANT: `;
-            return {
-                text,
-                images: instruction.image != null
-                    ? { "1": instruction.image.base64Content }
-                    : undefined,
-            };
+            return { text, images };
         },
         stopSequences: [`\nUSER:`],
     };

package/model-provider/llamacpp/LlamaCppBakLLaVA1Format.js

@@ -8,21 +8,30 @@ const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial
  */
 export function instruction() {
     return {
-        format: (instruction) => {
+        format(prompt) {
             let text = "";
-            text += `${instruction.system ?? DEFAULT_SYSTEM_MESSAGE}\n\n`;
+            text += `${prompt.system ?? DEFAULT_SYSTEM_MESSAGE}\n\n`;
             text += `USER: `;
-            if (instruction.image != null) {
-                text += `[img-1]\n`;
+            // 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;
+                    }
+                }
+                text += `${content}\n`;
             }
-            text += `${instruction.instruction}\n`;
             text += `ASSISTANT: `;
-            return {
-                text,
-                images: instruction.image != null
-                    ? { "1": instruction.image.base64Content }
-                    : undefined,
-            };
+            return { text, images };
         },
         stopSequences: [`\nUSER:`],
     };

package/model-provider/openai/OpenAICompletionModel.d.ts

@@ -176,7 +176,7 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
     /**
      * Returns this model with an instruction prompt format.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").InstructionPrompt, string, OpenAICompletionModelSettings, this>;
+    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, OpenAICompletionModelSettings, this>;
     /**
      * Returns this model with a chat prompt format.
      */

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

@@ -6,20 +6,25 @@ exports.OpenAIChatMessage = {
         return { role: "system", content };
     },
     user(content, options) {
-        if (options?.image != null) {
-            return {
-                role: "user",
-                content: [
-                    { type: "text", text: content },
-                    {
-                        type: "image_url",
-                        image_url: `data:${options.image.mimeType ?? "image/jpeg"};base64,${options.image.base64Content}`,
-                    },
-                ],
-                name: options.name,
-            };
-        }
-        return { role: "user", content, name: options?.name };
+        return {
+            role: "user",
+            content: typeof content === "string"
+                ? content
+                : content.map((element) => {
+                    switch (element.type) {
+                        case "text": {
+                            return { type: "text", text: element.text };
+                        }
+                        case "image": {
+                            return {
+                                type: "image_url",
+                                image_url: `data:${element.mimeType ?? "image/jpeg"};base64,${element.base64Image}`,
+                            };
+                        }
+                    }
+                }),
+            name: options?.name,
+        };
     },
     /**
      * Creates an assistant chat message. The assistant message can optionally contain tool calls.

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

@@ -1,3 +1,4 @@
+import { MultiModalInput } from "../../../model-function/generate-text/prompt-format/Content.js";
 import { ToolCall } from "../../../tool/ToolCall.js";
 export type OpenAIChatMessage = {
     role: "system";
@@ -43,12 +44,8 @@ export type OpenAIChatMessage = {
 };
 export declare const OpenAIChatMessage: {
     system(content: string): OpenAIChatMessage;
-    user(content: string, options?: {
+    user(content: string | MultiModalInput, options?: {
         name?: string;
-        image?: {
-            base64Content: string;
-            mimeType?: string;
-        };
     }): OpenAIChatMessage;
     /**
      * Creates an assistant chat message. The assistant message can optionally contain tool calls.

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

@@ -3,20 +3,25 @@ export const OpenAIChatMessage = {
         return { role: "system", content };
     },
     user(content, options) {
-        if (options?.image != null) {
-            return {
-                role: "user",
-                content: [
-                    { type: "text", text: content },
-                    {
-                        type: "image_url",
-                        image_url: `data:${options.image.mimeType ?? "image/jpeg"};base64,${options.image.base64Content}`,
-                    },
-                ],
-                name: options.name,
-            };
-        }
-        return { role: "user", content, name: options?.name };
+        return {
+            role: "user",
+            content: typeof content === "string"
+                ? content
+                : content.map((element) => {
+                    switch (element.type) {
+                        case "text": {
+                            return { type: "text", text: element.text };
+                        }
+                        case "image": {
+                            return {
+                                type: "image_url",
+                                image_url: `data:${element.mimeType ?? "image/jpeg"};base64,${element.base64Image}`,
+                            };
+                        }
+                    }
+                }),
+            name: options?.name,
+        };
     },
     /**
      * Creates an assistant chat message. The assistant message can optionally contain tool calls.

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

@@ -382,7 +382,7 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
     /**
      * Returns this model with an instruction prompt format.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../../index.js").InstructionPrompt, OpenAIChatMessage[], OpenAIChatSettings, this>;
+    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../../index.js").InstructionPrompt | import("../../../index.js").TextInstructionPrompt, OpenAIChatMessage[], OpenAIChatSettings, this>;
     /**
      * Returns this model with a chat prompt format.
      */

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chat = exports.instruction = exports.text = void 0;
-const validateChatPrompt_js_1 = require("../../../model-function/generate-text/prompt-format/validateChatPrompt.cjs");
+const ChatPrompt_js_1 = require("../../../model-function/generate-text/prompt-format/ChatPrompt.cjs");
 const OpenAIChatMessage_js_1 = require("./OpenAIChatMessage.cjs");
 /**
  * Formats a text prompt as an OpenAI chat prompt.
  */
 function text() {
     return {
-        format: (instruction) => [OpenAIChatMessage_js_1.OpenAIChatMessage.user(instruction)],
+        format: (prompt) => [OpenAIChatMessage_js_1.OpenAIChatMessage.user(prompt)],
         stopSequences: [],
     };
 }
@@ -18,14 +18,12 @@ exports.text = text;
  */
 function instruction() {
     return {
-        format: (instruction) => {
+        format(prompt) {
             const messages = [];
-            if (instruction.system != null) {
-                messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.system(instruction.system));
+            if (prompt.system != null) {
+                messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.system(prompt.system));
             }
-            messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.user(instruction.instruction, {
-                image: instruction.image,
-            }));
+            messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.user(prompt.instruction));
             return messages;
         },
         stopSequences: [],
@@ -37,13 +35,13 @@ exports.instruction = instruction;
  */
 function chat() {
     return {
-        format: (chatPrompt) => {
-            (0, validateChatPrompt_js_1.validateChatPrompt)(chatPrompt);
+        format(prompt) {
+            (0, ChatPrompt_js_1.validateChatPrompt)(prompt);
             const messages = [];
-            if (chatPrompt.system != null) {
-                messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.system(chatPrompt.system));
+            if (prompt.system != null) {
+                messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.system(prompt.system));
             }
-            for (const { role, content } of chatPrompt.messages) {
+            for (const { role, content } of prompt.messages) {
                 switch (role) {
                     case "user": {
                         messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.user(content));

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

@@ -1,6 +1,6 @@
 import { TextGenerationPromptFormat } from "../../../model-function/generate-text/TextGenerationPromptFormat.js";
 import { ChatPrompt } from "../../../model-function/generate-text/prompt-format/ChatPrompt.js";
-import { InstructionPrompt } from "../../../model-function/generate-text/prompt-format/InstructionPrompt.js";
+import { InstructionPrompt, TextInstructionPrompt } from "../../../model-function/generate-text/prompt-format/InstructionPrompt.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 /**
  * Formats a text prompt as an OpenAI chat prompt.
@@ -9,7 +9,7 @@ export declare function text(): TextGenerationPromptFormat<string, Array<OpenAIC
 /**
  * Formats an instruction prompt as an OpenAI chat prompt.
  */
-export declare function instruction(): TextGenerationPromptFormat<InstructionPrompt, Array<OpenAIChatMessage>>;
+export declare function instruction(): TextGenerationPromptFormat<InstructionPrompt | TextInstructionPrompt, Array<OpenAIChatMessage>>;
 /**
  * Formats a chat prompt as an OpenAI chat prompt.
  */