modelfusion 0.109.0 → 0.110.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v0.110.0 - 2023-12-30
+
+### Changed
+
+- **breaking change**: renamed `modelfusion/extension` to `modelfusion/internal`. This requires updating `modelfusion-experimental` (if used) to `v0.3.0`
+
+### Removed
+
+- Deprecated OpenAI completion models that will be deactivated on January 4, 2024.
+
 ## v0.109.0 - 2023-12-30
 
 ### Added

package/{extension → internal}/index.cjs

@@ -14,7 +14,7 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseEventSourceStream = exports.AbstractModel = exports.executeFunctionCall = exports.postToApi = exports.postJsonToApi = exports.createTextResponseHandler = exports.createJsonResponseHandler = exports.createAudioMpegResponseHandler = exports.loadApiKey = exports.callWithRetryAndThrottle = void 0;
+exports.parseEventSourceStream = exports.AbstractModel = exports.executeFunctionCall = exports.postToApi = exports.postJsonToApi = exports.createTextResponseHandler = exports.createJsonResponseHandler = exports.createJsonErrorResponseHandler = exports.createAudioMpegResponseHandler = exports.loadApiKey = exports.callWithRetryAndThrottle = void 0;
 __exportStar(require("../core/ExtensionFunctionEvent.cjs"), exports);
 var callWithRetryAndThrottle_js_1 = require("../core/api/callWithRetryAndThrottle.cjs");
 Object.defineProperty(exports, "callWithRetryAndThrottle", { enumerable: true, get: function () { return callWithRetryAndThrottle_js_1.callWithRetryAndThrottle; } });
@@ -22,6 +22,7 @@ var loadApiKey_js_1 = require("../core/api/loadApiKey.cjs");
 Object.defineProperty(exports, "loadApiKey", { enumerable: true, get: function () { return loadApiKey_js_1.loadApiKey; } });
 var postToApi_js_1 = require("../core/api/postToApi.cjs");
 Object.defineProperty(exports, "createAudioMpegResponseHandler", { enumerable: true, get: function () { return postToApi_js_1.createAudioMpegResponseHandler; } });
+Object.defineProperty(exports, "createJsonErrorResponseHandler", { enumerable: true, get: function () { return postToApi_js_1.createJsonErrorResponseHandler; } });
 Object.defineProperty(exports, "createJsonResponseHandler", { enumerable: true, get: function () { return postToApi_js_1.createJsonResponseHandler; } });
 Object.defineProperty(exports, "createTextResponseHandler", { enumerable: true, get: function () { return postToApi_js_1.createTextResponseHandler; } });
 Object.defineProperty(exports, "postJsonToApi", { enumerable: true, get: function () { return postToApi_js_1.postJsonToApi; } });

package/{extension → internal}/index.d.ts

@@ -1,7 +1,7 @@
 export * from "../core/ExtensionFunctionEvent.js";
 export { callWithRetryAndThrottle } from "../core/api/callWithRetryAndThrottle.js";
 export { loadApiKey } from "../core/api/loadApiKey.js";
-export { ResponseHandler, createAudioMpegResponseHandler, createJsonResponseHandler, createTextResponseHandler, postJsonToApi, postToApi, } from "../core/api/postToApi.js";
+export { ResponseHandler, createAudioMpegResponseHandler, createJsonErrorResponseHandler, createJsonResponseHandler, createTextResponseHandler, postJsonToApi, postToApi, } from "../core/api/postToApi.js";
 export { executeFunctionCall } from "../core/executeFunctionCall.js";
 export { AbstractModel } from "../model-function/AbstractModel.js";
 export { ErrorHandler } from "../util/ErrorHandler.js";

package/{extension → internal}/index.js

@@ -1,7 +1,7 @@
 export * from "../core/ExtensionFunctionEvent.js";
 export { callWithRetryAndThrottle } from "../core/api/callWithRetryAndThrottle.js";
 export { loadApiKey } from "../core/api/loadApiKey.js";
-export { createAudioMpegResponseHandler, createJsonResponseHandler, createTextResponseHandler, postJsonToApi, postToApi, } from "../core/api/postToApi.js";
+export { createAudioMpegResponseHandler, createJsonErrorResponseHandler, createJsonResponseHandler, createTextResponseHandler, postJsonToApi, postToApi, } from "../core/api/postToApi.js";
 export { executeFunctionCall } from "../core/executeFunctionCall.js";
 export { AbstractModel } from "../model-function/AbstractModel.js";
 export { parseEventSourceStream } from "../util/streaming/parseEventSourceStream.js";

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -17,100 +17,12 @@ exports.OPENAI_TEXT_GENERATION_MODELS = {
         promptTokenCostInMillicents: 0.15,
         completionTokenCostInMillicents: 0.2,
     },
