modelmix 2.2.4 → 2.3.2

package/README.md

@@ -6,7 +6,7 @@
 
 - **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 (`max_request`).
-- **Flexible Integration**: Easily integrate popular models like OpenAI, Anthropic, Perplexity, Ollama, LM Studio or custom models.
+- **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`.
 
 ## 📦 Installation
@@ -29,9 +29,10 @@ Here's a quick example to get you started:
 
 1. **Setup your environment variables (.env file)**:
     ```plaintext
-    OPENAI_API_KEY=your_openai_api_key
-    ANTHROPIC_API_KEY=your_anthropic_api_key
-    PPLX_API_KEY=your_perplexity_api_key
+    OPENAI_API_KEY="your_openai_api_key"
+    ANTHROPIC_API_KEY="your_anthropic_api_key"
+    PPLX_API_KEY="your_perplexity_api_key"
+    GROQ_API_KEY="your_groq_api_key"
     ```
 
 2. **Create and configure your models**:
@@ -47,12 +48,14 @@ Here's a quick example to get you started:
             max_tokens: 200,
         },
         config: {
-            system: "You are ALF from Melmac.",
+            system: "You are {name} from Melmac.",
             max_history: 2,
             max_request: 1,
         }
     });
 
+    mmix.replace({ '{name}': 'ALF' });
+
     mmix.attach(new MixOpenAI({ config: { apiKey: env.OPENAI_API_KEY } }));
     mmix.attach(new MixAnthropic({ config: { apiKey: env.ANTHROPIC_API_KEY } }));
     mmix.attach(new MixPerplexity({
@@ -78,12 +81,13 @@ Here's a quick example to get you started:
 
     ```javascript
     console.log("\n" + '--------| gpt-4o |--------');
-    const gpt = mmix.create('gpt-4o', { temperature: 0.5 }).addText("Have you ever eaten a cat?");
+    const gpt = mmix.create('gpt-4o', { temperature: 0.5 }).addText("Have you ever eaten a {animal}?");
+    gpt.replace({ '{animal}': 'cat' });
     console.log(await gpt.message());
 
     console.log("\n" + '--------| claude-3-sonnet-20240229 |--------');
     const claude = mmix.create('claude-3-sonnet-20240229', { temperature: 0.5 });
-    claude.addImage("./watson.png");
+    claude.addImage("./watson.jpg");
     const imageDescription = await claude.addText("Describe the image").message();
     console.log(imageDescription);
 
@@ -95,7 +99,7 @@ Here's a quick example to get you started:
 
     console.log("\n" + '--------| ollama (llava:latest) |--------');
     await mmix.create('llava:latest')
-        .addImage("./watson.png")
+        .addImage("./watson.jpg")
         .addText("What is the predominant color?")
         .stream((data) => { console.log(data.message); });
     ```
@@ -182,6 +186,15 @@ new MixAnthropic(args = { config: {}, options: {} })
 new MixPerplexity(args = { config: {}, options: {} })
 ```
 
+- **args**: Configuration object with `config` and `options` properties.
+  - **config**: Specific configuration settings for Perplexity, including the `apiKey`.
+  - **options**: Default options for Perplexity model instances.
+### MixPerplexity Class Overview
+
+```javascript
+new MixGroq(args = { config: {}, options: {} })
+```
+
 - **args**: Configuration object with `config` and `options` properties.
   - **config**: Specific configuration settings for Perplexity, including the `apiKey`.
   - **options**: Default options for Perplexity model instances.

package/demo/default.env

@@ -1,3 +1,4 @@
 ANTHROPIC_API_KEY=""
 OPENAI_API_KEY=""
 PPLX_API_KEY=""
+GROQ_API_KEY=""

package/demo/demo.mjs

@@ -1,25 +1,22 @@
-import 'dotenv/config'
+import 'dotenv/config';
 import { ModelMix, MixOpenAI, MixAnthropic, MixPerplexity, MixOllama } from '../index.js';
 
-const env = process.env;
-
 const mmix = new ModelMix({
     options: {
         max_tokens: 200,
     },
     config: {
-        system: 'You are ALF from Melmac.',
+        system: 'You are {name} from Melmac.',
         max_history: 2,
         max_request: 1,
     }
 });
 
-
-mmix.attach(new MixOpenAI({ config: { apiKey: env.OPENAI_API_KEY } }));
-mmix.attach(new MixAnthropic({ config: { apiKey: env.ANTHROPIC_API_KEY } }));
+mmix.attach(new MixOpenAI());
+mmix.attach(new MixAnthropic());
 mmix.attach(new MixPerplexity({
     config: {
-        apiKey: env.PPLX_API_KEY
+        apiKey: process.env.PPLX_API_KEY
     },
     system: 'You are my personal assistant.'
 }));
