modelfusion 0.69.0 → 0.70.0

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

@@ -200,8 +200,8 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
             id: string;
             choices: {
                 message: {
-                    content: string | null;
                     role: "assistant";
+                    content: string | null;
                     function_call?: {
                         name: string;
                         arguments: string;
@@ -249,8 +249,8 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
             id: string;
             choices: {
                 message: {
-                    content: string | null;
                     role: "assistant";
+                    content: string | null;
                     function_call?: {
                         name: string;
                         arguments: string;
@@ -292,8 +292,8 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
             id: string;
             choices: {
                 message: {
-                    content: string | null;
                     role: "assistant";
+                    content: string | null;
                     function_call?: {
                         name: string;
                         arguments: string;
@@ -337,8 +337,8 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
             id: string;
             choices: {
                 message: {
-                    content: string | null;
                     role: "assistant";
+                    content: string | null;
                     function_call?: {
                         name: string;
                         arguments: string;
@@ -383,8 +383,8 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
             id: string;
             choices: {
                 message: {
-                    content: string | null;
                     role: "assistant";
+                    content: string | null;
                     function_call?: {
                         name: string;
                         arguments: string;
@@ -476,8 +476,8 @@ declare const openAIChatResponseSchema: z.ZodObject<{
                 id: string;
             }>, "many">>;
         }, "strip", z.ZodTypeAny, {
-            content: string | null;
             role: "assistant";
+            content: string | null;
             function_call?: {
                 name: string;
                 arguments: string;
@@ -491,8 +491,8 @@ declare const openAIChatResponseSchema: z.ZodObject<{
                 id: string;
             }[] | undefined;
         }, {
-            content: string | null;
             role: "assistant";
+            content: string | null;
             function_call?: {
                 name: string;
                 arguments: string;
@@ -511,8 +511,8 @@ declare const openAIChatResponseSchema: z.ZodObject<{
         finish_reason: z.ZodNullable<z.ZodOptional<z.ZodEnum<["stop", "length", "tool_calls", "content_filter", "function_call"]>>>;
     }, "strip", z.ZodTypeAny, {
         message: {
-            content: string | null;
             role: "assistant";
+            content: string | null;
             function_call?: {
                 name: string;
                 arguments: string;
@@ -531,8 +531,8 @@ declare const openAIChatResponseSchema: z.ZodObject<{
         finish_reason?: "length" | "stop" | "function_call" | "tool_calls" | "content_filter" | null | undefined;
     }, {
         message: {
-            content: string | null;
             role: "assistant";
+            content: string | null;
             function_call?: {
                 name: string;
                 arguments: string;
@@ -578,8 +578,8 @@ declare const openAIChatResponseSchema: z.ZodObject<{
     id: string;
     choices: {
         message: {
-            content: string | null;
             role: "assistant";
+            content: string | null;
             function_call?: {
                 name: string;
                 arguments: string;
@@ -610,8 +610,8 @@ declare const openAIChatResponseSchema: z.ZodObject<{
     id: string;
     choices: {
         message: {
-            content: string | null;
             role: "assistant";
+            content: string | null;
             function_call?: {
                 name: string;
                 arguments: string;
@@ -654,8 +654,8 @@ export declare const OpenAIChatResponseFormat: {
             id: string;
             choices: {
                 message: {
-                    content: string | null;
                     role: "assistant";
+                    content: string | null;
                     function_call?: {
                         name: string;
                         arguments: string;

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

@@ -10,7 +10,7 @@ import { PromptFormatTextStreamingModel } from "../../../model-function/generate
 import { OpenAIApiConfiguration } from "../OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "../OpenAIError.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";
-import { mapChatPromptToOpenAIChatFormat, mapInstructionPromptToOpenAIChatFormat, } from "./OpenAIChatPromptFormat.js";
+import { chat, instruction } from "./OpenAIChatPromptFormat.js";
 import { createOpenAIChatDeltaIterableQueue } from "./OpenAIChatStreamIterable.js";
 import { countOpenAIChatPromptTokens } from "./countOpenAIChatMessageTokens.js";
 /*
@@ -394,13 +394,13 @@ export class OpenAIChatModel extends AbstractModel {
      * Returns this model with an instruction prompt format.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat(mapInstructionPromptToOpenAIChatFormat());
+        return this.withPromptFormat(instruction());
     }
     /**
      * Returns this model with a chat prompt format.
      */
     withChatPrompt() {
-        return this.withPromptFormat(mapChatPromptToOpenAIChatFormat());
+        return this.withPromptFormat(chat());
     }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextStreamingModel({

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapChatPromptToOpenAIChatFormat = exports.mapInstructionPromptToOpenAIChatFormat = void 0;
+exports.chat = exports.instruction = void 0;
 const validateChatPrompt_js_1 = require("../../../model-function/generate-text/prompt-format/validateChatPrompt.cjs");
 const OpenAIChatMessage_js_1 = require("./OpenAIChatMessage.cjs");
 /**
  * Formats an instruction prompt as an OpenAI chat prompt.
  */
-function mapInstructionPromptToOpenAIChatFormat() {
+function instruction() {
     return {
         format: (instruction) => {
             const messages = [];
@@ -24,49 +24,37 @@ function mapInstructionPromptToOpenAIChatFormat() {
         stopSequences: [],
     };
 }
-exports.mapInstructionPromptToOpenAIChatFormat = mapInstructionPromptToOpenAIChatFormat;
+exports.instruction = instruction;
 /**
  * Formats a chat prompt as an OpenAI chat prompt.
  */
-function mapChatPromptToOpenAIChatFormat() {
+function chat() {
     return {
         format: (chatPrompt) => {
             (0, validateChatPrompt_js_1.validateChatPrompt)(chatPrompt);
             const messages = [];
-            for (let i = 0; i < chatPrompt.length; i++) {
-                const message = chatPrompt[i];
-                // system message:
-                if (i === 0 &&
-                    "system" in message &&
-                    typeof message.system === "string") {
-                    messages.push({
-                        role: "system",
-                        content: message.system,
-                    });
-                    continue;
-                }
-                // user message
-                if ("user" in message) {
-                    messages.push({
-                        role: "user",
-                        content: message.user,
-                    });
-                    continue;
-                }
-                // ai message:
-                if ("ai" in message) {
-                    messages.push({
-                        role: "assistant",
-                        content: message.ai,
-                    });
-                    continue;
+            if (chatPrompt.system != null) {
+                messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.system(chatPrompt.system));
+            }
+            for (const { role, content } of chatPrompt.messages) {
+                switch (role) {
+                    case "user": {
+                        messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.user(content));
+                        break;
+                    }
+                    case "assistant": {
+                        messages.push(OpenAIChatMessage_js_1.OpenAIChatMessage.assistant(content));
+                        break;
+                    }
+                    default: {
+                        const _exhaustiveCheck = role;
+                        throw new Error(`Unsupported role: ${_exhaustiveCheck}`);
+                    }
                 }
-                // unsupported message:
-                throw new Error(`Unsupported message: ${JSON.stringify(message)}`);
             }
             return messages;
         },
         stopSequences: [],
     };
 }
-exports.mapChatPromptToOpenAIChatFormat = mapChatPromptToOpenAIChatFormat;
+exports.chat = chat;

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

@@ -5,8 +5,8 @@ import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 /**
  * Formats an instruction prompt as an OpenAI chat prompt.
  */
-export declare function mapInstructionPromptToOpenAIChatFormat(): TextGenerationPromptFormat<InstructionPrompt, Array<OpenAIChatMessage>>;
+export declare function instruction(): TextGenerationPromptFormat<InstructionPrompt, Array<OpenAIChatMessage>>;
 /**
  * Formats a chat prompt as an OpenAI chat prompt.
  */
-export declare function mapChatPromptToOpenAIChatFormat(): TextGenerationPromptFormat<ChatPrompt, Array<OpenAIChatMessage>>;
+export declare function chat(): TextGenerationPromptFormat<ChatPrompt, Array<OpenAIChatMessage>>;

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

@@ -3,7 +3,7 @@ import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 /**
  * Formats an instruction prompt as an OpenAI chat prompt.
  */
-export function mapInstructionPromptToOpenAIChatFormat() {
+export function instruction() {
     return {
         format: (instruction) => {
             const messages = [];
@@ -24,41 +24,29 @@ export function mapInstructionPromptToOpenAIChatFormat() {
 /**
  * Formats a chat prompt as an OpenAI chat prompt.
  */
-export function mapChatPromptToOpenAIChatFormat() {
+export function chat() {
     return {
         format: (chatPrompt) => {
             validateChatPrompt(chatPrompt);
             const messages = [];
-            for (let i = 0; i < chatPrompt.length; i++) {
-                const message = chatPrompt[i];
-                // system message:
-                if (i === 0 &&
-                    "system" in message &&
-                    typeof message.system === "string") {
-                    messages.push({
-                        role: "system",
-                        content: message.system,
-                    });
-                    continue;
-                }
-                // user message
-                if ("user" in message) {
-                    messages.push({
-                        role: "user",
-                        content: message.user,
-                    });
-                    continue;
-                }
-                // ai message:
-                if ("ai" in message) {
-                    messages.push({
-                        role: "assistant",
-                        content: message.ai,
-                    });
-                    continue;
+            if (chatPrompt.system != null) {
+                messages.push(OpenAIChatMessage.system(chatPrompt.system));
+            }
+            for (const { role, content } of chatPrompt.messages) {
+                switch (role) {
+                    case "user": {
+                        messages.push(OpenAIChatMessage.user(content));
+                        break;
+                    }
+                    case "assistant": {
+                        messages.push(OpenAIChatMessage.assistant(content));
+                        break;
+                    }
+                    default: {
+                        const _exhaustiveCheck = role;
+                        throw new Error(`Unsupported role: ${_exhaustiveCheck}`);
+                    }
                 }
-                // unsupported message:
-                throw new Error(`Unsupported message: ${JSON.stringify(message)}`);
             }
             return messages;
         },

package/model-provider/openai/index.cjs

@@ -10,11 +10,23 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenAIError = void 0;
+exports.OpenAIChatPromptFormat = exports.OpenAIError = void 0;
 __exportStar(require("./AzureOpenAIApiConfiguration.cjs"), exports);
 __exportStar(require("./OpenAIApiConfiguration.cjs"), exports);
 __exportStar(require("./OpenAICompletionModel.cjs"), exports);
@@ -28,5 +40,5 @@ __exportStar(require("./OpenAITranscriptionModel.cjs"), exports);
 __exportStar(require("./TikTokenTokenizer.cjs"), exports);
 __exportStar(require("./chat/OpenAIChatMessage.cjs"), exports);
 __exportStar(require("./chat/OpenAIChatModel.cjs"), exports);
-__exportStar(require("./chat/OpenAIChatPromptFormat.cjs"), exports);
+exports.OpenAIChatPromptFormat = __importStar(require("./chat/OpenAIChatPromptFormat.cjs"));
 __exportStar(require("./chat/countOpenAIChatMessageTokens.cjs"), exports);

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

@@ -10,6 +10,6 @@ export * from "./OpenAITranscriptionModel.js";
 export * from "./TikTokenTokenizer.js";
 export * from "./chat/OpenAIChatMessage.js";
 export * from "./chat/OpenAIChatModel.js";
-export * from "./chat/OpenAIChatPromptFormat.js";
+export * as OpenAIChatPromptFormat from "./chat/OpenAIChatPromptFormat.js";
 export { OpenAIChatDelta } from "./chat/OpenAIChatStreamIterable.js";
 export * from "./chat/countOpenAIChatMessageTokens.js";

package/model-provider/openai/index.js

@@ -10,5 +10,5 @@ export * from "./OpenAITranscriptionModel.js";
 export * from "./TikTokenTokenizer.js";
 export * from "./chat/OpenAIChatMessage.js";
 export * from "./chat/OpenAIChatModel.js";
-export * from "./chat/OpenAIChatPromptFormat.js";
+export * as OpenAIChatPromptFormat from "./chat/OpenAIChatPromptFormat.js";
 export * from "./chat/countOpenAIChatMessageTokens.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "Build multimodal applications, chatbots, and agents with JavaScript and TypeScript.",
-  "version": "0.69.0",
+  "version": "0.70.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [