modelmix 2.5.8 → 2.6.2

package/README.md

@@ -1,11 +1,11 @@
 # 🧬 ModelMix: Unified API for Diverse AI LLM
 
-**ModelMix** is a versatile module that enables seamless integration of various language models from different providers through a unified interface. With ModelMix, you can effortlessly manage and utilize multiple AI models while controlling parallel requests to avoid provider restrictions.
+**ModelMix** is a versatile module that enables seamless integration of various language models from different providers through a unified interface. With ModelMix, you can effortlessly manage and utilize multiple AI models while controlling request rates to avoid provider restrictions.
 
 ## ✨ Features
 
 - **Unified Interface**: Interact with multiple AI models through a single, coherent API.
-- **Request Control**: Manage the number of parallel requests to adhere to provider limitations with `max_request`.
+- **Request Rate Control**: Manage the rate of requests to adhere to provider limitations using Bottleneck.
 - **Flexible Integration**: Easily integrate popular models like OpenAI, Anthropic, Perplexity, Groq, Ollama, LM Studio or custom models.
 - **History Tracking**: Automatically logs the conversation history with model responses, allowing you to limit the number of historical messages with `max_history`.
 
@@ -50,7 +50,7 @@ Here's a quick example to get you started:
         config: {
             system: "You are {name} from Melmac.",
             max_history: 2,
-            max_request: 1,
+            bottleneck: { maxConcurrent: 2 },
             debug: true
         }
     });
@@ -198,6 +198,34 @@ When you run your script this way, you'll see detailed information about the req
 
 This information is valuable for debugging and understanding how ModelMix is processing your requests.
 
