modelfusion 0.79.0 → 0.81.0

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

@@ -1,11 +1,17 @@
-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";
+/**
+ * OpenAIMessage[] identity chat format.
+ */
+export function identity() {
+    return { format: (prompt) => prompt, stopSequences: [] };
+}
 /**
  * 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 +20,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 +36,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.81.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/tool/generate-tool-calls-or-text/generateToolCallsOrText.d.ts

@@ -14,13 +14,13 @@ type ToToolCallUnion<T> = {
     } : never;
 }[keyof T];
 type ToOutputValue<TOOL_CALLS extends ToolCallDefinitionArray<ToolDefinition<any, any>[]>> = ToToolCallUnion<ToToolCallDefinitionMap<TOOL_CALLS>>;
-export declare function generateToolCallsOrText<TOOLS extends Array<ToolDefinition<any, any>>, PROMPT>(model: ToolCallsOrTextGenerationModel<PROMPT, ToolCallsOrTextGenerationModelSettings>, tools: TOOLS, prompt: PROMPT | ((structureDefinitions: TOOLS) => PROMPT), options?: FunctionOptions & {
+export declare function generateToolCallsOrText<TOOLS extends Array<ToolDefinition<any, any>>, PROMPT>(model: ToolCallsOrTextGenerationModel<PROMPT, ToolCallsOrTextGenerationModelSettings>, tools: TOOLS, prompt: PROMPT | ((tools: TOOLS) => PROMPT), options?: FunctionOptions & {
     returnType?: "structure";
 }): Promise<{
     text: string | null;
     toolCalls: Array<ToOutputValue<TOOLS>> | null;
 }>;
-export declare function generateToolCallsOrText<TOOLS extends ToolDefinition<any, any>[], PROMPT>(model: ToolCallsOrTextGenerationModel<PROMPT, ToolCallsOrTextGenerationModelSettings>, tools: TOOLS, prompt: PROMPT | ((structureDefinitions: TOOLS) => PROMPT), options: FunctionOptions & {
+export declare function generateToolCallsOrText<TOOLS extends ToolDefinition<any, any>[], PROMPT>(model: ToolCallsOrTextGenerationModel<PROMPT, ToolCallsOrTextGenerationModelSettings>, tools: TOOLS, prompt: PROMPT | ((tools: TOOLS) => PROMPT), options: FunctionOptions & {
     returnType?: "full";
 }): Promise<{
     value: {

package/core/schema/StructureDefinition.d.ts

@@ -1,7 +0,0 @@
-import { JsonSchemaProducer } from "./JsonSchemaProducer.js";
-import { Schema } from "./Schema.js";
-export interface StructureDefinition<NAME extends string, STRUCTURE> {
-    name: NAME;
-    description?: string;
-    schema: Schema<STRUCTURE> & JsonSchemaProducer;
-}

package/core/schema/UncheckedStructureDefinition.cjs

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UncheckedStructureDefinition = void 0;
-const UncheckedSchema_js_1 = require("./UncheckedSchema.cjs");
-class UncheckedStructureDefinition {
-    constructor({ name, description, jsonSchema, }) {
-        Object.defineProperty(this, "name", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "description", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "schema", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.name = name;
-        this.description = description;
-        this.schema = new UncheckedSchema_js_1.UncheckedSchema(jsonSchema);
-    }
-}
-exports.UncheckedStructureDefinition = UncheckedStructureDefinition;

package/core/schema/UncheckedStructureDefinition.d.ts

@@ -1,12 +0,0 @@
-import { StructureDefinition } from "./StructureDefinition.js";
-import { UncheckedSchema } from "./UncheckedSchema.js";
-export declare class UncheckedStructureDefinition<NAME extends string, STRUCTURE> implements StructureDefinition<NAME, STRUCTURE> {
-    name: NAME;
-    description?: string;
-    schema: UncheckedSchema<STRUCTURE>;
-    constructor({ name, description, jsonSchema, }: {
-        name: NAME;
-        description?: string;
-        jsonSchema: unknown;
-    });
-}

package/core/schema/UncheckedStructureDefinition.js

@@ -1,26 +0,0 @@
-import { UncheckedSchema } from "./UncheckedSchema.js";
-export class UncheckedStructureDefinition {
-    constructor({ name, description, jsonSchema, }) {
-        Object.defineProperty(this, "name", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "description", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "schema", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.name = name;
-        this.description = description;
-        this.schema = new UncheckedSchema(jsonSchema);
-    }
-}

package/core/schema/ZodStructureDefinition.cjs

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZodStructureDefinition = void 0;
-const ZodSchema_js_1 = require("./ZodSchema.cjs");
-class ZodStructureDefinition {
-    constructor({ name, description, schema, }) {
-        Object.defineProperty(this, "name", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "description", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "schema", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.name = name;
-        this.description = description;
-        this.schema = schema instanceof ZodSchema_js_1.ZodSchema ? schema : new ZodSchema_js_1.ZodSchema(schema);
-    }
-}
-exports.ZodStructureDefinition = ZodStructureDefinition;

package/core/schema/ZodStructureDefinition.d.ts

@@ -1,13 +0,0 @@
-import { z } from "zod";
-import { StructureDefinition } from "./StructureDefinition.js";
-import { ZodSchema } from "./ZodSchema.js";
-export declare class ZodStructureDefinition<NAME extends string, STRUCTURE> implements StructureDefinition<NAME, STRUCTURE> {
-    name: NAME;
-    description?: string;
-    schema: ZodSchema<STRUCTURE>;
-    constructor({ name, description, schema, }: {
-        name: NAME;
-        description?: string;
-        schema: z.Schema<STRUCTURE> | ZodSchema<STRUCTURE>;
-    });
-}

package/core/schema/ZodStructureDefinition.js

@@ -1,26 +0,0 @@
-import { ZodSchema } from "./ZodSchema.js";
-export class ZodStructureDefinition {
-    constructor({ name, description, schema, }) {
-        Object.defineProperty(this, "name", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "description", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "schema", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.name = name;
-        this.description = description;
-        this.schema = schema instanceof ZodSchema ? schema : new ZodSchema(schema);
-    }
-}

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.");
-    }
-}