-    "davinci-002": {
-        contextWindowSize: 16384,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-        fineTunedTokenCostInMillicents: 1.2,
-    },
-    "babbage-002": {
-        contextWindowSize: 16384,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-        fineTunedTokenCostInMillicents: 0.16,
-    },
-    "text-davinci-003": {
-        contextWindowSize: 4096,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "text-davinci-002": {
-        contextWindowSize: 4096,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "code-davinci-002": {
-        contextWindowSize: 8000,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    davinci: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "text-curie-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-    },
-    curie: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-    },
-    "text-babbage-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.05,
-        completionTokenCostInMillicents: 0.05,
-    },
-    babbage: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.05,
-        completionTokenCostInMillicents: 0.05,
-    },
-    "text-ada-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-    },
-    ada: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-    },
 };
 function getOpenAICompletionModelInformation(model) {
-    // Model is already a base model:
-    if (model in exports.OPENAI_TEXT_GENERATION_MODELS) {
-        const baseModelInformation = exports.OPENAI_TEXT_GENERATION_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 (["davinci-002", "babbage-002"].includes(baseModel)) {
-        const baseModelInformation = exports.OPENAI_TEXT_GENERATION_MODELS[baseModel];
-        return {
-            baseModel: baseModel,
-            isFineTuned: true,
-            contextWindowSize: baseModelInformation.contextWindowSize,
-            promptTokenCostInMillicents: baseModelInformation.fineTunedTokenCostInMillicents,
-            completionTokenCostInMillicents: baseModelInformation.fineTunedTokenCostInMillicents,
-        };
-    }
-    throw new Error(`Unknown OpenAI chat base model ${baseModel}.`);
+    return exports.OPENAI_TEXT_GENERATION_MODELS[model];
 }
 exports.getOpenAICompletionModelInformation = getOpenAICompletionModelInformation;
-const isOpenAICompletionModel = (model) => model in exports.OPENAI_TEXT_GENERATION_MODELS ||
-    model.startsWith("ft:davinci-002:") ||
-    model.startsWith("ft:babbage-002:");
+const isOpenAICompletionModel = (model) => model in exports.OPENAI_TEXT_GENERATION_MODELS;
 exports.isOpenAICompletionModel = isOpenAICompletionModel;
 const calculateOpenAICompletionCostInMillicents = ({ model, response, }) => {
     const modelInformation = getOpenAICompletionModelInformation(model);
@@ -161,7 +73,7 @@ class OpenAICompletionModel extends AbstractOpenAICompletionModel_js_1.AbstractO
         });
         const modelInformation = getOpenAICompletionModelInformation(this.settings.model);
         this.tokenizer = new TikTokenTokenizer_js_1.TikTokenTokenizer({
-            model: modelInformation.baseModel,
+            model: this.settings.model,
         });
         this.contextWindowSize = modelInformation.contextWindowSize;
     }

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

@@ -13,81 +13,14 @@ export declare const OPENAI_TEXT_GENERATION_MODELS: {
         promptTokenCostInMillicents: number;
         completionTokenCostInMillicents: number;
     };
