modelfusion 0.103.0 → 0.104.0

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/openai/OpenAICompletionModel.d.ts

@@ -178,14 +178,14 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
     /**
      * 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/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.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/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.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/stability/StabilityImageGenerationModel.d.ts

@@ -78,7 +78,7 @@ export declare class StabilityImageGenerationModel extends AbstractModel<Stabili
     }>;
     withTextPrompt(): PromptTemplateImageGenerationModel<string, StabilityImageGenerationPrompt, StabilityImageGenerationSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, StabilityImageGenerationPrompt>): PromptTemplateImageGenerationModel<INPUT_PROMPT, StabilityImageGenerationPrompt, StabilityImageGenerationSettings, this>;
-    withSettings(additionalSettings: StabilityImageGenerationSettings): this;
+    withSettings(additionalSettings: Partial<StabilityImageGenerationSettings>): this;
 }
 declare const stabilityImageGenerationResponseSchema: z.ZodObject<{
     artifacts: z.ZodArray<z.ZodObject<{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.103.0",
+  "version": "0.104.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [