modelmix 2.2.8 → 2.3.8

package/README.md

@@ -5,7 +5,7 @@
 ## ✨ 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 (`max_request`).
+- **Request Control**: Manage the number of parallel requests to adhere to provider limitations with `max_request`.
 - **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`.
 
@@ -17,7 +17,7 @@ First, install the ModelMix package:
 npm install modelmix
 ```
 
-Also, install dotenv to manage environment variables:
+Optional: install dotenv to manage environment variables:
 
 ```bash
 npm install dotenv
@@ -51,6 +51,7 @@ Here's a quick example to get you started:
             system: "You are {name} from Melmac.",
             max_history: 2,
             max_request: 1,
+            debug: true
         }
     });
 
@@ -85,9 +86,19 @@ Here's a quick example to get you started:
     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" + '--------| [writer] claude-3-5-sonnet-20240620 |--------');
+    const setup = {
+        config: { system: "You are a writer like Stephen King" },
+        options: { temperature: 0.5 }
+    }
+    const writer = mmix.create('claude-3-5-sonnet-20240620', setup);
+    writer.replace({ '{story_title}': 'The Mysterious Package' })
+    const story = await writer.addTextFile('./prompt.md').message();
+    console.log(story);
+
+    console.log("\n" + '--------| [image] claude-3-5-sonnet-20240620 |--------');
+    const claude = mmix.create('claude-3-5-sonnet-20240620', { temperature: 0.5 });
+    claude.addImage("./watson.jpg"); // or claude.addImageFromUrl(url)
     const imageDescription = await claude.addText("Describe the image").message();
     console.log(imageDescription);
 
@@ -99,7 +110,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); });
     ```
@@ -134,7 +145,9 @@ new ModelMix(args = { options: {}, config: {} })
 
 - `new()`: Initializes a new message handler instance.
 - `addText(text, config = { role: "user" })`: Adds a text message.
+- `addTextFile(filePath, config = { role: "user" })`: Adds a text message from a file path.
 - `addImage(filePath, config = { role: "user" })`: Adds an image message from a file path.
+- `addImageFromUrl(url, config = { role: "user" })`: Adds an image message from URL.
 - `message()`: Sends the message and returns the response.
 - `raw()`: Sends the message and returns the raw response data.
 - `stream(callback)`: Sends the message and streams the response, invoking the callback with each streamed part.

package/demo/demo.mjs

@@ -1,8 +1,6 @@
 import 'dotenv/config';
 import { ModelMix, MixOpenAI, MixAnthropic, MixPerplexity, MixOllama } from '../index.js';
 
-const env = process.env;
-
 const mmix = new ModelMix({
     options: {
         max_tokens: 200,
@@ -11,15 +9,15 @@ const mmix = new ModelMix({
         system: 'You are {name} from Melmac.',
         max_history: 2,
         max_request: 1,
+        debug: true,
     }
 });
 
-
-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.'
 }));
