modelmix 2.5.6 → 2.6.0

package/demo/demo.mjs

@@ -33,8 +33,8 @@ mmix.attach(new MixOllama({
 
 mmix.replace({ '{name}': 'ALF' });
 
-console.log("\n" + '--------| gpt-4o |--------');
-const gpt = mmix.create('gpt-4o', { options: { temperature: 0 } }).addText("Have you ever eaten a {animal}?");
+console.log("\n" + '--------| gpt-4o-mini |--------');
+const gpt = mmix.create('gpt-4o-mini', { options: { temperature: 0 } }).addText("Have you ever eaten a {animal}?");
 gpt.replace({ '{animal}': 'cat' });
 console.log(await gpt.message());
 

package/demo/parallel.mjs

@@ -0,0 +1,50 @@
+import 'dotenv/config';
+import { ModelMix, MixOpenAI, MixAnthropic, MixPerplexity, MixOllama } from '../index.js';
+
+const mix = new ModelMix({
+    options: {
+        max_tokens: 200,
+    },
+    config: {
+        system: 'You are {name} from Melmac.',
+        max_history: 2,
+        max_request: 3,
+        debug: true,
+    }
+});
+
+mix.attach(new MixOpenAI());
+
+// Función para crear una promesa que se resuelve después de un tiempo aleatorio
+const randomDelay = () => new Promise(resolve => setTimeout(resolve, Math.random() * 2000 + 1000));
+
+// Función para realizar una solicitud al modelo
+async function makeRequest(id) {
+    const start = Date.now();
+    console.log(`Iniciando solicitud ${id}`);
+    
+    const message = await mix.create('gpt-4o-mini')
+        .addText(`Genera un hecho interesante sobre el número ${id}.`)
+        .message();
+    
+    // await randomDelay(); // Simula algún procesamiento adicional
+    
+    const duration = Date.now() - start;
+    console.log(`Solicitud ${id} completada en ${duration}ms: ${message}`);
+}
+
+// Función principal para ejecutar el ejemplo
+async function runExample() {
+    console.log("Iniciando ejemplo de concurrencia...");
+    
+    // Crear un array de promesas para 5 solicitudes
+    const requests = Array.from({ length: 5 }, (_, i) => makeRequest(i + 1));
+    
+    // Ejecutar todas las solicitudes y esperar a que se completen
+    await Promise.all(requests);
+    
+    console.log("Ejemplo de concurrencia completado.");
+}
+
+// Ejecutar el ejemplo
+runExample().catch(console.error);

package/index.js

@@ -2,6 +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');
 
 class ModelMix {
     constructor(args = { options: {}, config: {} }) {
@@ -20,6 +21,8 @@ class ModelMix {
             debug: false,
             ...args.config
         }
+
+        this.limit = pLimit(this.config.max_request);
     }
 
     replace(keyValues) {
@@ -30,8 +33,6 @@ class ModelMix {
     attach(modelInstance) {
         const key = modelInstance.config.prefix.join("_");
         this.models[key] = modelInstance;
-        modelInstance.queue = [];
-        modelInstance.active_requests = 0;
         return this;
     }
 
@@ -59,29 +60,6 @@ class ModelMix {
 
         return new MessageHandler(this, modelEntry, options, config);
     }
-
-    async processQueue(modelEntry) {
-        if (modelEntry.active_requests >= modelEntry.config.max_request) {
-            return;
-        }
-
-        const nextTask = modelEntry.queue.shift();
-        if (!nextTask) {
-            return;
-        }
-
-        modelEntry.active_requests++;
-
-        try {
-            const result = await modelEntry.create(nextTask.args);
-            nextTask.resolve(result);
-        } catch (error) {
-            nextTask.reject(error);
-        } finally {
-            modelEntry.active_requests--;
-            this.processQueue(modelEntry);
-        }
-    }
 }
 
 class MessageHandler {
@@ -277,33 +255,29 @@ class MessageHandler {
     }
 
     async execute() {
+        return this.mix.limit(() => new Promise(async (resolve, reject) => {
+            await this.processImageUrls();
 
-        await this.processImageUrls();
-
-        this.applyTemplate();
-        this.messages = this.messages.slice(-this.config.max_history);
-        this.messages = this.groupByRoles(this.messages);
+            this.applyTemplate();
+            this.messages = this.messages.slice(-this.config.max_history);
+            this.messages = this.groupByRoles(this.messages);
 
-        if (this.messages.length === 0) {
-            throw new Error("No user messages have been added. Use addText(prompt), addTextFromFile(filePath), addImage(filePath), or addImageFromUrl(url) to add a prompt.");
-        }
+            if (this.messages.length === 0) {
+                throw new Error("No user messages have been added. Use addText(prompt), addTextFromFile(filePath), addImage(filePath), or addImageFromUrl(url) to add a prompt.");
+            }
 
-        this.options.messages = this.messages;
+            this.options.messages = this.messages;
 
-        return new Promise((resolve, reject) => {
-            this.modelEntry.queue.push({
-                args: { options: this.options, config: this.config },
-                resolve: (result) => {
-                    this.messages.push({ role: "assistant", content: result.message });
-                    resolve(result);
-                },
-                reject
-            });
-            this.mix.processQueue(this.modelEntry);
-        });
+            try {
+                const result = await this.modelEntry.create({ options: this.options, config: this.config });
+                this.messages.push({ role: "assistant", content: result.message });
+                resolve(result);
+            } catch (error) {
+                reject(error);
+            }
+        }));
     }
 }
-
 class MixCustom {
     constructor(args = { config: {}, options: {}, headers: {} }) {
         this.config = this.getDefaultConfig(args.config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "2.5.6",
+  "version": "2.6.0",
   "description": "🧬 ModelMix - Unified API for Diverse AI LLM.",
   "main": "index.js",
   "repository": {
@@ -36,7 +36,8 @@
   },
   "homepage": "https://github.com/clasen/ModelMix#readme",
   "dependencies": {
-    "axios": "^1.6.8",
-    "lemonlog": "^1.1.2"
+    "axios": "^1.7.4",
+    "lemonlog": "^1.1.2",
+    "p-limit": "^3.1.0"
   }
 }