@@ -32,25 +29,27 @@ mmix.attach(new MixOllama({
     }
 }));
 
+mmix.replace({ '{name}': 'ALF' });
 
 console.log("\n" + '--------| gpt-4o |--------');
-const gpt = mmix.create('gpt-4o', { temperature: 0.5 }).addText("Have you ever eaten a cat?");
+const gpt = mmix.create('gpt-4o', { temperature: 0.5 }).addText("Have you ever eaten a {animal}?");
+gpt.replace({ '{animal}': 'cat' });
 console.log(await gpt.message());
 
-console.log("\n" + '--------| claude-3-sonnet-20240229 |--------');
-const claude = mmix.create('claude-3-sonnet-20240229', { temperature: 0.5 });
-claude.addImage('./watson.png');
+console.log("\n" + '--------| claude-3-5-sonnet-20240620 |--------');
+const claude = mmix.create('claude-3-5-sonnet-20240620', { temperature: 0.5 });
+claude.addImage('./watson.jpg');
 const imageDescription = await claude.addText('describe the image').message();
 console.log(imageDescription);
 
-console.log("\n" + '--------| pplx-70b-online |--------');
-const pplx = mmix.create('pplx-70b-online', { max_tokens: 500 });
+console.log("\n" + '--------| llama-3-sonar-large-32k-online |--------');
+const pplx = mmix.create('llama-3-sonar-large-32k-online', { max_tokens: 500 });
 pplx.addText('How much is ETH trading in USD?');
 const news = await pplx.addText('What are the 3 most recent Ethereum news?').message();
 console.log(news);
 
 console.log("\n" + '--------| ollama (llava:latest) |--------');
 await mmix.create('llava:latest')
-    .addImage('./watson.png')
+    .addImage('./watson.jpg')
     .addText('what is the predominant color?')
     .stream((data) => { console.log(data.message); });

package/demo/groq.mjs

@@ -0,0 +1,24 @@
+import 'dotenv/config'
+
+import { ModelMix, MixGroq } from '../index.js';
+
+const env = process.env;
+
+const mmix = new ModelMix({
+    options: {
+        max_tokens: 200,
+    },
+    config: {
+        system: 'You are ALF from Melmac.',
+        max_history: 2
+    }
+});
+
+mmix.attach(new MixGroq({
+    config: {
+        apiKey: env.GROQ_API_KEY,
+    }
+}));
+
+const r = await mmix.create('llama3-70b-8192').addText('do you like cats?').message();
+console.log(r)

package/demo/lmstudio.mjs

@@ -25,6 +25,6 @@ mmix.attach(model);
 
 const LMS = mmix.create('Orenguteng/Llama-3-8B-Lexi-Uncensored-GGUF');
 console.log(await LMS
-    .addImage('./watson.png')
+    .addImage('./watson.jpg')
     .addText('describir')
     .message());

package/demo/package-lock.json

@@ -10,9 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.20.9",
-        "dotenv": "^16.4.5",
-        "lemonlog": "^1.1.2",
-        "openai": "^4.47.1"
+        "dotenv": "^16.4.5"
       }
     },
     ".api/apis/pplx": {
@@ -95,27 +93,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -189,14 +166,6 @@
         "ms": "^2.0.0"
       }
     },
-    "node_modules/lemonlog": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/lemonlog/-/lemonlog-1.1.2.tgz",
-      "integrity": "sha512-ztAM2mVrr9+CLoKvXKCJeGb6jNNDZUnATlcIouFuj7ymyNKXXZhx4gXyQ5lsW6oLx5KXKb/vLclXVdcqJ5sHVA==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      }
-    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -258,24 +227,6 @@
         }
       }
     },
-    "node_modules/openai": {
-      "version": "4.47.1",
-      "resolved": "https://registry.npmjs.org/openai/-/openai-4.47.1.tgz",
-      "integrity": "sha512-WWSxhC/69ZhYWxH/OBsLEirIjUcfpQ5+ihkXKp06hmeYXgBBIUCa9IptMzYx6NdkiOCsSGYCnTIsxaic3AjRCQ==",
-      "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"
-      },
-      "bin": {
-        "openai": "bin/cli"
-      }
-    },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",

package/demo/package.json

@@ -10,8 +10,6 @@
   "license": "ISC",
   "dependencies": {
     "@anthropic-ai/sdk": "^0.20.9",
-    "dotenv": "^16.4.5",
-    "lemonlog": "^1.1.2",
-    "openai": "^4.47.1"
+    "dotenv": "^16.4.5"
   }
 }

package/demo/stream.mjs