+## 🚦 Bottleneck Integration
+
+ModelMix now uses Bottleneck for efficient rate limiting of API requests. This integration helps prevent exceeding API rate limits and ensures smooth operation when working with multiple models or high request volumes.
+
+### How it works:
+
+1. **Configuration**: Bottleneck is configured in the ModelMix constructor. You can customize the settings or use the default configuration:
+
+    ```javascript
+    const mmix = new ModelMix({
+        config: {
+            bottleneck: {
+                maxConcurrent: 5,     // Maximum number of concurrent requests
+                minTime: 200,         // Minimum time between requests (in ms)
+                reservoir: 60,        // Number of requests allowed in the reservoir period
+                reservoirRefreshAmount: 60, // How many requests are added when the reservoir refreshes
+                reservoirRefreshInterval: 60 * 1000 // Reservoir refresh interval (60 seconds)
+            }
+        }
+    });
+    ```
+
+2. **Rate Limiting**: When you make a request using any of the attached models, Bottleneck automatically manages the request flow based on the configured settings.
+
+3. **Automatic Queueing**: If the rate limit is reached, Bottleneck will automatically queue subsequent requests and process them as capacity becomes available.
+
+This integration ensures that your application respects API rate limits while maximizing throughput, providing a robust solution for managing multiple AI model interactions.
+
 ## 📚 ModelMix Class Overview
 
 ```javascript
@@ -213,7 +241,12 @@ new ModelMix(args = { options: {}, config: {} })
   - **config**: This object contains configuration settings that control the behavior of the `ModelMix` instance. These settings can also be overridden for specific model instances. Examples of configuration settings include:
     - `system`: Sets the default system message for the model, e.g., "You are an assistant."
     - `max_history`: Limits the number of historical messages to retain, e.g., 5.
-    - `max_request`: Limits the number of parallel requests, e.g., 1.
+    - `bottleneck`: Configures the rate limiting behavior using Bottleneck. For example:
+      - `maxConcurrent`: 5 Maximum number of concurrent requests
+      - `minTime`: 200 Minimum time between requests (in ms)
+      - `reservoir`: 60 Number of requests allowed in the reservoir period
+      - `reservoirRefreshAmount`: 60 How many requests are added when the reservoir refreshes
+      - `reservoirRefreshInterval`: 60 * 1000 // Reservoir refresh interval (60 seconds)
     - ...(Additional configuration parameters can be added as needed)
 
 **Methods**

package/demo/demo.mjs

@@ -8,7 +8,7 @@ const mmix = new ModelMix({
     config: {
         system: 'You are {name} from Melmac.',
         max_history: 2,
-        max_request: 1,
+        bottleneck: { maxConcurrent: 1 },
         debug: true,
     }
 });

package/demo/lmstudio.mjs

@@ -6,7 +6,7 @@ const mmix = new ModelMix({
     },
     config: {
         max_history: 2,
-        max_request: 1,
+        bottleneck: { maxConcurrent: 1 },
     }
 });
 

package/demo/parallel.mjs

@@ -1,50 +1,51 @@
 import 'dotenv/config';
-import { ModelMix, MixOpenAI, MixAnthropic, MixPerplexity, MixOllama } from '../index.js';
+import { ModelMix, MixOpenAI } from '../index.js';
 
 const mix = new ModelMix({
     options: {
         max_tokens: 200,
     },
     config: {
-        system: 'You are {name} from Melmac.',
         max_history: 2,
-        max_request: 3,
+        bottleneck: {
+            maxConcurrent: 1,     // Maximum number of concurrent requests
+        },
         debug: true,
     }
 });
 
 mix.attach(new MixOpenAI());
 
-// Función para crear una promesa que se resuelve después de un tiempo aleatorio
+// Function to create a promise that resolves after a random time
 const randomDelay = () => new Promise(resolve => setTimeout(resolve, Math.random() * 2000 + 1000));
 
-// Función para realizar una solicitud al modelo
+// Function to make a request to the model
 async function makeRequest(id) {
     const start = Date.now();
-    console.log(`Iniciando solicitud ${id}`);
-    
+    console.log(`Starting request ${id}`);
+
     const message = await mix.create('gpt-4o-mini')
-        .addText(`Genera un hecho interesante sobre el número ${id}.`)
+        .addText(`Generate an interesting fact about the number ${id}.`)
         .message();
-    
-    // await randomDelay(); // Simula algún procesamiento adicional
-    
+
+    await randomDelay(); // Simulates some additional processing
+
     const duration = Date.now() - start;
-    console.log(`Solicitud ${id} completada en ${duration}ms: ${message}`);
+    console.log(`Request ${id} finished in ${duration}ms: ${message}`);
 }
 
-// Función principal para ejecutar el ejemplo
+// Main function to run the example
 async function runExample() {
-    console.log("Iniciando ejemplo de concurrencia...");
-    
-    // Crear un array de promesas para 5 solicitudes
+    console.log("Starting concurrency example...");
+
+    // Create a promise array for 5 requests
     const requests = Array.from({ length: 5 }, (_, i) => makeRequest(i + 1));
-    
-    // Ejecutar todas las solicitudes y esperar a que se completen
+
+    // Execute all requests and wait for them to complete
     await Promise.all(requests);
-    
-    console.log("Ejemplo de concurrencia completado.");
+
+    console.log("Completed concurrency example.");
 }
 
-// Ejecutar el ejemplo
+// Run the example
 runExample().catch(console.error);

package/index.js

@@ -2,7 +2,7 @@ const axios = require('axios');
 const fs = require('fs');
 const mime = require('mime-types');
 const log = require('lemonlog')('ModelMix');
-const pLimit = require('p-limit');
+const Bottleneck = require('bottleneck');
 
 class ModelMix {
     constructor(args = { options: {}, config: {} }) {
@@ -14,15 +14,24 @@ class ModelMix {
             ...args.options
         };
 
+        // Standard Bottleneck configuration
+        const defaultBottleneckConfig = {
+            maxConcurrent: 5,     // Maximum number of concurrent requests
+            minTime: 200,         // Minimum time between requests (in ms)
+            reservoir: 60,        // Number of requests allowed in the reservoir period
+            reservoirRefreshAmount: 60, // How many requests are added when the reservoir refreshes
+            reservoirRefreshInterval: 60 * 1000 // Reservoir refresh interval (60 seconds)
+        };        
+
         this.config = {
             system: 'You are an assistant.',
-            max_request: 1,
             max_history: 5, // Default max history
             debug: false,
+            bottleneck: defaultBottleneckConfig,
             ...args.config
         }
 
-        this.limit = pLimit(this.config.max_request);
+        this.limiter = new Bottleneck(this.config.bottleneck);
     }
 
     replace(keyValues) {
@@ -60,6 +69,21 @@ class ModelMix {
 
         return new MessageHandler(this, modelEntry, options, config);
     }
+
+    setSystem(text) {
+        this.config.system = text;
+        return this;
+    }
+
+    setSystemFromFile(filePath) {
+        try {
+            const content = fs.readFileSync(filePath, { encoding: 'utf8' });
+            this.setSystem(content);
+        } catch (error) {
+            console.error(`Error reading system message file ${filePath}:`, error);
+        }
+        return this;
+    }    
 }
 
 class MessageHandler {
@@ -255,7 +279,7 @@ class MessageHandler {
     }
 
     async execute() {
-        return this.mix.limit(() => new Promise(async (resolve, reject) => {
+        return this.mix.limiter.schedule(async () => {
             await this.processImageUrls();
 
             this.applyTemplate();
@@ -271,11 +295,11 @@ class MessageHandler {
             try {
                 const result = await this.modelEntry.create({ options: this.options, config: this.config });
                 this.messages.push({ role: "assistant", content: result.message });
-                resolve(result);
+                return result;
             } catch (error) {
-                reject(error);
+                throw error;
             }
-        }));
+        });
     }
 }
 class MixCustom {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "2.5.8",
+  "version": "2.6.2",
   "description": "🧬 ModelMix - Unified API for Diverse AI LLM.",
   "main": "index.js",
   "repository": {
@@ -27,7 +27,8 @@
     "gpt-4o-mini",
     "4o",
     "ollama",
-    "lmstudio"
+    "lmstudio",
+    "bottleneck"
   ],
   "author": "Martin Clasen",
   "license": "MIT",
@@ -37,7 +38,7 @@
   "homepage": "https://github.com/clasen/ModelMix#readme",
   "dependencies": {
     "axios": "^1.7.4",
-    "lemonlog": "^1.1.2",
-    "p-limit": "^3.1.0"
+    "bottleneck": "^2.19.5",
+    "lemonlog": "^1.1.2"
   }
 }

package/demo/node_modules/.package-lock.json

@@ -1,254 +0,0 @@
-{
-  "name": "demo",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    ".api/apis/pplx": {
-      "name": "@api/pplx",
-      "version": "0.1.0",
-      "extraneous": true,
-      "dependencies": {
-        "api": "^6.1.1",
-        "json-schema-to-ts": "^2.8.0-beta.0",
-        "oas": "^20.10.3"
-      }
-    },
-    "node_modules/@anthropic-ai/sdk": {
-      "version": "0.20.9",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.20.9.tgz",
-      "integrity": "sha512-Lq74+DhiEQO6F9/gdVOLmHx57pX45ebK2Q/zH14xYe1157a7QeUVknRqIp0Jz5gQI01o7NKbuv9Dag2uQsLjDg==",
-      "dependencies": {
-        "@types/node": "^18.11.18",
-        "@types/node-fetch": "^2.6.4",
-        "abort-controller": "^3.0.0",
-        "agentkeepalive": "^4.2.1",
-        "form-data-encoder": "1.7.2",
-        "formdata-node": "^4.3.2",
-        "node-fetch": "^2.6.7",
-        "web-streams-polyfill": "^3.2.1"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "18.19.33",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz",
-      "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@types/node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==",
-      "dependencies": {
-        "@types/node": "*",
-        "form-data": "^4.0.0"
-      }
-    },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "dependencies": {
-        "event-target-shim": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6.5"
-      }
-    },
-    "node_modules/agentkeepalive": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
-      "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
-      "dependencies": {
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "16.4.5",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
-      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/form-data-encoder": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz",
-      "integrity": "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="
-    },
-    "node_modules/formdata-node": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz",
-      "integrity": "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==",
-      "dependencies": {
-        "node-domexception": "1.0.0",
-        "web-streams-polyfill": "4.0.0-beta.3"
-      },
-      "engines": {
-        "node": ">= 12.20"
-      }
-    },
-    "node_modules/formdata-node/node_modules/web-streams-polyfill": {
-      "version": "4.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
-      "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "dependencies": {
-        "ms": "^2.0.0"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/node-domexception": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "github",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "engines": {
-        "node": ">=10.5.0"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
-    "node_modules/web-streams-polyfill": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
-      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    }
-  }
-}