modelmix 3.8.6 → 3.9.0

package/README.md

@@ -126,9 +126,8 @@ Here's a comprehensive list of available methods:
 | `o3()`             | OpenAI     | o3                             | [\$10.00 / \$40.00][1]     |
 | `gptOss()`         | Together   | gpt-oss-120B                   | [\$0.15 / \$0.60][7]       |
 | `opus41[think]()`  | Anthropic  | claude-opus-4-1-20250805       | [\$15.00 / \$75.00][2]     |
+| `sonnet45[think]()`| Anthropic  | claude-sonnet-4-5-20250929     | [\$3.00 / \$15.00][2]      |
 | `sonnet4[think]()` | Anthropic  | claude-sonnet-4-20250514       | [\$3.00 / \$15.00][2]      |
-| `sonnet37[think]()`| Anthropic  | claude-3-7-sonnet-20250219     | [\$3.00 / \$15.00][2]      |
-| `sonnet35()`       | Anthropic  | claude-3-5-sonnet-20241022     | [\$3.00 / \$15.00][2]      |
 | `haiku35()`        | Anthropic  | claude-3-5-haiku-20241022      | [\$0.80 / \$4.00][2]       |
 | `gemini25flash()`   | Google     | gemini-2.5-flash-preview-04-17  | [\$0.00 / \$0.00][3]       |
 | `gemini25proExp()` | Google     | gemini-2.5-pro-exp-03-25       | [\$0.00 / \$0.00][3]       |
@@ -331,7 +330,6 @@ new ModelMix(args = { options: {}, config: {} })
   - **options**: This object contains default options that are applied to all models. These options can be overridden when creating a specific model instance. Examples of default options include:
     - `max_tokens`: Sets the maximum number of tokens to generate, e.g., 2000.
     - `temperature`: Controls the randomness of the model's output, e.g., 1.
-    - `top_p`: Controls the diversity of the output, e.g., 1.
     - ...(Additional default options can be added as needed)
   - **config**: This object contains configuration settings that control the behavior of the `ModelMix` instance. These settings can also be overridden for specific model instances. Examples of configuration settings include:
     - `system`: Sets the default system message for the model, e.g., "You are an assistant."

package/index.js

@@ -21,7 +21,6 @@ class ModelMix {
         this.options = {
             max_tokens: 5000,
             temperature: 1, // 1 --> More creative, 0 --> More deterministic.
-            top_p: 1, // 100% --> The model considers all possible tokens.
             ...options
         };
 
@@ -100,21 +99,14 @@ class ModelMix {
     }
     gpt5nano({ options = {}, config = {} } = {}) {
         return this.attach('gpt-5-nano', new MixOpenAI({ options, config }));
-    }    
+    }
     gptOss({ options = {}, config = {}, mix = { together: false, cerebras: false, groq: true } } = {}) {
         if (mix.together) return this.attach('openai/gpt-oss-120b', new MixTogether({ options, config }));
         if (mix.cerebras) return this.attach('gpt-oss-120b', new MixCerebras({ options, config }));
         if (mix.groq) return this.attach('openai/gpt-oss-120b', new MixGroq({ options, config }));
         return this;
     }
-    
-    opus4think({ options = {}, config = {} } = {}) {
-        options = { ...MixAnthropic.thinkingOptions, ...options };
-        return this.attach('claude-opus-4-20250514', new MixAnthropic({ options, config }));
-    }
-    opus4({ options = {}, config = {} } = {}) {
-        return this.attach('claude-opus-4-20250514', new MixAnthropic({ options, config }));
-    }
+
     opus41({ options = {}, config = {} } = {}) {
         return this.attach('claude-opus-4-1-20250805', new MixAnthropic({ options, config }));
     }
@@ -129,6 +121,13 @@ class ModelMix {
         options = { ...MixAnthropic.thinkingOptions, ...options };
         return this.attach('claude-sonnet-4-20250514', new MixAnthropic({ options, config }));
     }