@@ -52,17 +52,17 @@ mmix.attach(new MixOllama({
 
 
 await mmix.create('gpt-4o')
-    .addImage('./watson.png')
+    .addImage('./watson.jpg')
     .addText('describe')
     .stream((data) => { console.log(data.message); });
 
 await mmix.create('claude-3-haiku-20240307')
-    .addImage('./watson.png')
+    .addImage('./watson.jpg')
     .addText('describe')
     .stream((data) => { console.log(data.message); });
 
 await mmix.create('llava:latest')
-    .addImage('./watson.png')
+    .addImage('./watson.jpg')
     .addText('describe')
     .stream((data) => { console.log(data.message); });
 

package/index.js

@@ -20,6 +20,11 @@ class ModelMix {
         }
     }
 
+    replace(keyValues) {
+        this.config.replace = keyValues;
+        return this;
+    }
+
     attach(modelInstance) {
         const key = modelInstance.config.prefix.join("_");
         this.models[key] = modelInstance;
@@ -151,6 +156,15 @@ class MessageHandler {
         return this.execute();
     }
 
+    replace(keyValues) {
+        this.config.replace = { ...this.config.replace, ...keyValues };
+        return this;
+    }
+
+    template(input, replace) {
+        return input.split(/([¿?¡!,"';:\.\s])/).map(x => x in replace ? replace[x] : x).join("");
+    }
+
     groupByRoles(messages) {
         return messages.reduce((acc, message) => {
             const existingRole = acc.find(item => item.role === message.role);
@@ -163,7 +177,27 @@ class MessageHandler {
         }, []);
     }
 
+    applyTemplate() {
+        if (!this.config.replace) return;
+
+        this.config.system = this.template(this.config.system, this.config.replace)
+
+        this.messages = this.messages.map(message => {
+            if (message.content instanceof Array) {
+                message.content = message.content.map(content => {
+                    if (content.type === 'text') {
+                        content.text = this.template(content.text, this.config.replace)
+                    }
+                    return content;
+                });
+            }
+            return message;
+        });
+    }
+
     async execute() {
+
+        this.applyTemplate();
         this.messages = this.messages.slice(-this.config.max_history);
         this.messages = this.groupByRoles(this.messages);
 
@@ -285,6 +319,7 @@ class MixOpenAI extends MixCustom {
         return super.getDefaultConfig({
             url: 'https://api.openai.com/v1/chat/completions',
             prefix: ['gpt'],
+            apiKey: process.env.OPENAI_API_KEY,
             ...customConfig
         });
     }
@@ -321,6 +356,7 @@ class MixAnthropic extends MixCustom {
         return super.getDefaultConfig({
             url: 'https://api.anthropic.com/v1/messages',
             prefix: ['claude'],
+            apiKey: process.env.ANTHROPIC_API_KEY,
             ...customConfig
         });
     }
@@ -347,7 +383,8 @@ class MixPerplexity extends MixCustom {
     getDefaultConfig(customConfig) {
         return super.getDefaultConfig({
             url: 'https://api.perplexity.ai/chat/completions',
-            prefix: ['pplx', 'llama', 'mixtral'],
+            prefix: ['llama-3', 'mixtral'],
+            apiKey: process.env.PPLX_API_KEY,
             ...customConfig
         });
     }
@@ -424,8 +461,23 @@ class MixLMStudio extends MixCustom {
         args.options.messages = MixOpenAI.convertMessages(args.options.messages);
         return super.create(args);
     }
+}
 
+class MixGroq extends MixCustom {
+    getDefaultConfig(customConfig) {
+        return super.getDefaultConfig({
+            url: 'https://api.groq.com/openai/v1/chat/completions',
+            prefix: ["llama", "mixtral", "gemma"],
+            apiKey: process.env.GROQ_API_KEY,
+            ...customConfig
+        });
+    }
 
+    create(args = { config: {}, options: {} }) {
+        args.options.messages = [{ role: 'system', content: args.config.system }, ...args.options.messages || []];
+        args.options.messages = MixOpenAI.convertMessages(args.options.messages);
+        return super.create(args);
+    }
 }
 
-module.exports = { MixCustom, ModelMix, MixAnthropic, MixOpenAI, MixPerplexity, MixOllama, MixLMStudio };
+module.exports = { MixCustom, ModelMix, MixAnthropic, MixOpenAI, MixPerplexity, MixOllama, MixLMStudio, MixGroq };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "2.2.4",
+  "version": "2.3.2",
   "description": "🧬 ModelMix - Unified API for Diverse AI Language Models.",
   "main": "index.js",
   "repository": {
@@ -15,6 +15,7 @@
     "anthropic",
     "pplx",
     "perplexity",
+    "sonnet-3-5",
     "gpt",
     "claude",
     "llama",
@@ -22,6 +23,7 @@
     "nlp",
     "chat",
     "multimodal",
+    "groq",
     "omni",
     "4o",
     "ollama",
@@ -36,4 +38,4 @@
   "dependencies": {
     "axios": "^1.6.8"
   }
-}
+}