modelmix 2.0.0 → 2.2.0

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, or custom models.
+- **Flexible Integration**: Easily integrate popular models like OpenAI, Anthropic, Perplexity, 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
@@ -192,6 +192,17 @@ new MixPerplexity(args = { config: {}, options: {} })
 new MixOllama(args = { config: {}, options: {} })
 ```
 
+- **args**: Configuration object with `config` and `options` properties.
+  - **config**: Specific configuration settings for Ollama.
+    - `url`: The endpoint URL to which the model sends requests.
+  - **options**: Default options for Ollama model instances.
+
+### MixLMStudio Class Overview
+
+```javascript
+new MixLMStudio(args = { config: {}, options: {} })
+```
+
 - **args**: Configuration object with `config` and `options` properties.
   - **config**: Specific configuration settings for Ollama.
     - `url`: The endpoint URL to which the model sends requests.

package/demo/demo.mjs

@@ -25,7 +25,6 @@ mmix.attach(new MixPerplexity({
 }));
 mmix.attach(new MixOllama({
     config: {
-        url: 'http://localhost:11434/api/chat',
         prefix: ['llava'],
     },
     options: {

package/demo/lmstudio.mjs

@@ -0,0 +1,30 @@
+import { ModelMix, MixLMStudio } from '../index.js';
+
+const mmix = new ModelMix({
+    options: {
+        max_tokens: -1,
+    },
+    config: {
+        max_history: 2,
+        max_request: 1,
+    }
+});
+
+const model = new MixLMStudio({
+    config: {
+        prefix: ['Orenguteng'],
+    },
+    options: {
+        repeat_penalty: 1,
+    }
+});
+console.log(model.config)
+
+mmix.attach(model);
+
+
+const LMS = mmix.create('Orenguteng/Llama-3-8B-Lexi-Uncensored-GGUF');
+console.log(await LMS
+    .addImage('./watson.png')
+    .addText('describir')
+    .message());

package/demo/stream.mjs

@@ -75,13 +75,3 @@ await mmix.create('openhermes2-mistral:latest')
     .stream((data) => { console.log(data.message); });
 
 console.log(r)
-
-
-
-// await mmix.create('claude-3-haiku-20240307')
-//     // .addImage("./watson.png")
-//     .addText("hola!").stream((data) => {
-//         console.log("Streaming data:", data);
-//     });
-
-// console.log(await gpt.raw());

package/index.js

@@ -25,6 +25,7 @@ class ModelMix {
         this.models[key] = modelInstance;
         modelInstance.queue = [];
         modelInstance.active_requests = 0;
+        return this;
     }
 
     create(modelKey, overOptions = {}) {
@@ -276,20 +277,20 @@ class MixCustom {
 
 class MixOpenAI extends MixCustom {
     getDefaultConfig(customConfig) {
-        return {
-            ...super.getDefaultConfig(customConfig),
+        return super.getDefaultConfig({
             url: 'https://api.openai.com/v1/chat/completions',
-            prefix: ['gpt']
-        };
+            prefix: ['gpt'],
+            ...customConfig
+        });
     }
 
     create(args = { config: {}, options: {} }) {
         args.options.messages = [{ role: 'system', content: args.config.system }, ...args.options.messages || []];
-        args.options.messages = this.convertMessages(args.options.messages);
+        args.options.messages = MixOpenAI.convertMessages(args.options.messages);
         return super.create(args);
     }
 
-    convertMessages(messages) {
+    static convertMessages(messages) {
         return messages.map(message => {
             if (message.role === 'user' && message.content instanceof Array) {
                 message.content = message.content.map(content => {
@@ -312,19 +313,19 @@ class MixOpenAI extends MixCustom {
 
 class MixAnthropic extends MixCustom {
     getDefaultConfig(customConfig) {
-        return {
-            ...super.getDefaultConfig(customConfig),
+        return super.getDefaultConfig({
             url: 'https://api.anthropic.com/v1/messages',
-            prefix: ['claude']
-        };
+            prefix: ['claude'],
+            ...customConfig
+        });
     }
 
-    getDefaultHeaders() {
-        return {
-            ...super.getDefaultHeaders(),
+    getDefaultHeaders(getDefaultHeaders) {
+        return super.getDefaultHeaders({
             'x-api-key': this.config.apiKey,
-            'anthropic-version': '2023-06-01'
-        };
+            'anthropic-version': '2023-06-01',
+            ...getDefaultHeaders
+        });
     }
 
     extractDelta(data) {
@@ -339,11 +340,11 @@ class MixAnthropic extends MixCustom {
 
 class MixPerplexity extends MixCustom {
     getDefaultConfig(customConfig) {
-        return {
-            ...super.getDefaultConfig(customConfig),
+        return super.getDefaultConfig({
             url: 'https://api.perplexity.ai/chat/completions',
-            prefix: ['pplx', 'llama', 'mixtral']
-        };
+            prefix: ['pplx', 'llama', 'mixtral'],
+            ...customConfig
+        });
     }
 
     create(args = { config: {}, options: {} }) {
@@ -354,6 +355,13 @@ class MixPerplexity extends MixCustom {
 
 class MixOllama extends MixCustom {
 
+    getDefaultConfig(customConfig) {
+        return super.getDefaultConfig({
+            url: 'http://localhost:11434/api/chat',
+            ...customConfig
+        });
+    }
+
     getDefaultOptions(customOptions) {
         return {
             options: customOptions,
@@ -367,7 +375,7 @@ class MixOllama extends MixCustom {
 
     create(args = { config: {}, options: {} }) {
 
-        args.options.messages = this.convertMessages(args.options.messages);
+        args.options.messages = MixOllama.convertMessages(args.options.messages);
         args.options.messages = [{ role: 'system', content: args.config.system }, ...args.options.messages || []];
         return super.create(args);
     }
@@ -376,7 +384,7 @@ class MixOllama extends MixCustom {
         return { response: response.data, message: response.data.message.content.trim() };
     }
 
-    convertMessages(messages) {
+    static convertMessages(messages) {
         return messages.map(entry => {
             let content = '';
             let images = [];
@@ -398,4 +406,21 @@ class MixOllama extends MixCustom {
     }
 }
 
-module.exports = { MixCustom, ModelMix, MixAnthropic, MixOpenAI, MixPerplexity, MixOllama };
+class MixLMStudio extends MixCustom {
+    getDefaultConfig(customConfig) {
+        return super.getDefaultConfig({
+            url: 'http://localhost:1234/v1/chat/completions',
+            ...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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "🧬 ModelMix - Unified API for Diverse AI Language Models.",
   "main": "index.js",
   "repository": {
@@ -24,7 +24,8 @@
     "multimodal",
     "omni",
     "4o",
-    "ollama"
+    "ollama",
+    "lmstudio"
   ],
   "author": "Martin Clasen",
   "license": "MIT",