modelfusion 0.62.0 → 0.63.0

package/model-provider/openai/OpenAICostCalculator.cjs

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAICostCalculator = void 0;
+const OpenAICompletionModel_js_1 = require("./OpenAICompletionModel.cjs");
 const OpenAIImageGenerationModel_js_1 = require("./OpenAIImageGenerationModel.cjs");
+const OpenAISpeechModel_js_1 = require("./OpenAISpeechModel.cjs");
 const OpenAITextEmbeddingModel_js_1 = require("./OpenAITextEmbeddingModel.cjs");
-const OpenAICompletionModel_js_1 = require("./OpenAICompletionModel.cjs");
 const OpenAITranscriptionModel_js_1 = require("./OpenAITranscriptionModel.cjs");
 const OpenAIChatModel_js_1 = require("./chat/OpenAIChatModel.cjs");
-const OpenAISpeechModel_js_1 = require("./OpenAISpeechModel.cjs");
 class OpenAICostCalculator {
     constructor() {
         Object.defineProperty(this, "provider", {
@@ -21,7 +21,11 @@ class OpenAICostCalculator {
         const model = call.model.modelName;
         switch (type) {
             case "generate-image": {
+                if (model == null) {
+                    return null;
+                }
                 return (0, OpenAIImageGenerationModel_js_1.calculateOpenAIImageGenerationCostInMillicents)({
+                    model: model,
                     settings: call.settings,
                 });
             }

package/model-provider/openai/OpenAICostCalculator.js

@@ -1,9 +1,9 @@
+import { calculateOpenAICompletionCostInMillicents, isOpenAICompletionModel, } from "./OpenAICompletionModel.js";
 import { calculateOpenAIImageGenerationCostInMillicents, } from "./OpenAIImageGenerationModel.js";
+import { calculateOpenAISpeechCostInMillicents, } from "./OpenAISpeechModel.js";
 import { calculateOpenAIEmbeddingCostInMillicents, isOpenAIEmbeddingModel, } from "./OpenAITextEmbeddingModel.js";
-import { calculateOpenAICompletionCostInMillicents, isOpenAICompletionModel, } from "./OpenAICompletionModel.js";
 import { calculateOpenAITranscriptionCostInMillicents, } from "./OpenAITranscriptionModel.js";
 import { calculateOpenAIChatCostInMillicents, isOpenAIChatModel, } from "./chat/OpenAIChatModel.js";
-import { calculateOpenAISpeechCostInMillicents, } from "./OpenAISpeechModel.js";
 export class OpenAICostCalculator {
     constructor() {
         Object.defineProperty(this, "provider", {
@@ -18,7 +18,11 @@ export class OpenAICostCalculator {
         const model = call.model.modelName;
         switch (type) {
             case "generate-image": {
+                if (model == null) {
+                    return null;
+                }
                 return calculateOpenAIImageGenerationCostInMillicents({
+                    model: model,
                     settings: call.settings,
                 });
             }

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -55,9 +55,8 @@ exports.OPENAI_IMAGE_MODELS = {
 /**
  * @see https://openai.com/pricing
  */
-const calculateOpenAIImageGenerationCostInMillicents = ({ settings, }) => {
-    console.log(settings);
-    const cost = exports.OPENAI_IMAGE_MODELS[settings.model]?.getCost(settings);
+const calculateOpenAIImageGenerationCostInMillicents = ({ model, settings, }) => {
+    const cost = exports.OPENAI_IMAGE_MODELS[model]?.getCost(settings);
     if (cost == null) {
         return null;
     }
@@ -106,7 +105,6 @@ class OpenAIImageGenerationModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "model",
             "n",
             "size",
             "quality",

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

@@ -17,7 +17,8 @@ export declare const OPENAI_IMAGE_MODELS: {
 /**
  * @see https://openai.com/pricing
  */
-export declare const calculateOpenAIImageGenerationCostInMillicents: ({ settings, }: {
+export declare const calculateOpenAIImageGenerationCostInMillicents: ({ model, settings, }: {
+    model: OpenAIImageModelType;
     settings: OpenAIImageGenerationSettings;
 }) => number | null;
 export type OpenAIImageModelType = keyof typeof OPENAI_IMAGE_MODELS;

package/model-provider/openai/OpenAIImageGenerationModel.js

@@ -52,9 +52,8 @@ export const OPENAI_IMAGE_MODELS = {
 /**
  * @see https://openai.com/pricing
  */
-export const calculateOpenAIImageGenerationCostInMillicents = ({ settings, }) => {
-    console.log(settings);
-    const cost = OPENAI_IMAGE_MODELS[settings.model]?.getCost(settings);
+export const calculateOpenAIImageGenerationCostInMillicents = ({ model, settings, }) => {
+    const cost = OPENAI_IMAGE_MODELS[model]?.getCost(settings);
     if (cost == null) {
         return null;
     }
@@ -102,7 +101,6 @@ export class OpenAIImageGenerationModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "model",
             "n",
             "size",
             "quality",

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

@@ -211,6 +211,7 @@ class OpenAIChatModel extends AbstractModel_js_1.AbstractModel {
                 // map to OpenAI API names:
                 stop: this.settings.stopSequences,
                 maxTokens: this.settings.maxCompletionTokens,
+                openAIResponseFormat: this.settings.responseFormat,
                 // other settings:
                 user: this.settings.isUserIdForwardingEnabled
                     ? options.run?.userId
@@ -390,6 +391,7 @@ const openAIChatResponseSchema = zod_1.z.object({
     object: zod_1.z.literal("chat.completion"),
     created: zod_1.z.number(),
     model: zod_1.z.string(),
+    system_fingerprint: zod_1.z.string(),
     choices: zod_1.z.array(zod_1.z.object({
         message: zod_1.z.object({
             role: zod_1.z.literal("assistant"),
@@ -403,7 +405,13 @@ const openAIChatResponseSchema = zod_1.z.object({
         }),
         index: zod_1.z.number(),
         logprobs: zod_1.z.nullable(zod_1.z.any()),
-        finish_reason: zod_1.z.string(),
+        finish_reason: zod_1.z.enum([
+            "stop",
+            "length",
+            "tool_calls",
+            "content_filter",
+            "function_call",
+        ]),
     })),
     usage: zod_1.z.object({
         prompt_tokens: zod_1.z.number(),
@@ -411,7 +419,7 @@ const openAIChatResponseSchema = zod_1.z.object({
         total_tokens: zod_1.z.number(),
     }),
 });
-async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, responseFormat, model, messages, functions, functionCall, temperature, topP, n, stop, maxTokens, presencePenalty, frequencyPenalty, logitBias, user, }) {
+async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration(), abortSignal, responseFormat, model, messages, functions, functionCall, temperature, topP, n, stop, maxTokens, presencePenalty, frequencyPenalty, logitBias, user, openAIResponseFormat, seed, }) {
     // empty arrays are not allowed for stop:
     if (stop != null && Array.isArray(stop) && stop.length === 0) {
         stop = undefined;
@@ -433,6 +441,8 @@ async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration_js
             presence_penalty: presencePenalty,
             frequency_penalty: frequencyPenalty,
             logit_bias: logitBias,
+            seed,
+            response_format: openAIResponseFormat,
             user,
         },
         failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,

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

@@ -119,6 +119,10 @@ export interface OpenAIChatCallSettings {
     maxTokens?: number;
     temperature?: number;
     topP?: number;
+    seed?: number | null;
+    responseFormat?: {
+        type?: "text" | "json_object";
+    };
     n?: number;
     presencePenalty?: number;
     frequencyPenalty?: number;
@@ -189,11 +193,12 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
                         arguments: string;
                     } | undefined;
                 };
-                finish_reason: string;
+                finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
                 index: number;
                 logprobs?: any;
             }[];
             created: number;
+            system_fingerprint: string;
         };
         text: string;
         usage: {
@@ -229,11 +234,12 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
                         arguments: string;
                     } | undefined;
                 };
-                finish_reason: string;
+                finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
                 index: number;
                 logprobs?: any;
             }[];
             created: number;
+            system_fingerprint: string;
         };
         valueText: string;
         value: any;
@@ -263,11 +269,12 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
                         arguments: string;
                     } | undefined;
                 };
-                finish_reason: string;
+                finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
                 index: number;
                 logprobs?: any;
             }[];
             created: number;
+            system_fingerprint: string;
         };
         structureAndText: {
             structure: null;
@@ -299,11 +306,12 @@ export declare class OpenAIChatModel extends AbstractModel<OpenAIChatSettings> i
                         arguments: string;
                     } | undefined;
                 };
-                finish_reason: string;
+                finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
                 index: number;
                 logprobs?: any;
             }[];
             created: number;
+            system_fingerprint: string;
         };
         structureAndText: {
             structure: string;
@@ -338,6 +346,7 @@ declare const openAIChatResponseSchema: z.ZodObject<{
     object: z.ZodLiteral<"chat.completion">;
     created: z.ZodNumber;
     model: z.ZodString;
+    system_fingerprint: z.ZodString;
     choices: z.ZodArray<z.ZodObject<{
         message: z.ZodObject<{
             role: z.ZodLiteral<"assistant">;
@@ -369,7 +378,7 @@ declare const openAIChatResponseSchema: z.ZodObject<{
         }>;
         index: z.ZodNumber;
         logprobs: z.ZodNullable<z.ZodAny>;
-        finish_reason: z.ZodString;
+        finish_reason: z.ZodEnum<["stop", "length", "tool_calls", "content_filter", "function_call"]>;
     }, "strip", z.ZodTypeAny, {
         message: {
             content: string | null;
@@ -379,7 +388,7 @@ declare const openAIChatResponseSchema: z.ZodObject<{
                 arguments: string;
             } | undefined;
         };
-        finish_reason: string;
+        finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
         index: number;
         logprobs?: any;
     }, {
@@ -391,7 +400,7 @@ declare const openAIChatResponseSchema: z.ZodObject<{
                 arguments: string;
             } | undefined;
         };
-        finish_reason: string;
+        finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
         index: number;
         logprobs?: any;
     }>, "many">;
@@ -426,11 +435,12 @@ declare const openAIChatResponseSchema: z.ZodObject<{
                 arguments: string;
             } | undefined;
         };
-        finish_reason: string;
+        finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
         index: number;
         logprobs?: any;
     }[];
     created: number;
+    system_fingerprint: string;
 }, {
     object: "chat.completion";
     usage: {
@@ -449,11 +459,12 @@ declare const openAIChatResponseSchema: z.ZodObject<{
                 arguments: string;
             } | undefined;
         };
-        finish_reason: string;
+        finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
         index: number;
         logprobs?: any;
     }[];
     created: number;
+    system_fingerprint: string;
 }>;
 export type OpenAIChatResponse = z.infer<typeof openAIChatResponseSchema>;
 export type OpenAIChatResponseFormatType<T> = {
@@ -484,11 +495,12 @@ export declare const OpenAIChatResponseFormat: {
                         arguments: string;
                     } | undefined;
                 };
-                finish_reason: string;
+                finish_reason: "length" | "stop" | "function_call" | "tool_calls" | "content_filter";
                 index: number;
                 logprobs?: any;
             }[];
             created: number;
+            system_fingerprint: string;
         }>;
     };
     /**

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

@@ -202,6 +202,7 @@ export class OpenAIChatModel extends AbstractModel {
                 // map to OpenAI API names:
                 stop: this.settings.stopSequences,
                 maxTokens: this.settings.maxCompletionTokens,
+                openAIResponseFormat: this.settings.responseFormat,
                 // other settings:
                 user: this.settings.isUserIdForwardingEnabled
                     ? options.run?.userId
@@ -380,6 +381,7 @@ const openAIChatResponseSchema = z.object({
     object: z.literal("chat.completion"),
     created: z.number(),
     model: z.string(),
+    system_fingerprint: z.string(),
     choices: z.array(z.object({
         message: z.object({
             role: z.literal("assistant"),
@@ -393,7 +395,13 @@ const openAIChatResponseSchema = z.object({
         }),
         index: z.number(),
         logprobs: z.nullable(z.any()),
-        finish_reason: z.string(),
+        finish_reason: z.enum([
+            "stop",
+            "length",
+            "tool_calls",
+            "content_filter",
+            "function_call",
+        ]),
     })),
     usage: z.object({
         prompt_tokens: z.number(),
@@ -401,7 +409,7 @@ const openAIChatResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
-async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration(), abortSignal, responseFormat, model, messages, functions, functionCall, temperature, topP, n, stop, maxTokens, presencePenalty, frequencyPenalty, logitBias, user, }) {
+async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration(), abortSignal, responseFormat, model, messages, functions, functionCall, temperature, topP, n, stop, maxTokens, presencePenalty, frequencyPenalty, logitBias, user, openAIResponseFormat, seed, }) {
     // empty arrays are not allowed for stop:
     if (stop != null && Array.isArray(stop) && stop.length === 0) {
         stop = undefined;
@@ -423,6 +431,8 @@ async function callOpenAIChatCompletionAPI({ api = new OpenAIApiConfiguration(),
             presence_penalty: presencePenalty,
             frequency_penalty: frequencyPenalty,
             logit_bias: logitBias,
+            seed,
+            response_format: openAIResponseFormat,
             user,
         },
         failedResponseHandler: failedOpenAICallResponseHandler,

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

@@ -17,7 +17,16 @@ const chatResponseStreamEventSchema = zod_1.z.object({
             })
                 .optional(),
         }),
-        finish_reason: zod_1.z.enum(["stop", "length"]).nullable().optional(),
+        finish_reason: zod_1.z
+            .enum([
+            "stop",
+            "length",
+            "tool_calls",
+            "content_filter",
+            "function_call",
+        ])
+            .nullable()
+            .optional(),
         index: zod_1.z.number(),
     })),
     created: zod_1.z.number(),

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

@@ -14,7 +14,16 @@ const chatResponseStreamEventSchema = z.object({
             })
                 .optional(),
         }),
-        finish_reason: z.enum(["stop", "length"]).nullable().optional(),
+        finish_reason: z
+            .enum([
+            "stop",
+            "length",
+            "tool_calls",
+            "content_filter",
+            "function_call",
+        ])
+            .nullable()
+            .optional(),
         index: z.number(),
     })),
     created: z.number(),

package/package.json

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