+    sonnet45({ options = {}, config = {} } = {}) {
+        return this.attach('claude-sonnet-4-5-20250929', new MixAnthropic({ options, config }));
+    }
+    sonnet45think({ options = {}, config = {} } = {}) {
+        options = { ...MixAnthropic.thinkingOptions, ...options };
+        return this.attach('claude-sonnet-4-5-20250929', new MixAnthropic({ options, config }));
+    }
     sonnet37({ options = {}, config = {} } = {}) {
         return this.attach('claude-3-7-sonnet-20250219', new MixAnthropic({ options, config }));
     }
@@ -136,9 +135,6 @@ class ModelMix {
         options = { ...MixAnthropic.thinkingOptions, ...options };
         return this.attach('claude-3-7-sonnet-20250219', new MixAnthropic({ options, config }));
     }
-    sonnet35({ options = {}, config = {} } = {}) {
-        return this.attach('claude-3-5-sonnet-20241022', new MixAnthropic({ options, config }));
-    }
     haiku35({ options = {}, config = {} } = {}) {
         return this.attach('claude-3-5-haiku-20241022', new MixAnthropic({ options, config }));
     }
@@ -252,7 +248,7 @@ class ModelMix {
 
     addImage(filePath, { role = "user" } = {}) {
         const absolutePath = path.resolve(filePath);
-        
+
         if (!fs.existsSync(absolutePath)) {
             throw new Error(`Image file not found: ${filePath}`);
         }
@@ -286,11 +282,11 @@ class ModelMix {
             }
         } else {
             source = {
-                type: "url", 
+                type: "url",
                 data: url
             };
         }
-        
+
         this.messages.push({
             role,
             content: [{
@@ -298,7 +294,7 @@ class ModelMix {
                 source
             }]
         });
-        
+
         return this;
     }
 
@@ -473,28 +469,28 @@ class ModelMix {
     async prepareMessages() {
         await this.processImages();
         this.applyTemplate();
-        
+
         // Smart message slicing to preserve tool call sequences
         if (this.config.max_history > 0) {
             let sliceStart = Math.max(0, this.messages.length - this.config.max_history);
-            
+
             // If we're slicing and there's a tool message at the start, 
             // ensure we include the preceding assistant message with tool_calls
-            while (sliceStart > 0 && 
-                   sliceStart < this.messages.length && 
-                   this.messages[sliceStart].role === 'tool') {
+            while (sliceStart > 0 &&
+                sliceStart < this.messages.length &&
+                this.messages[sliceStart].role === 'tool') {
                 sliceStart--;
                 // Also need to include the assistant message with tool_calls
-                if (sliceStart > 0 && 
-                    this.messages[sliceStart].role === 'assistant' && 
+                if (sliceStart > 0 &&
+                    this.messages[sliceStart].role === 'assistant' &&
                     this.messages[sliceStart].tool_calls) {
                     break;
                 }
             }
-            
+
             this.messages = this.messages.slice(sliceStart);
         }
-        
+
         this.messages = this.groupByRoles(this.messages);
         this.options.messages = this.messages;
     }
@@ -621,13 +617,13 @@ class ModelMix {
         for (const toolCall of toolCalls) {
             // Handle different tool call formats more robustly
             let toolName, toolArgs, toolId;
-            
+
             try {
                 if (toolCall.function) {
                     // Formato OpenAI/normalizado
                     toolName = toolCall.function.name;
-                    toolArgs = typeof toolCall.function.arguments === 'string' 
-                        ? JSON.parse(toolCall.function.arguments) 
+                    toolArgs = typeof toolCall.function.arguments === 'string'
+                        ? JSON.parse(toolCall.function.arguments)
                         : toolCall.function.arguments;
                     toolId = toolCall.id;
                 } else if (toolCall.name) {
@@ -735,7 +731,7 @@ class ModelMix {
         }
 
         this.mcpToolsManager.registerTool(toolDefinition, callback);
-        
+
         // Agregar la herramienta al sistema de tools para que sea incluida en las requests
         if (!this.tools.local) {
             this.tools.local = [];
@@ -745,7 +741,7 @@ class ModelMix {
             description: toolDefinition.description,
             inputSchema: toolDefinition.inputSchema
         });
-        
+
         return this;
     }
 
@@ -758,19 +754,19 @@ class ModelMix {
 
     removeTool(toolName) {
         this.mcpToolsManager.removeTool(toolName);
-        
+
         // Also remove from the tools system
         if (this.tools.local) {
             this.tools.local = this.tools.local.filter(tool => tool.name !== toolName);
         }
-        
+
         return this;
     }
 
     listTools() {
         const localTools = this.mcpToolsManager.getToolsForMCP();
         const mcpTools = Object.values(this.tools).flat();
-        
+
         return {
             local: localTools,
             mcp: mcpTools.filter(tool => !localTools.find(local => local.name === tool.name))
@@ -975,7 +971,7 @@ class MixOpenAI extends MixCustom {
             delete options.max_tokens;
             delete options.temperature;
         }
-        
+
         // Use max_completion_tokens and remove temperature for GPT-5 models
         if (options.model?.includes('gpt-5')) {
             if (options.max_tokens) {
@@ -1003,10 +999,10 @@ class MixOpenAI extends MixCustom {
 
             if (message.role === 'tool') {
                 for (const content of message.content) {
-                    results.push({ 
-                        role: 'tool', 
+                    results.push({
+                        role: 'tool',
                         tool_call_id: content.tool_call_id,
-                        content: content.content 
+                        content: content.content
                     })
                 }
                 continue;
@@ -1029,7 +1025,7 @@ class MixOpenAI extends MixCustom {
 
             results.push(message);
         }
-        
+
         return results;
     }
 
@@ -1080,21 +1076,10 @@ class MixAnthropic extends MixCustom {
 
     async create({ config = {}, options = {} } = {}) {
 
-        // Remove top_p for thinking
-        if (options.thinking) {
-            delete options.top_p;
-        }
-
-        if (options.model && options.model.includes('claude-opus-4-1')) {
-            if (options.temperature !== undefined && options.top_p !== undefined) {
-                delete options.top_p;
-            }
-        }
-
         delete options.response_format;
 
         options.system = config.system;
-        
+
         try {
             return await super.create({ config, options });
         } catch (error) {
@@ -1130,7 +1115,7 @@ class MixAnthropic extends MixCustom {
             }
             filteredMessages.push(messages[i]);
         }
-        
+
         return filteredMessages.map(message => {
             if (message.role === 'tool') {
                 return {
@@ -1575,10 +1560,13 @@ class MixGoogle extends MixCustom {
         options.messages = MixGoogle.convertMessages(options.messages);
 
         const generationConfig = {
-            topP: options.top_p,
             maxOutputTokens: options.max_tokens,
         }
 
+        if (options.top_p) {
+            generationConfig.topP = options.top_p;
+        }
+
         generationConfig.responseMimeType = "text/plain";
 
         const payload = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "3.8.6",
+  "version": "3.9.0",
   "description": "🧬 ModelMix - Unified API for Diverse AI LLM.",
   "main": "index.js",
   "repository": {
@@ -48,7 +48,7 @@
   "homepage": "https://github.com/clasen/ModelMix#readme",
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.11.2",
-    "axios": "^1.8.4",
+    "axios": "^1.12.2",
     "bottleneck": "^2.19.5",
     "file-type": "^16.5.4",
     "form-data": "^4.0.4",

package/test/bottleneck.test.js

@@ -6,6 +6,11 @@ const Bottleneck = require('bottleneck');
 
 describe('Rate Limiting with Bottleneck Tests', () => {
     
+    // Setup test hooks
+    if (global.setupTestHooks) {
+        global.setupTestHooks();
+    }
+    
     afterEach(() => {
         nock.cleanAll();
         sinon.restore();
@@ -57,6 +62,13 @@ describe('Rate Limiting with Bottleneck Tests', () => {
             });
         });
 
+        afterEach(async () => {
+            // Clean up bottleneck state
+            if (model && model.limiter) {
+                await model.limiter.stop({ dropWaitingJobs: true });
+            }
+        });
+
         it('should enforce minimum time between requests', async () => {
             const startTimes = [];
             
@@ -162,6 +174,13 @@ describe('Rate Limiting with Bottleneck Tests', () => {
             });
         });
 
+        afterEach(async () => {
+            // Clean up bottleneck state
+            if (model && model.limiter) {
+                await model.limiter.stop({ dropWaitingJobs: true });
+            }
+        });
+
         it('should apply rate limiting to OpenAI requests', async () => {
             const requestTimes = [];
             
@@ -240,6 +259,13 @@ describe('Rate Limiting with Bottleneck Tests', () => {
             });
         });
 
+        afterEach(async () => {
+            // Clean up bottleneck state
+            if (model && model.limiter) {
+                await model.limiter.stop({ dropWaitingJobs: true });
+            }
+        });
+
         it('should handle rate limiting with API errors', async () => {
             model.gpt4o();
             

package/test/fallback.test.js

@@ -4,6 +4,11 @@ const nock = require('nock');
 const { ModelMix } = require('../index.js');
 
 describe('Provider Fallback Chain Tests', () => {
+    
+    // Setup test hooks
+    if (global.setupTestHooks) {
+        global.setupTestHooks();
+    }
 
     afterEach(() => {
         nock.cleanAll();

package/test/live.mcp.js

@@ -528,7 +528,7 @@ describe('Live MCP Integration Tests', function () {
         it('should work with same MCP tools across different Anthropic models', async function () {
             const models = [
                 { name: 'Sonnet 4', model: ModelMix.new(setup).sonnet4() },
-                { name: 'Sonnet 3.7', model: ModelMix.new(setup).sonnet37() },
+                { name: 'Sonnet 4.5', model: ModelMix.new(setup).sonnet45() },
                 { name: 'Haiku 3.5', model: ModelMix.new(setup).haiku35() }
             ];
 

package/test/live.test.js

@@ -31,7 +31,7 @@ describe('Live Integration Tests', function () {
         });
 
         it('should process images with Anthropic Claude', async function () {
-            const model = ModelMix.new(setup).sonnet35();
+            const model = ModelMix.new(setup).sonnet45();
 
             model.addImageFromUrl(blueSquareBase64)
                 .addText('What color is this image? Answer in one word only.');
@@ -82,8 +82,8 @@ describe('Live Integration Tests', function () {
             expect(result.skills).to.be.an('array');
         });
 
-        it('should return structured JSON with Sonnet Think', async function () {
-            const model = ModelMix.new(setup).sonnet4think();
+        it('should return structured JSON with Sonnet 4.5 thinking', async function () {
+            const model = ModelMix.new(setup).sonnet45think();
 
             model.addText('Generate information about a fictional city.');
 

package/test/setup.js

@@ -39,8 +39,24 @@ global.TEST_CONFIG = {
 
 // Global cleanup function
 global.cleanup = function() {
+    // More thorough nock cleanup
     nock.cleanAll();
+    nock.restore();
+    nock.activate();
     sinon.restore();
+    
+    // Clear any pending timers and intervals
+    const highestTimeoutId = setTimeout(() => {}, 0);
+    clearTimeout(highestTimeoutId);
+    for (let i = 0; i < highestTimeoutId; i++) {
+        clearTimeout(i);
+        clearInterval(i);
+    }
+    
+    // Force garbage collection if available
+    if (global.gc) {
+        global.gc();
+    }
 };
 
 // Console override for testing (suppress debug logs unless needed)
@@ -151,6 +167,10 @@ global.testUtils = {
 // Export hooks for tests to use
 global.setupTestHooks = function() {
     beforeEach(() => {
+        // Ensure clean state before each test
+        nock.cleanAll();
+        sinon.restore();
+        
         // Disable real HTTP requests
         if (global.TEST_CONFIG.MOCK_APIS) {
             nock.disableNetConnect();
@@ -165,6 +185,11 @@ global.setupTestHooks = function() {
         if (global.TEST_CONFIG.MOCK_APIS) {
             nock.enableNetConnect();
         }
+        
+        // Force garbage collection if available
+        if (global.gc) {
+            global.gc();
+        }
     });
 };
 

package/test/templates.test.js

@@ -6,6 +6,11 @@ const path = require('path');
 const { ModelMix } = require('../index.js');
 
 describe('Template and File Operations Tests', () => {
+    
+    // Setup test hooks
+    if (global.setupTestHooks) {
+        global.setupTestHooks();
+    }
 
     afterEach(() => {
         nock.cleanAll();