modelfusion 0.68.1 → 0.70.0

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/chat/OpenAIChatStreamIterable.cjs

@@ -18,6 +18,16 @@ const chatResponseStreamEventSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.objec
                 arguments: zod_1.z.string().optional(),
             })
                 .optional(),
+            tool_calls: zod_1.z
+                .array(zod_1.z.object({
+                id: zod_1.z.string(),
+                type: zod_1.z.literal("function"),
+                function: zod_1.z.object({
+                    name: zod_1.z.string(),
+                    arguments: zod_1.z.string(),
+                }),
+            }))
+                .optional(),
         }),
         finish_reason: zod_1.z
             .enum([

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

@@ -15,6 +15,16 @@ const chatResponseStreamEventSchema = new ZodSchema(z.object({
                 arguments: z.string().optional(),
             })
                 .optional(),
+            tool_calls: z
+                .array(z.object({
+                id: z.string(),
+                type: z.literal("function"),
+                function: z.object({
+                    name: z.string(),
+                    arguments: z.string(),
+                }),
+            }))
+                .optional(),
         }),
         finish_reason: z
             .enum([

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.68.1",
+  "version": "0.70.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [
@@ -81,8 +81,8 @@
     "eslint-config-prettier": "9.0.0",
     "fastify": "^4.0.0",
     "husky": "^8.0.3",
-    "lint-staged": "15.0.2",
-    "prettier": "3.0.3",
+    "lint-staged": "15.1.0",
+    "prettier": "3.1.0",
     "rimraf": "5.0.5",
     "typescript": "5.2.2",
     "vitest": "^0.34.5"