-    "davinci-002": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-        fineTunedTokenCostInMillicents: number;
-    };
-    "babbage-002": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-        fineTunedTokenCostInMillicents: number;
-    };
-    "text-davinci-003": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "text-davinci-002": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "code-davinci-002": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    davinci: {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "text-curie-001": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    curie: {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "text-babbage-001": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    babbage: {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    "text-ada-001": {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
-    ada: {
-        contextWindowSize: number;
-        promptTokenCostInMillicents: number;
-        completionTokenCostInMillicents: number;
-    };
 };
 export declare function getOpenAICompletionModelInformation(model: OpenAICompletionModelType): {
-    baseModel: OpenAICompletionBaseModelType;
-    isFineTuned: boolean;
     contextWindowSize: number;
     promptTokenCostInMillicents: number;
     completionTokenCostInMillicents: number;
 };
-type FineTuneableOpenAICompletionModelType = "davinci-002" | "babbage-002";
-type FineTunedOpenAICompletionModelType = `ft:${FineTuneableOpenAICompletionModelType}:${string}:${string}:${string}`;
-export type OpenAICompletionBaseModelType = keyof typeof OPENAI_TEXT_GENERATION_MODELS;
-export type OpenAICompletionModelType = OpenAICompletionBaseModelType | FineTunedOpenAICompletionModelType;
-export declare const isOpenAICompletionModel: (model: string) => model is OpenAICompletionModelType;
+export type OpenAICompletionModelType = keyof typeof OPENAI_TEXT_GENERATION_MODELS;
+export declare const isOpenAICompletionModel: (model: string) => model is "gpt-3.5-turbo-instruct";
 export declare const calculateOpenAICompletionCostInMillicents: ({ model, response, }: {
     model: OpenAICompletionModelType;
     response: OpenAICompletionResponse;
@@ -116,7 +49,7 @@ export interface OpenAICompletionModelSettings extends AbstractOpenAICompletionM
 export declare class OpenAICompletionModel extends AbstractOpenAICompletionModel<OpenAICompletionModelSettings> implements TextStreamingModel<string, OpenAICompletionModelSettings> {
     constructor(settings: OpenAICompletionModelSettings);
     readonly provider: "openai";
-    get modelName(): OpenAICompletionModelType;
+    get modelName(): "gpt-3.5-turbo-instruct";
     readonly contextWindowSize: number;
     readonly tokenizer: TikTokenTokenizer;
     countPromptTokens(input: string): Promise<number>;
@@ -135,4 +68,3 @@ export declare class OpenAICompletionModel extends AbstractOpenAICompletionModel
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
     withSettings(additionalSettings: Partial<OpenAICompletionModelSettings>): this;
 }
-export {};

package/model-provider/openai/OpenAICompletionModel.js

@@ -14,99 +14,11 @@ export const OPENAI_TEXT_GENERATION_MODELS = {
         promptTokenCostInMillicents: 0.15,
         completionTokenCostInMillicents: 0.2,
     },
-    "davinci-002": {
-        contextWindowSize: 16384,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-        fineTunedTokenCostInMillicents: 1.2,
-    },
-    "babbage-002": {
-        contextWindowSize: 16384,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-        fineTunedTokenCostInMillicents: 0.16,
-    },
-    "text-davinci-003": {
-        contextWindowSize: 4096,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "text-davinci-002": {
-        contextWindowSize: 4096,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "code-davinci-002": {
-        contextWindowSize: 8000,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    davinci: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 2,
-        completionTokenCostInMillicents: 2,
-    },
-    "text-curie-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-    },
-    curie: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.2,
-        completionTokenCostInMillicents: 0.2,
-    },
-    "text-babbage-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.05,
-        completionTokenCostInMillicents: 0.05,
-    },
-    babbage: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.05,
-        completionTokenCostInMillicents: 0.05,
-    },
-    "text-ada-001": {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-    },
-    ada: {
-        contextWindowSize: 2048,
-        promptTokenCostInMillicents: 0.04,
-        completionTokenCostInMillicents: 0.04,
-    },
 };
 export function getOpenAICompletionModelInformation(model) {
-    // Model is already a base model:
-    if (model in OPENAI_TEXT_GENERATION_MODELS) {
-        const baseModelInformation = OPENAI_TEXT_GENERATION_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 (["davinci-002", "babbage-002"].includes(baseModel)) {
-        const baseModelInformation = OPENAI_TEXT_GENERATION_MODELS[baseModel];
-        return {
-            baseModel: baseModel,
-            isFineTuned: true,
-            contextWindowSize: baseModelInformation.contextWindowSize,
-            promptTokenCostInMillicents: baseModelInformation.fineTunedTokenCostInMillicents,
-            completionTokenCostInMillicents: baseModelInformation.fineTunedTokenCostInMillicents,
-        };
-    }
-    throw new Error(`Unknown OpenAI chat base model ${baseModel}.`);
+    return OPENAI_TEXT_GENERATION_MODELS[model];
 }
-export const isOpenAICompletionModel = (model) => model in OPENAI_TEXT_GENERATION_MODELS ||
-    model.startsWith("ft:davinci-002:") ||
-    model.startsWith("ft:babbage-002:");
+export const isOpenAICompletionModel = (model) => model in OPENAI_TEXT_GENERATION_MODELS;
 export const calculateOpenAICompletionCostInMillicents = ({ model, response, }) => {
     const modelInformation = getOpenAICompletionModelInformation(model);
     return (response.usage.prompt_tokens *
@@ -155,7 +67,7 @@ export class OpenAICompletionModel extends AbstractOpenAICompletionModel {
         });
         const modelInformation = getOpenAICompletionModelInformation(this.settings.model);
         this.tokenizer = new TikTokenTokenizer({
-            model: modelInformation.baseModel,
+            model: this.settings.model,
         });
         this.contextWindowSize = modelInformation.contextWindowSize;
     }

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

@@ -11,7 +11,7 @@ export declare const OPENAI_IMAGE_MODELS: {
         getCost(settings: OpenAIImageGenerationSettings): 2000 | 1800 | 1600 | null;
     };
     "dall-e-3": {
-        getCost(settings: OpenAIImageGenerationSettings): 8000 | 4000 | 12000 | null;
+        getCost(settings: OpenAIImageGenerationSettings): 4000 | 8000 | 12000 | null;
     };
 };
 /**

package/model-provider/openai/TikTokenTokenizer.cjs

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TikTokenTokenizer = void 0;
 const lite_1 = require("js-tiktoken/lite");
 const cl100k_base_1 = __importDefault(require("js-tiktoken/ranks/cl100k_base"));
-const p50k_base_1 = __importDefault(require("js-tiktoken/ranks/p50k_base"));
-const r50k_base_1 = __importDefault(require("js-tiktoken/ranks/r50k_base"));
 const never_js_1 = require("../../util/never.cjs");
 /**
  * TikToken tokenizer for OpenAI language models.
@@ -56,22 +54,6 @@ exports.TikTokenTokenizer = TikTokenTokenizer;
 // when new models are released
 function getTiktokenBPE(model) {
     switch (model) {
-        case "code-davinci-002":
-        case "text-davinci-002":
-        case "text-davinci-003": {
-            return p50k_base_1.default;
-        }
-        case "ada":
-        case "babbage":
-        case "curie":
-        case "davinci":
-        case "text-ada-001":
-        case "text-babbage-001":
-        case "text-curie-001": {
-            return r50k_base_1.default;
-        }
-        case "babbage-002":
-        case "davinci-002":
         case "gpt-3.5-turbo":
         case "gpt-3.5-turbo-0301":
         case "gpt-3.5-turbo-0613":

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

@@ -1,9 +1,9 @@
 import { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
-import { OpenAITextEmbeddingModelType } from "./OpenAITextEmbeddingModel.js";
-import { OpenAICompletionBaseModelType } from "./OpenAICompletionModel.js";
 import { OpenAIChatBaseModelType } from "./OpenAIChatModel.js";
+import { OpenAICompletionModelType } from "./OpenAICompletionModel.js";
+import { OpenAITextEmbeddingModelType } from "./OpenAITextEmbeddingModel.js";
 export type TikTokenTokenizerSettings = {
-    model: OpenAIChatBaseModelType | OpenAICompletionBaseModelType | OpenAITextEmbeddingModelType;
+    model: OpenAIChatBaseModelType | OpenAICompletionModelType | OpenAITextEmbeddingModelType;
 };
 /**
  * TikToken tokenizer for OpenAI language models.

package/model-provider/openai/TikTokenTokenizer.js

@@ -1,7 +1,5 @@
 import { Tiktoken } from "js-tiktoken/lite";
 import cl100k_base from "js-tiktoken/ranks/cl100k_base";
-import p50k_base from "js-tiktoken/ranks/p50k_base";
-import r50k_base from "js-tiktoken/ranks/r50k_base";
 import { never } from "../../util/never.js";
 /**
  * TikToken tokenizer for OpenAI language models.
@@ -49,22 +47,6 @@ export class TikTokenTokenizer {
 // when new models are released
 function getTiktokenBPE(model) {
     switch (model) {
-        case "code-davinci-002":
-        case "text-davinci-002":
-        case "text-davinci-003": {
-            return p50k_base;
-        }
-        case "ada":
-        case "babbage":
-        case "curie":
-        case "davinci":
-        case "text-ada-001":
-        case "text-babbage-001":
-        case "text-curie-001": {
-            return r50k_base;
-        }
-        case "babbage-002":
-        case "davinci-002":
         case "gpt-3.5-turbo":
         case "gpt-3.5-turbo-0301":
         case "gpt-3.5-turbo-0613":

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.109.0",
+  "version": "0.110.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [
@@ -42,10 +42,10 @@
       "import": "./index.js",
       "require": "./index.cjs"
     },
-    "./extension": {
-      "types": "./extension/index.d.ts",
-      "import": "./extension/index.js",
-      "require": "./extension/index.cjs"
+    "./internal": {
+      "types": "./internal/index.d.ts",
+      "import": "./internal/index.js",
+      "require": "./internal/index.cjs"
     }
   },
   "scripts": {