modelmix 4.4.20 → 4.4.24

package/index.js

@@ -1,6 +1,7 @@
 const axios = require('axios');
 const fs = require('fs');
-const { fromBuffer } = require('file-type');
+const fileType = require('file-type');
+const detectFileTypeFromBuffer = fileType.fileTypeFromBuffer || fileType.fromBuffer;
 const { inspect } = require('util');
 const log = require('lemonlog')('ModelMix');
 const Bottleneck = require('bottleneck');
@@ -633,11 +634,14 @@ class ModelMix {
 
                     // Detect mimeType if not provided
                     if (!mimeType) {
-                        const fileType = await fromBuffer(buffer);
-                        if (!fileType || !fileType.mime.startsWith('image/')) {
+                        if (typeof detectFileTypeFromBuffer !== 'function') {
+                            throw new Error('file-type module does not expose a buffer detector');
+                        }
+                        const detectedType = await detectFileTypeFromBuffer(buffer);
+                        if (!detectedType || !detectedType.mime.startsWith('image/')) {
                             throw new Error(`Invalid image - unable to detect valid image format`);
                         }
-                        mimeType = fileType.mime;
+                        mimeType = detectedType.mime;
                     }
 
                     // Update the content with processed image
@@ -1334,7 +1338,34 @@ class MixCustom {
     }
 
     static extractMessage(data) {
-        const message = data.choices[0].message?.content?.trim() || '';
+        const choice = data?.choices?.[0] || {};
+        const messageObj = choice.message || {};
+        const finishReason = choice.finish_reason;
+
+        if (typeof messageObj.refusal === 'string' && messageObj.refusal.trim().length > 0) {
+            throw new Error(`OpenAI model refused to process this request: ${messageObj.refusal}`);
+        }
+
+        if (finishReason === 'content_filter') {
+            throw new Error('OpenAI response was blocked by content_filter.');
+        }
+
+        let message = '';
+        if (typeof messageObj.content === 'string') {
+            message = messageObj.content.trim();
+        } else if (Array.isArray(messageObj.content)) {
+            const refusalPart = messageObj.content.find(part => part?.type === 'refusal' || (typeof part?.refusal === 'string' && part.refusal.trim().length > 0));
+            if (refusalPart) {
+                const refusalText = typeof refusalPart.refusal === 'string' ? refusalPart.refusal : 'No refusal text provided.';
+                throw new Error(`OpenAI model refused to process this request: ${refusalText}`);
+            }
+            message = messageObj.content
+                .filter(part => typeof part?.text === 'string')
+                .map(part => part.text)
+                .join('')
+                .trim();
+        }
+
         const endTagIndex = message.indexOf('</think>');
         if (message.startsWith('<think>') && endTagIndex !== -1) {
             return message.substring(endTagIndex + 8).trim();
@@ -2020,10 +2051,25 @@ class MixAnthropic extends MixCustom {
     }
 
     static extractMessage(data) {
-        if (data.content?.[1]?.text) {
-            return data.content[1].text;
+        const content = Array.isArray(data?.content) ? data.content : [];
+
+        // Anthropic can return text in different positions depending on thinking/tool blocks.
+        const textBlock = content.find(block => typeof block?.text === 'string' && block.text.trim().length > 0);
+        if (textBlock) {
+            return textBlock.text;
+        }
+
+        // Empty/non-text content is often due to safety refusal or token limits.
+        const stopReason = data?.stop_reason;
+        const contentTypes = content.map(block => block?.type || 'unknown').join(', ') || 'none';
+
+        if (stopReason === 'refusal') {
+            throw new Error('Anthropic refused to process this request (content policy). Try different wording or a fallback model.');
+        }
+        if (!content.length) {
+            throw new Error(`Anthropic returned empty content (stop_reason: ${stopReason ?? 'unknown'}).`);
         }
-        return data.content[0].text;
+        throw new Error(`Anthropic content blocks are missing .text (stop_reason: ${stopReason ?? 'unknown'}, content_types: ${contentTypes}).`);
     }
 
     static extractThink(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "4.4.20",
+  "version": "4.4.24",
   "description": "🧬 Reliable interface with automatic fallback for AI LLMs.",
   "main": "index.js",
   "repository": {

package/test/images.test.js

@@ -82,5 +82,39 @@ describe('Image Processing and Multimodal Support Tests', () => {
             expect(response).to.include('small PNG test image');
         });
 
+        it('should detect image mime type from buffer when content-type header is missing', async () => {
+            const imageUrl = 'https://assets.example.com/test-image';
+            const pngBase64 = 'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFUlEQVR42mP8z8BQz0AEYBxVSF+FABJADveWkH6oAAAAAElFTkSuQmCC';
+            const pngBuffer = Buffer.from(pngBase64, 'base64');
+
+            model.sonnet46()
+                .addText('Describe this image')
+                .addImageFromUrl(imageUrl);
+
+            // No content-type header on purpose: this forces buffer-based detection.
+            nock('https://assets.example.com')
+                .get('/test-image')
+                .reply(200, pngBuffer);
+
+            nock('https://api.anthropic.com')
+                .post('/v1/messages')
+                .reply(function (uri, body) {
+                    const userMsg = body.messages.find(m => m.role === 'user');
+                    expect(userMsg).to.exist;
+                    const imageContent = userMsg.content.find(c => c.type === 'image');
+                    expect(imageContent).to.exist;
+                    expect(imageContent.source.type).to.equal('base64');
+                    expect(imageContent.source.media_type).to.equal('image/png');
+                    expect(imageContent.source.data).to.equal(pngBase64);
+                    return [200, {
+                        content: [{ type: "text", text: "Image received." }],
+                        role: "assistant"
+                    }];
+                });
+
+            const response = await model.message();
+            expect(response).to.include('Image received.');
+        });
+
     });
 });

package/.claude/settings.local.json

@@ -1,12 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(node:*)",
-      "Bash(npm install:*)",
-      "Bash(mkdir:*)",
-      "Bash(npm test)",
-      "Bash(npm test:*)"
-    ],
-    "deny": []
-  }
-}