modelfusion 0.79.0 → 0.80.0

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

@@ -1,11 +1,11 @@
-import { validateChatPrompt } from "../../../model-function/generate-text/prompt-format/validateChatPrompt.js";
+import { validateChatPrompt } from "../../../model-function/generate-text/prompt-format/ChatPrompt.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 /**
  * Formats a text prompt as an OpenAI chat prompt.
  */
 export function text() {
     return {
-        format: (instruction) => [OpenAIChatMessage.user(instruction)],
+        format: (prompt) => [OpenAIChatMessage.user(prompt)],
         stopSequences: [],
     };
 }
@@ -14,14 +14,12 @@ export function text() {
  */
 export function instruction() {
     return {
-        format: (instruction) => {
+        format(prompt) {
             const messages = [];
-            if (instruction.system != null) {
-                messages.push(OpenAIChatMessage.system(instruction.system));
+            if (prompt.system != null) {
+                messages.push(OpenAIChatMessage.system(prompt.system));
             }
-            messages.push(OpenAIChatMessage.user(instruction.instruction, {
-                image: instruction.image,
-            }));
+            messages.push(OpenAIChatMessage.user(prompt.instruction));
             return messages;
         },
         stopSequences: [],
@@ -32,13 +30,13 @@ export function instruction() {
  */
 export function chat() {
     return {
-        format: (chatPrompt) => {
-            validateChatPrompt(chatPrompt);
+        format(prompt) {
+            validateChatPrompt(prompt);
             const messages = [];
-            if (chatPrompt.system != null) {
-                messages.push(OpenAIChatMessage.system(chatPrompt.system));
+            if (prompt.system != null) {
+                messages.push(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.user(content));

package/package.json

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

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

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChatPromptValidationError = void 0;
-class ChatPromptValidationError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = "ChatPromptValidationError";
-    }
-    toJSON() {
-        return {
-            name: this.name,
-            message: this.message,
-            stack: this.stack,
-        };
-    }
-}
-exports.ChatPromptValidationError = ChatPromptValidationError;

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

@@ -1,8 +0,0 @@
-export declare class ChatPromptValidationError extends Error {
-    constructor(message: string);
-    toJSON(): {
-        name: string;
-        message: string;
-        stack: string | undefined;
-    };
-}

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

@@ -1,13 +0,0 @@
-export class ChatPromptValidationError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = "ChatPromptValidationError";
-    }
-    toJSON() {
-        return {
-            name: this.name,
-            message: this.message,
-            stack: this.stack,
-        };
-    }
-}

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

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateChatPrompt = void 0;
-const ChatPromptValidationError_js_1 = require("./ChatPromptValidationError.cjs");
-/**
- * Checks if a chat prompt is valid. Throws a `ChatPromptValidationError` if it's not.
- */
-function validateChatPrompt(chatPrompt) {
-    const messages = chatPrompt.messages;
-    if (messages.length < 1) {
-        throw new ChatPromptValidationError_js_1.ChatPromptValidationError("ChatPrompt should have at least one message.");
-    }
-    for (let i = 0; i < messages.length; i++) {
-        const expectedRole = i % 2 === 0 ? "user" : "assistant";
-        const role = messages[i].role;
-        if (role !== expectedRole) {
-            throw new ChatPromptValidationError_js_1.ChatPromptValidationError(`Message at index ${i} should have role '${expectedRole}', but has role '${role}'.`);
-        }
-    }
-    if (messages.length % 2 === 0) {
-        throw new ChatPromptValidationError_js_1.ChatPromptValidationError("The last message must be a user message.");
-    }
-}
-exports.validateChatPrompt = validateChatPrompt;

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

@@ -1,5 +0,0 @@
-import { ChatPrompt } from "./ChatPrompt.js";
-/**
- * Checks if a chat prompt is valid. Throws a `ChatPromptValidationError` if it's not.
- */
-export declare function validateChatPrompt(chatPrompt: ChatPrompt): void;

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

@@ -1,20 +0,0 @@
-import { ChatPromptValidationError } from "./ChatPromptValidationError.js";
-/**
- * Checks if a chat prompt is valid. Throws a `ChatPromptValidationError` if it's not.
- */
-export function validateChatPrompt(chatPrompt) {
-    const messages = chatPrompt.messages;
-    if (messages.length < 1) {
-        throw new ChatPromptValidationError("ChatPrompt should have at least one message.");
-    }
-    for (let i = 0; i < messages.length; i++) {
-        const expectedRole = i % 2 === 0 ? "user" : "assistant";
-        const role = messages[i].role;
-        if (role !== expectedRole) {
-            throw new ChatPromptValidationError(`Message at index ${i} should have role '${expectedRole}', but has role '${role}'.`);
-        }
-    }
-    if (messages.length % 2 === 0) {
-        throw new ChatPromptValidationError("The last message must be a user message.");
-    }
-}