modelmix 2.4.6 → 2.5.2

package/README.md

@@ -80,45 +80,42 @@ Here's a quick example to get you started:
 
 3. **Generate responses from different models**:
 
+    #### gpt-4o-mini
     ```javascript
-    console.log("\n" + '--------| gpt-4o |--------');
-    const gpt = mmix.create('gpt-4o', { temperature: 0.5 });
+    const gpt = mmix.create('gpt-4o-mini', { options: { temperature: 0 } });
     gpt.addText("Have you ever eaten a {animal}?");
     gpt.replace({ '{animal}': 'cat' });
     console.log(await gpt.message());
     ```
 
+    #### claude-3-5-sonnet-20240620 (writer)
     ```javascript
-    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);
+    const writer = mmix.create('claude-3-5-sonnet-20240620', { options: { temperature: 0.5 } });
+    writer.setSystem('You are a writer like Stephen King'); // or setSystemFromFile
     writer.replace({ '{story_title}': 'The Mysterious Package' })
     // or write.replaceKeyFromFile('{story_title}', './title.md');
     const story = await writer.addTextFromFile('./prompt.md').message();
     console.log(story);
     ```
-
+    #### claude-3-5-sonnet-20240620 (image)
     ```javascript
-    console.log("\n" + '--------| [image] claude-3-5-sonnet-20240620 |--------');
-    const claude = mmix.create('claude-3-5-sonnet-20240620', { temperature: 0.5 });
+    console.log("\n" + '--------|  |--------');
+    const claude = mmix.create('claude-3-5-sonnet-20240620', { options: { temperature: 0 } });
     claude.addImage("./watson.jpg"); // or claude.addImageFromUrl(url)
     const imageDescription = await claude.addText("Describe the image").message();
     console.log(imageDescription);
     ```
 
+    #### pplx-70b-online
     ```javascript
-    console.log("\n" + '--------| pplx-70b-online |--------');
-    const pplx = mmix.create('pplx-70b-online', { max_tokens: 500 });
+    const pplx = mmix.create('pplx-70b-online', { config: { 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);
     ```
 
+    #### ollama (llava:latest)
     ```javascript
-    console.log("\n" + '--------| ollama (llava:latest) |--------');
     await mmix.create('llava:latest')
         .addImage("./watson.jpg")
         .addText("What is the predominant color?")

package/demo/demo.mjs

@@ -17,9 +17,10 @@ mmix.attach(new MixOpenAI());
 mmix.attach(new MixAnthropic());
 mmix.attach(new MixPerplexity({
     config: {
-        apiKey: process.env.PPLX_API_KEY
+        apiKey: process.env.PPLX_API_KEY,
+        system: 'You are my personal assistant.'
     },
-    system: 'You are my personal assistant.'
+    
 }));
 mmix.attach(new MixOllama({
     config: {
@@ -33,28 +34,25 @@ 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 {animal}?");
+const gpt = mmix.create('gpt-4o', { options: { temperature: 0 } }).addText("Have you ever eaten a {animal}?");
 gpt.replace({ '{animal}': 'cat' });
 console.log(await gpt.message());
 
 console.log("\n" + '--------| claude-3-5-sonnet-20240620 |--------');
-const claude = mmix.create('claude-3-5-sonnet-20240620', { temperature: 0.5 });
+const claude = mmix.create('claude-3-5-sonnet-20240620', { options: { temperature: 0 } });
 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" + '--------| 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);
+const writer = mmix.create('claude-3-5-sonnet-20240620', { options: { temperature: 0.5 } });
+writer.setSystem('You are a writer like Stephen King');
 writer.replaceKeyFromFile('{story_title}', './title.md');
 const story = await writer.addTextFromFile('./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 });
+const pplx = mmix.create('llama-3-sonar-large-32k-online', { config: { 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);

package/index.js

@@ -120,6 +120,21 @@ class MessageHandler {
         return this;
     }
 
+    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;
+    }    
+
     addImage(filePath, config = { role: "user" }) {
         try {
             const imageBuffer = fs.readFileSync(filePath);
@@ -320,25 +335,51 @@ class MixCustom {
     }
 
     async create(args = { config: {}, options: {} }) {
+        try {
+            if (args.config.debug) {
+                log.debug("config");
+                log.info(args.config);
+                log.debug("options");
+                log.inspect(args.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,
+                    responseType: 'stream'
+                }));
+            } else {
+                return this.processResponse(await axios.post(this.config.url, args.options, {
+                    headers: this.headers
+                }));
+            }
+        } catch (error) {
+            throw this.handleError(error, args);
         }
+    }
+
+    handleError(error, args) {
+        let errorMessage = 'An error occurred in MixCustom';
+        let statusCode = null;
+        let errorDetails = null;
 
-        if (args.options.stream) {
-            return this.processStream(await axios.post(this.config.url, args.options, {
-                headers: this.headers,
-                responseType: 'stream'
-            }));
-        } else {
-            return this.processResponse(await axios.post(this.config.url, args.options, {
-                headers: this.headers
-            }));
+        if (error.isAxiosError) {
+            statusCode = error.response ? error.response.status : null;
+            errorMessage = `Request to ${this.config.url} failed with status code ${statusCode}`;
+            errorDetails = error.response ? error.response.data : null;
         }
-    }
+
+        const formattedError = {
+            message: errorMessage,
+            statusCode,
+            details: errorDetails,
+            stack: error.stack,
+            config: args.config,
+            options: args.options
+        };
+
+        return formattedError;
+    } 
 
     processStream(response) {
         return new Promise((resolve, reject) => {
@@ -434,11 +475,11 @@ class MixAnthropic extends MixCustom {
         });
     }
 
-    getDefaultHeaders(getDefaultHeaders) {
+    getDefaultHeaders(customHeaders) {
         return super.getDefaultHeaders({
             'x-api-key': this.config.apiKey,
             'anthropic-version': '2023-06-01',
-            ...getDefaultHeaders
+            ...customHeaders
         });
     }
 
@@ -450,6 +491,11 @@ class MixAnthropic extends MixCustom {
     processResponse(response) {
         return { response: response.data, message: response.data.content[0].text };
     }
+
+    create(args = { config: {}, options: {} }) {
+        args.options.system = args.config.system;
+        return super.create(args);
+    }    
 }
 
 class MixPerplexity extends MixCustom {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "2.4.6",
+  "version": "2.5.2",
   "description": "🧬 ModelMix - Unified API for Diverse AI LLM.",
   "main": "index.js",
   "repository": {
@@ -24,7 +24,7 @@
     "chat",
     "multimodal",
     "groq",
-    "omni",
+    "gpt-4o-mini",
     "4o",
     "ollama",
     "lmstudio"