modelfusion 0.47.2 → 0.47.3

package/README.md

@@ -17,7 +17,7 @@
 
 ModelFusion is a library for building AI apps, chatbots, and agents. It provides abstractions for AI models, vector indices, and tools.
 
-- **Multimodal Support**: Beyond just LLMs, ModelFusion encompasses a diverse array of models including text generation, text-to-speech, speech-to-text, and image generation, allowing you to build multifaceted AI applications with ease.
+- **Multimodal Support**: Beyond just LLMs, ModelFusion encompasses a diverse array of models including text generation, text-to-speech, speech-to-text, and image generation, allowing you to build multi-modal AI applications with ease.
 - **Flexibility and control**: AI application development can be complex and unique to each project. With ModelFusion, you have complete control over the prompts and model settings, and you can access the raw responses from the models quickly to build what you need.
 - **Type inference and validation**: ModelFusion uses TypeScript to infer types wherever possible and to validate model responses. By default, [Zod](https://github.com/colinhacks/zod) is used for type validation, but you can also use other libraries.
 - **Guards**: ModelFusion provides a guard function that you can use to implement retry on error, redacting and changing reponses, etc.

package/core/api/loadApiKey.cjs

@@ -2,7 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadApiKey = void 0;
 function loadApiKey({ apiKey, environmentVariableName, apiKeyParameterName = "apiKey", description, }) {
-    apiKey ??= process.env[environmentVariableName];
+    if (apiKey != null) {
+        return apiKey;
+    }
+    if (typeof process === "undefined") {
+        throw new Error(`${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter. Environment variables is not supported in this environment.`);
+    }
+    apiKey = process.env[environmentVariableName];
     if (apiKey == null) {
         throw new Error(`${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter or set it as an environment variable named ${environmentVariableName}.`);
     }

package/core/api/loadApiKey.js

@@ -1,5 +1,11 @@
 export function loadApiKey({ apiKey, environmentVariableName, apiKeyParameterName = "apiKey", description, }) {
-    apiKey ??= process.env[environmentVariableName];
+    if (apiKey != null) {
+        return apiKey;
+    }
+    if (typeof process === "undefined") {
+        throw new Error(`${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter. Environment variables is not supported in this environment.`);
+    }
+    apiKey = process.env[environmentVariableName];
     if (apiKey == null) {
         throw new Error(`${description} API key is missing. Pass it using the '${apiKeyParameterName}' parameter or set it as an environment variable named ${environmentVariableName}.`);
     }

package/model-provider/openai/TikTokenTokenizer.cjs

@@ -1,7 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TikTokenTokenizer = void 0;
-const js_tiktoken_1 = require("js-tiktoken");
+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.
@@ -29,9 +35,7 @@ class TikTokenTokenizer {
             writable: true,
             value: void 0
         });
-        this.tiktoken = (0, js_tiktoken_1.getEncoding)("model" in options
-            ? getEncodingNameForModel(options.model)
-            : options.encoding);
+        this.tiktoken = new lite_1.Tiktoken(getTiktokenBPE(options.model));
     }
     async tokenize(text) {
         return this.tiktoken.encode(text);
@@ -50,12 +54,12 @@ class TikTokenTokenizer {
 exports.TikTokenTokenizer = TikTokenTokenizer;
 // implemented here (instead of using js-tiktoken) to be able to quickly updated it
 // when new models are released
-function getEncodingNameForModel(model) {
+function getTiktokenBPE(model) {
     switch (model) {
         case "code-davinci-002":
         case "text-davinci-002":
         case "text-davinci-003": {
-            return "p50k_base";
+            return p50k_base_1.default;
         }
         case "ada":
         case "babbage":
@@ -64,7 +68,7 @@ function getEncodingNameForModel(model) {
         case "text-ada-001":
         case "text-babbage-001":
         case "text-curie-001": {
-            return "r50k_base";
+            return r50k_base_1.default;
         }
         case "babbage-002":
         case "davinci-002":
@@ -81,7 +85,7 @@ function getEncodingNameForModel(model) {
         case "gpt-4-32k-0314":
         case "gpt-4-32k-0613":
         case "text-embedding-ada-002": {
-            return "cl100k_base";
+            return cl100k_base_1.default;
         }
         default: {
             (0, never_js_1.never)(model);

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

@@ -1,4 +1,3 @@
-import { TiktokenEncoding } from "js-tiktoken";
 import { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 import { OpenAITextEmbeddingModelType } from "./OpenAITextEmbeddingModel.js";
 import { OpenAITextGenerationBaseModelType } from "./OpenAITextGenerationModel.js";
@@ -24,8 +23,6 @@ export declare class TikTokenTokenizer implements FullTokenizer {
      */
     constructor(options: {
         model: OpenAIChatBaseModelType | OpenAITextGenerationBaseModelType | OpenAITextEmbeddingModelType;
-    } | {
-        encoding: TiktokenEncoding;
     });
     private readonly tiktoken;
     tokenize(text: string): Promise<number[]>;

package/model-provider/openai/TikTokenTokenizer.js

@@ -1,4 +1,7 @@
-import { getEncoding } from "js-tiktoken";
+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.
@@ -26,9 +29,7 @@ export class TikTokenTokenizer {
             writable: true,
             value: void 0
         });
-        this.tiktoken = getEncoding("model" in options
-            ? getEncodingNameForModel(options.model)
-            : options.encoding);
+        this.tiktoken = new Tiktoken(getTiktokenBPE(options.model));
     }
     async tokenize(text) {
         return this.tiktoken.encode(text);
@@ -46,12 +47,12 @@ export class TikTokenTokenizer {
 }
 // implemented here (instead of using js-tiktoken) to be able to quickly updated it
 // when new models are released
-function getEncodingNameForModel(model) {
+function getTiktokenBPE(model) {
     switch (model) {
         case "code-davinci-002":
         case "text-davinci-002":
         case "text-davinci-003": {
-            return "p50k_base";
+            return p50k_base;
         }
         case "ada":
         case "babbage":
@@ -60,7 +61,7 @@ function getEncodingNameForModel(model) {
         case "text-ada-001":
         case "text-babbage-001":
         case "text-curie-001": {
-            return "r50k_base";
+            return r50k_base;
         }
         case "babbage-002":
         case "davinci-002":
@@ -77,7 +78,7 @@ function getEncodingNameForModel(model) {
         case "gpt-4-32k-0314":
         case "gpt-4-32k-0613":
         case "text-embedding-ada-002": {
-            return "cl100k_base";
+            return cl100k_base;
         }
         default: {
             never(model);

package/package.json

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