modelfusion 0.22.0 → 0.24.0

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

@@ -49,6 +49,8 @@ export const OPENAI_CHAT_MODELS = {
         contextWindowSize: 4096,
         promptTokenCostInMillicents: 0.15,
         completionTokenCostInMillicents: 0.2,
+        fineTunedPromptTokenCostInMillicents: 1.2,
+        fineTunedCompletionTokenCostInMillicents: 1.6,
     },
     "gpt-3.5-turbo-0301": {
         contextWindowSize: 4096,
@@ -59,6 +61,8 @@ export const OPENAI_CHAT_MODELS = {
         contextWindowSize: 4096,
         promptTokenCostInMillicents: 0.15,
         completionTokenCostInMillicents: 0.2,
+        fineTunedPromptTokenCostInMillicents: 1.2,
+        fineTunedCompletionTokenCostInMillicents: 1.6,
     },
     "gpt-3.5-turbo-16k": {
         contextWindowSize: 16384,
@@ -71,11 +75,43 @@ export const OPENAI_CHAT_MODELS = {
         completionTokenCostInMillicents: 0.4,
     },
 };
-export const isOpenAIChatModel = (model) => model in OPENAI_CHAT_MODELS;
-export const calculateOpenAIChatCostInMillicents = ({ model, response, }) => response.usage.prompt_tokens *
-    OPENAI_CHAT_MODELS[model].promptTokenCostInMillicents +
-    response.usage.completion_tokens *
-        OPENAI_CHAT_MODELS[model].completionTokenCostInMillicents;
+export function getOpenAIChatModelInformation(model) {
+    // Model is already a base model:
+    if (model in OPENAI_CHAT_MODELS) {
+        const baseModelInformation = OPENAI_CHAT_MODELS[model];
+        return {
+            baseModel: model,
+            isFineTuned: false,
+            contextWindowSize: baseModelInformation.contextWindowSize,
+            promptTokenCostInMillicents: baseModelInformation.promptTokenCostInMillicents,
+            completionTokenCostInMillicents: baseModelInformation.completionTokenCostInMillicents,
+        };
+    }
+    // Extract the base model from the fine-tuned model:
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const [_, baseModel, ___, ____, _____] = model.split(":");
+    if (["gpt-3.5-turbo", "gpt-3.5-turbo-0613"].includes(baseModel)) {
+        const baseModelInformation = OPENAI_CHAT_MODELS[baseModel];
+        return {
+            baseModel: baseModel,
+            isFineTuned: true,
+            contextWindowSize: baseModelInformation.contextWindowSize,
+            promptTokenCostInMillicents: baseModelInformation.fineTunedPromptTokenCostInMillicents,
+            completionTokenCostInMillicents: baseModelInformation.fineTunedCompletionTokenCostInMillicents,
+        };
+    }
+    throw new Error(`Unknown OpenAI chat base model ${baseModel}.`);
+}
+export const isOpenAIChatModel = (model) => model in OPENAI_CHAT_MODELS ||
+    model.startsWith("ft:gpt-3.5-turbo-0613:") ||
+    model.startsWith("ft:gpt-3.5-turbo:");
+export const calculateOpenAIChatCostInMillicents = ({ model, response, }) => {
+    const modelInformation = getOpenAIChatModelInformation(model);
+    return (response.usage.prompt_tokens *
+        modelInformation.promptTokenCostInMillicents +
+        response.usage.completion_tokens *
+            modelInformation.completionTokenCostInMillicents);
+};
 /**
  * Create a text generation model that calls the OpenAI chat completion API.
  *
@@ -116,9 +152,11 @@ export class OpenAIChatModel extends AbstractModel {
             writable: true,
             value: void 0
         });
-        this.tokenizer = new TikTokenTokenizer({ model: this.settings.model });
-        this.contextWindowSize =
-            OPENAI_CHAT_MODELS[this.settings.model].contextWindowSize;
+        const modelInformation = getOpenAIChatModelInformation(this.settings.model);
+        this.tokenizer = new TikTokenTokenizer({
+            model: modelInformation.baseModel,
+        });
+        this.contextWindowSize = modelInformation.contextWindowSize;
     }
     get modelName() {
         return this.settings.model;
@@ -162,6 +200,19 @@ export class OpenAIChatModel extends AbstractModel {
             call: async () => callOpenAIChatCompletionAPI(callSettings),
         });
     }
+    get settingsForEvent() {
+        const eventSettingProperties = [
+            "stopSequences",
+            "maxCompletionTokens",
+            "baseUrl",
+            "functions",
+            "functionCall",
+            "temperature",
+            "topP",
+            "n",
+        ];
+        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
+    }
     generateTextResponse(prompt, options) {
         return this.callAPI(prompt, {
             ...options,
@@ -203,6 +254,13 @@ export class OpenAIChatModel extends AbstractModel {
         const jsonText = response.choices[0].message.function_call.arguments;
         return SecureJSON.parse(jsonText);
     }
+    extractUsage(response) {
+        return {
+            promptTokens: response.usage.prompt_tokens,
+            completionTokens: response.usage.completion_tokens,
+            totalTokens: response.usage.total_tokens,
+        };
+    }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextGenerationModel({
             model: this.withSettings({ stopSequences: promptFormat.stopSequences }),

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

@@ -1,5 +1,5 @@
 import z from "zod";
-import { GenerateJsonOrTextPrompt } from "../../../model-function/generate-json/GenerateJsonOrTextModel.js";
+import { JsonOrTextGenerationPrompt } from "../../../model-function/generate-json/JsonOrTextGenerationModel.js";
 import { SchemaDefinition } from "../../../model-function/generate-json/SchemaDefinition.js";
 import { Tool } from "../../../tool/Tool.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
@@ -76,7 +76,7 @@ export declare class OpenAIChatSingleFunctionPrompt<FUNCTION> {
         };
     }[];
 }
-export declare class OpenAIChatAutoFunctionPrompt<FUNCTIONS extends Array<OpenAIFunctionDescription<any>>> implements GenerateJsonOrTextPrompt<OpenAIChatResponse> {
+export declare class OpenAIChatAutoFunctionPrompt<FUNCTIONS extends Array<OpenAIFunctionDescription<any>>> implements JsonOrTextGenerationPrompt<OpenAIChatResponse> {
     readonly messages: OpenAIChatMessage[];
     readonly fns: FUNCTIONS;
     constructor({ messages, fns, }: {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.countOpenAIChatPromptTokens = exports.countOpenAIChatMessageTokens = exports.OPENAI_CHAT_MESSAGE_BASE_TOKEN_COUNT = exports.OPENAI_CHAT_PROMPT_BASE_TOKEN_COUNT = void 0;
 const countTokens_js_1 = require("../../../model-function/tokenize-text/countTokens.cjs");
 const TikTokenTokenizer_js_1 = require("../TikTokenTokenizer.cjs");
+const OpenAIChatModel_js_1 = require("./OpenAIChatModel.cjs");
 /**
  * Prompt tokens that are included automatically for every full
  * chat prompt (several messages) that is sent to OpenAI.
@@ -14,8 +15,10 @@ exports.OPENAI_CHAT_PROMPT_BASE_TOKEN_COUNT = 2;
  */
 exports.OPENAI_CHAT_MESSAGE_BASE_TOKEN_COUNT = 5;
 async function countOpenAIChatMessageTokens({ message, model, }) {
-    return (exports.OPENAI_CHAT_MESSAGE_BASE_TOKEN_COUNT +
-        (await (0, countTokens_js_1.countTokens)(new TikTokenTokenizer_js_1.TikTokenTokenizer({ model }), message.content ?? "")));
+    const contentTokenCount = await (0, countTokens_js_1.countTokens)(new TikTokenTokenizer_js_1.TikTokenTokenizer({
+        model: (0, OpenAIChatModel_js_1.getOpenAIChatModelInformation)(model).baseModel,
+    }), message.content ?? "");
+    return exports.OPENAI_CHAT_MESSAGE_BASE_TOKEN_COUNT + contentTokenCount;
 }
 exports.countOpenAIChatMessageTokens = countOpenAIChatMessageTokens;
 async function countOpenAIChatPromptTokens({ messages, model, }) {

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

@@ -1,5 +1,6 @@
 import { countTokens } from "../../../model-function/tokenize-text/countTokens.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";
+import { getOpenAIChatModelInformation, } from "./OpenAIChatModel.js";
 /**
  * Prompt tokens that are included automatically for every full
  * chat prompt (several messages) that is sent to OpenAI.
@@ -11,8 +12,10 @@ export const OPENAI_CHAT_PROMPT_BASE_TOKEN_COUNT = 2;
  */
 export const OPENAI_CHAT_MESSAGE_BASE_TOKEN_COUNT = 5;
 export async function countOpenAIChatMessageTokens({ message, model, }) {
-    return (OPENAI_CHAT_MESSAGE_BASE_TOKEN_COUNT +
-        (await countTokens(new TikTokenTokenizer({ model }), message.content ?? "")));
+    const contentTokenCount = await countTokens(new TikTokenTokenizer({
+        model: getOpenAIChatModelInformation(model).baseModel,
+    }), message.content ?? "");
+    return OPENAI_CHAT_MESSAGE_BASE_TOKEN_COUNT + contentTokenCount;
 }
 export async function countOpenAIChatPromptTokens({ messages, model, }) {
     let tokens = OPENAI_CHAT_PROMPT_BASE_TOKEN_COUNT;

package/model-provider/stability/StabilityImageGenerationModel.cjs

@@ -64,6 +64,21 @@ class StabilityImageGenerationModel extends AbstractModel_js_1.AbstractModel {
             call: async () => callStabilityImageGenerationAPI(callSettings),
         });
     }
+    get settingsForEvent() {
+        const eventSettingProperties = [
+            "baseUrl",
+            "height",
+            "width",
+            "cfgScale",
+            "clipGuidancePreset",
+            "sampler",
+            "samples",
+            "seed",
+            "steps",
+            "stylePreset",
+        ];
+        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
+    }
     generateImageResponse(prompt, options) {
         return this.callAPI(prompt, options);
     }

package/model-provider/stability/StabilityImageGenerationModel.d.ts

@@ -32,6 +32,7 @@ export declare class StabilityImageGenerationModel extends AbstractModel<Stabili
     get modelName(): string;
     private get apiKey();
     callAPI(input: StabilityImageGenerationPrompt, options?: ModelFunctionOptions<StabilityImageGenerationModelSettings>): Promise<StabilityImageGenerationResponse>;
+    get settingsForEvent(): Partial<StabilityImageGenerationModelSettings>;
     generateImageResponse(prompt: StabilityImageGenerationPrompt, options?: ModelFunctionOptions<StabilityImageGenerationModelSettings>): Promise<{
         artifacts: {
             seed: number;

package/model-provider/stability/StabilityImageGenerationModel.js

@@ -61,6 +61,21 @@ export class StabilityImageGenerationModel extends AbstractModel {
             call: async () => callStabilityImageGenerationAPI(callSettings),
         });
     }
+    get settingsForEvent() {
+        const eventSettingProperties = [
+            "baseUrl",
+            "height",
+            "width",
+            "cfgScale",
+            "clipGuidancePreset",
+            "sampler",
+            "samples",
+            "seed",
+            "steps",
+            "stylePreset",
+        ];
+        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
+    }
     generateImageResponse(prompt, options) {
         return this.callAPI(prompt, options);
     }

package/package.json

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

package/prompt/PromptFormatTextGenerationModel.cjs

@@ -65,6 +65,9 @@ class PromptFormatTextGenerationModel {
             promptFormat,
         });
     }