@@ -39,20 +37,30 @@ const gpt = mmix.create('gpt-4o', { temperature: 0.5 }).addText("Have you ever e
 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.addImageFromUrl('https://pbs.twimg.com/media/F6-GsjraAAADDGy?format=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" + '--------| claude-3-5-sonnet-20240620 |--------');
+const setup = {
+    config: { system: "You are a writer like Stephen King" },
+    options: { temperature: 0.5 }
+}
+const writer = mmix.create('claude-3-5-sonnet-20240620', setup);
+writer.replace({ '{story_title}': 'The Mysterious Package' })
+const story = await writer.addTextFile('./prompt.md').message();
+console.log(story);
+
+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')
-    .addText('what is the predominant color?')
-    .stream((data) => { console.log(data.message); });
+// console.log("\n" + '--------| ollama (llava:latest) |--------');
+// await mmix.create('llava:latest')
+//     .addImage('./watson.jpg')
+//     .addText('what is the predominant color?')
+//     .stream((data) => { console.log(data.message); });

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/node_modules/.package-lock.json

@@ -84,27 +84,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",
@@ -178,14 +157,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",
@@ -247,24 +218,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-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/prompt.md

@@ -0,0 +1,25 @@
+# Writing Prompt: {story_title}
+
+## Setting
+A small, quiet town where nothing unusual ever happens.
+
+## Main Character
+You are a postal worker who has worked in this town for over 20 years.
+
+## Situation
+One day, you come across a package with these unusual characteristics:
+- No return address
+- Addressed to a person who doesn't exist in town
+- Emits a faint, pulsing glow
+- Feels unusually warm to the touch
+
+## Writing Task
+Write a short story (500-1000 words) that explores:
+1. Your character's decision on what to do with the package
+2. The consequences of that decision
+3. The ultimate revelation of what's inside the package and its significance
+
+### Additional Elements to Consider
+- The reactions of other townspeople
+- Any changes in the town's atmosphere after the package's arrival
+- Your character's internal conflict between curiosity and duty

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

@@ -1,6 +1,7 @@
 const axios = require('axios');
 const fs = require('fs');
 const mime = require('mime-types');
+const log = require('lemonlog')('ModelMix');
 
 class ModelMix {
     constructor(args = { options: {}, config: {} }) {
@@ -16,6 +17,7 @@ class ModelMix {
             system: 'You are an assistant.',
             max_request: 1,
             max_history: 5, // Default max history
+            debug: false,
             ...args.config
         }
     }
@@ -89,6 +91,9 @@ class MessageHandler {
         this.options = options;
         this.config = config;
         this.messages = [];
+
+        this.filesToProcess = [];
+        this.imagesToProcess = [];
     }
 
     new() {
@@ -106,6 +111,11 @@ class MessageHandler {
         return this;
     }
 
+    addTextFile(filePath, config = { role: "user" }) {
+        this.filesToProcess.push({ filePath, config });
+        return this;
+    }
+
     addImage(filePath, config = { role: "user" }) {
         try {
             const imageBuffer = fs.readFileSync(filePath);
@@ -139,6 +149,66 @@ class MessageHandler {
         return this;
     }
 
+    addImageFromUrl(url, config = { role: "user" }) {
+        this.imagesToProcess.push({ url, config });
+        return this;
+    }
+
+    async processTextFiles() {
+        const fileContents = await Promise.all(
+            this.filesToProcess.map(async (file) => {
+                try {
+                    const content = fs.readFileSync(file.filePath).toString();
+                    return { content, config: file.config };
+                } catch (error) {
+                    console.error(`Error leyendo archivo ${file.filePath}:`, error);
+                    return null;
+                }
+            })
+        );
+
+        fileContents.forEach((file) => {
+            if (file) {
+                this.addText(file.content, file.config);
+            }
+        });
+    }
+
+    async processImageUrls() {
+        const imageContents = await Promise.all(
+            this.imagesToProcess.map(async (image) => {
+                try {
+                    const response = await axios.get(image.url, { responseType: 'arraybuffer' });
+                    const base64 = Buffer.from(response.data, 'binary').toString('base64');
+                    const mimeType = response.headers['content-type'];
+                    return { base64, mimeType, config: image.config };
+                } catch (error) {
+                    console.error(`Error descargando imagen desde ${image.url}:`, error);
+                    return null;
+                }
+            })
+        );
+
+        imageContents.forEach((image) => {
+            if (image) {
+                const imageMessage = {
+                    ...image.config,
+                    content: [
+                        {
+                            type: "image",
+                            "source": {
+                                type: "base64",
+                                media_type: image.mimeType,
+                                data: image.base64
+                            }
+                        }
+                    ]
+                };
+                this.messages.push(imageMessage);
+            }
+        });
+    }
+
     async message() {
         this.options.stream = false;
         const response = await this.execute();
@@ -197,12 +267,17 @@ class MessageHandler {
 
     async execute() {
 
+        await Promise.all([
+            this.processTextFiles(),
+            this.processImageUrls()
+        ]);
+
         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 addMessage(prompt) to add a message.");
+            throw new Error("No user messages have been added. Use addText(prompt), addTextFile(filePath), addImage(filePath), or addImageFromUrl(url) to add a prompt.");
         }
 
         this.options.messages = this.messages;
@@ -255,6 +330,13 @@ class MixCustom {
 
     async create(args = { config: {}, options: {} }) {
 
+        if (args.config.debug) {
+            log.info("config");
+            log.info(args.config);
+            log.inspect("options");
+            log.inspect(args.options);
+        }
+
         if (args.options.stream) {
             return this.processStream(await axios.post(this.config.url, args.options, {
                 headers: this.headers,
@@ -319,6 +401,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
         });
     }
@@ -355,6 +438,7 @@ class MixAnthropic extends MixCustom {
         return super.getDefaultConfig({
             url: 'https://api.anthropic.com/v1/messages',
             prefix: ['claude'],
+            apiKey: process.env.ANTHROPIC_API_KEY,
             ...customConfig
         });
     }
@@ -381,7 +465,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
         });
     }
@@ -465,6 +550,7 @@ class MixGroq extends MixCustom {
         return super.getDefaultConfig({
             url: 'https://api.groq.com/openai/v1/chat/completions',
             prefix: ["llama", "mixtral", "gemma"],
+            apiKey: process.env.GROQ_API_KEY,
             ...customConfig
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "2.2.8",
+  "version": "2.3.8",
   "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",
@@ -35,6 +36,7 @@
   },
   "homepage": "https://github.com/clasen/ModelMix#readme",
   "dependencies": {
-    "axios": "^1.6.8"
+    "axios": "^1.6.8",
+    "lemonlog": "^1.1.2"
   }
 }

package/demo/node_modules/debug/LICENSE

@@ -1,20 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2014-2017 TJ Holowaychuk <tj@vision-media.ca>
-Copyright (c) 2018-2021 Josh Junon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the 'Software'), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-