+    get settingsForEvent() {
+        return this.model.settingsForEvent;
+    }
     withSettings(additionalSettings) {
         return new PromptFormatTextGenerationModel({
             model: this.model.withSettings(additionalSettings),

package/prompt/PromptFormatTextGenerationModel.d.ts

@@ -19,5 +19,6 @@ export declare class PromptFormatTextGenerationModel<PROMPT, MODEL_PROMPT, RESPO
     get generateDeltaStreamResponse(): MODEL["generateDeltaStreamResponse"] extends undefined ? undefined : (prompt: PROMPT, options: ModelFunctionOptions<SETTINGS>) => PromiseLike<AsyncIterable<DeltaEvent<FULL_DELTA>>>;
     get extractTextDelta(): MODEL["extractTextDelta"];
     withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, PROMPT>): PromptFormatTextGenerationModel<INPUT_PROMPT, PROMPT, RESPONSE, FULL_DELTA, SETTINGS, this>;
+    get settingsForEvent(): Partial<SETTINGS>;
     withSettings(additionalSettings: Partial<SETTINGS>): this;
 }

package/prompt/PromptFormatTextGenerationModel.js

@@ -62,6 +62,9 @@ export class PromptFormatTextGenerationModel {
             promptFormat,
         });
     }
+    get settingsForEvent() {
+        return this.model.settingsForEvent;
+    }
     withSettings(additionalSettings) {
         return new PromptFormatTextGenerationModel({
             model: this.model.withSettings(additionalSettings),

package/tool/executeTool.cjs

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeTool = exports.ExecuteToolPromise = void 0;
 const nanoid_1 = require("nanoid");
 const FunctionEventSource_js_1 = require("../core/FunctionEventSource.cjs");
+const GlobalFunctionLogging_js_1 = require("../core/GlobalFunctionLogging.cjs");
 const GlobalFunctionObservers_js_1 = require("../core/GlobalFunctionObservers.cjs");
+const getFunctionCallLogger_js_1 = require("../core/getFunctionCallLogger.cjs");
 const DurationMeasurement_js_1 = require("../util/DurationMeasurement.cjs");
 const AbortError_js_1 = require("../util/api/AbortError.cjs");
 const runSafe_js_1 = require("../util/runSafe.cjs");
@@ -55,6 +57,7 @@ async function doExecuteTool(tool, input, options) {
     const run = options?.run;
     const eventSource = new FunctionEventSource_js_1.FunctionEventSource({
         observers: [
+            ...(0, getFunctionCallLogger_js_1.getFunctionCallLogger)(options?.logging ?? (0, GlobalFunctionLogging_js_1.getGlobalFunctionLogging)()),
             ...(0, GlobalFunctionObservers_js_1.getGlobalFunctionObservers)(),
             ...(run?.observers ?? []),
             ...(options?.observers ?? []),

package/tool/executeTool.js

@@ -1,6 +1,8 @@
 import { nanoid as createId } from "nanoid";
 import { FunctionEventSource } from "../core/FunctionEventSource.js";
+import { getGlobalFunctionLogging } from "../core/GlobalFunctionLogging.js";
 import { getGlobalFunctionObservers } from "../core/GlobalFunctionObservers.js";
+import { getFunctionCallLogger } from "../core/getFunctionCallLogger.js";
 import { startDurationMeasurement } from "../util/DurationMeasurement.js";
 import { AbortError } from "../util/api/AbortError.js";
 import { runSafe } from "../util/runSafe.js";
@@ -50,6 +52,7 @@ async function doExecuteTool(tool, input, options) {
     const run = options?.run;
     const eventSource = new FunctionEventSource({
         observers: [
+            ...getFunctionCallLogger(options?.logging ?? getGlobalFunctionLogging()),
             ...getGlobalFunctionObservers(),
             ...(run?.observers ?? []),
             ...(options?.observers ?? []),

package/tool/useTool.d.ts

@@ -1,5 +1,5 @@
 import { ModelFunctionOptions } from "../model-function/ModelFunctionOptions.js";
-import { GenerateJsonModel, GenerateJsonModelSettings } from "../model-function/generate-json/GenerateJsonModel.js";
+import { JsonGenerationModel, JsonGenerationModelSettings } from "../model-function/generate-json/JsonGenerationModel.js";
 import { Tool } from "./Tool.js";
 /**
  * `useTool` uses `generateJson` to generate parameters for a tool and then executes the tool with the parameters.
@@ -8,7 +8,7 @@ import { Tool } from "./Tool.js";
  * the parameters (`parameters` property, typed),
  * and the result of the tool execution (`result` property, typed).
  */
-export declare function useTool<PROMPT, RESPONSE, SETTINGS extends GenerateJsonModelSettings, TOOL extends Tool<any, any, any>>(model: GenerateJsonModel<PROMPT, RESPONSE, SETTINGS>, tool: TOOL, prompt: (tool: TOOL) => PROMPT, options?: ModelFunctionOptions<SETTINGS>): Promise<{
+export declare function useTool<PROMPT, RESPONSE, SETTINGS extends JsonGenerationModelSettings, TOOL extends Tool<any, any, any>>(model: JsonGenerationModel<PROMPT, RESPONSE, SETTINGS>, tool: TOOL, prompt: (tool: TOOL) => PROMPT, options?: ModelFunctionOptions<SETTINGS>): Promise<{
     tool: TOOL["name"];
     parameters: TOOL["inputSchema"];
     result: Awaited<ReturnType<TOOL["execute"]>>;

package/tool/useToolOrGenerateText.d.ts

@@ -1,5 +1,5 @@
 import { ModelFunctionOptions } from "../model-function/ModelFunctionOptions.js";
-import { GenerateJsonOrTextModel, GenerateJsonOrTextModelSettings, GenerateJsonOrTextPrompt } from "../model-function/generate-json/GenerateJsonOrTextModel.js";
+import { JsonOrTextGenerationModel, JsonOrTextGenerationModelSettings, JsonOrTextGenerationPrompt } from "../model-function/generate-json/JsonOrTextGenerationModel.js";
 import { Tool } from "./Tool.js";
 type ToolArray<T extends Tool<any, any, any>[]> = T;
 type ToToolMap<T extends ToolArray<Tool<any, any, any>[]>> = {
@@ -14,7 +14,7 @@ type ToToolUnion<T> = {
     } : never;
 }[keyof T];
 type ToOutputValue<TOOLS extends ToolArray<Tool<any, any, any>[]>> = ToToolUnion<ToToolMap<TOOLS>>;
-export declare function useToolOrGenerateText<PROMPT, RESPONSE, SETTINGS extends GenerateJsonOrTextModelSettings, TOOLS extends Array<Tool<any, any, any>>>(model: GenerateJsonOrTextModel<PROMPT, RESPONSE, SETTINGS>, tools: TOOLS, prompt: (tools: TOOLS) => PROMPT & GenerateJsonOrTextPrompt<RESPONSE>, options?: ModelFunctionOptions<SETTINGS>): Promise<{
+export declare function useToolOrGenerateText<PROMPT, RESPONSE, SETTINGS extends JsonOrTextGenerationModelSettings, TOOLS extends Array<Tool<any, any, any>>>(model: JsonOrTextGenerationModel<PROMPT, RESPONSE, SETTINGS>, tools: TOOLS, prompt: (tools: TOOLS) => PROMPT & JsonOrTextGenerationPrompt<RESPONSE>, options?: ModelFunctionOptions<SETTINGS>): Promise<{
     tool: null;
     parameters: null;
     result: null;

package/core/ConsoleLogger.cjs

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsoleLogger = void 0;
-class ConsoleLogger {
-    onFunctionEvent(event) {
-        console.log(JSON.stringify(event, null, 2));
-    }
-}
-exports.ConsoleLogger = ConsoleLogger;

package/core/ConsoleLogger.d.ts

@@ -1,5 +0,0 @@
-import { FunctionEvent } from "./FunctionEvent.js";
-import { FunctionObserver } from "./FunctionObserver.js";
-export declare class ConsoleLogger implements FunctionObserver {
-    onFunctionEvent(event: FunctionEvent): void;
-}

package/core/ConsoleLogger.js

@@ -1,5 +0,0 @@
-export class ConsoleLogger {
-    onFunctionEvent(event) {
-        console.log(JSON.stringify(event, null, 2));
-    }
-}

package/model-function/generate-json/GenerateJsonModel.d.ts

@@ -1,8 +0,0 @@
-import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
-import { Model, ModelSettings } from "../Model.js";
-export interface GenerateJsonModelSettings extends ModelSettings {
-}
-export interface GenerateJsonModel<PROMPT, RESPONSE, SETTINGS extends GenerateJsonModelSettings> extends Model<SETTINGS> {
-    generateJsonResponse(prompt: PROMPT, options?: ModelFunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
-    extractJson(response: RESPONSE): unknown;
-}

package/model-function/generate-json/GenerateJsonOrTextModel.d.ts

@@ -1,18 +0,0 @@
-import { ModelFunctionOptions } from "../ModelFunctionOptions.js";
-import { Model, ModelSettings } from "../Model.js";
-export interface GenerateJsonOrTextModelSettings extends ModelSettings {
-}
-export interface GenerateJsonOrTextPrompt<RESPONSE> {
-    extractJsonAndText(response: RESPONSE): {
-        schema: null;
-        value: null;
-        text: string;
-    } | {
-        schema: string;
-        value: unknown;
-        text: string | null;
-    };
-}
-export interface GenerateJsonOrTextModel<PROMPT, RESPONSE, SETTINGS extends GenerateJsonOrTextModelSettings> extends Model<SETTINGS> {
-    generateJsonResponse(prompt: PROMPT & GenerateJsonOrTextPrompt<RESPONSE>, options?: ModelFunctionOptions<SETTINGS>): PromiseLike<RESPONSE>;
-}