llmjs2 1.1.0 → 1.1.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 littlellmjs
+
+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.

package/index.js

@@ -148,11 +148,29 @@ export async function completion(modelOrOptions, prompt, apiKey) {
 
     // Validate messages format
     for (const msg of messages) {
-      if (!msg.role || !msg.content) {
-        throw new Error('Each message must have "role" and "content" properties');
+      if (!msg.role) {
+        throw new Error('Each message must have a "role" property');
       }
-      if (!['system', 'user', 'assistant'].includes(msg.role)) {
-        throw new Error('Message role must be "system", "user", or "assistant"');
+      
+      // Tool messages have role='tool' and tool_call_id instead of content
+      if (msg.role === 'tool') {
+        if (!msg.tool_call_id && !msg.name) {
+          throw new Error('Tool message must have "tool_call_id" and "name" properties');
+        }
+        if (msg.content !== undefined && typeof msg.content !== 'string') {
+          throw new Error('Tool message "content" must be a string');
+        }
+      } else {
+        // Non-tool messages must have content
+        // Assistant messages with tool_calls can have empty content
+        const hasContent = msg.content && msg.content.trim().length > 0;
+        const isAssistantWithToolCalls = msg.role === 'assistant' && msg.tool_calls && msg.tool_calls.length > 0;
+        if (!hasContent && !isAssistantWithToolCalls) {
+          throw new Error(`Message with role "${msg.role}" must have "content" property`);
+        }
+        if (!['system', 'user', 'assistant', 'tool'].includes(msg.role)) {
+          throw new Error(`Message role must be "system", "user", "assistant", or "tool"`);
+        }
       }
     }
 

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "llmjs2",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Abstract layer for LLM completion supporting multiple providers",
   "main": "index.js",
   "type": "module",
   "exports": {
     ".": "./index.js"
   },
+  "files": [
+    "index.js",
+    "providers/",
+    "README.md",
+    "LICENSE"
+  ],
   "keywords": [
     "llm",
     "ai",

package/providers/ollama.js

@@ -1,4 +1,4 @@
-const OLLAMA_API_URL = 'http://localhost:11434/api/chat';
+const OLLAMA_API_URL = 'https://ollama.com/api/chat';
 const REQUEST_TIMEOUT = 180000; // 60 seconds
 
 /**
@@ -83,6 +83,6 @@ export async function ollamaCompletion(model, messages, apiKey, tools) {
       throw error;
     }
 
-    throw new Error(`Ollama request failed: ${error.message}`);
+    throw new Error(`Ollama request failed: ${error}`);
   }
 }

package/example.js

@@ -1,298 +0,0 @@
-import { completion } from './index.js';
-
-/**
- * Real usage test program for vs code
- * This demonstrates actual API calls to Ollama and OpenRouter
- * Shows all three calling conventions including simple API with model
- */
-
-async function testSimpleAPI() {
-  console.log('=== Testing Simple API (Auto-Detection) ===\n');
-
-  try {
-    const prompt = 'Explain the use of vs code in 2-3 sentences.';
-    console.log(`Prompt: ${prompt}\n`);
-
-    const result = await completion(prompt);
-
-    console.log('Response:');
-    console.log(result);
-    console.log('\n✓ Simple API test completed successfully\n');
-    return true;
-  } catch (error) {
-    console.error('✗ Simple API test failed:', error.message);
-    return false;
-  }
-}
-
-async function testSimpleAPIWithModel() {
-  console.log('=== Testing Simple API with Model ===\n');
-
-  try {
-    const model = 'ollama/qwen3.5:397b-cloud';
-    const prompt = 'Explain the use of vs code in 2-3 sentences.';
-    console.log(`Model: ${model}`);
-    console.log(`Prompt: ${prompt}\n`);
-
-    const result = await completion(model, prompt);
-
-    console.log('Response:');
-    console.log(result);
-    console.log('\n✓ Simple API with model test completed successfully\n');
-    return true;
-  } catch (error) {
-    console.error('✗ Simple API with model test failed:', error.message);
-    return false;
-  }
-}
-
-async function testOllamaFunctionAPI() {
-  console.log('=== Testing Ollama with Function-Based API ===\n');
-
-  try {
-    const prompt = 'Explain the use of vs code in 2-3 sentences.';
-    console.log(`Prompt: ${prompt}\n`);
-
-    const result = await completion('ollama/minimax-m2.5:cloud', prompt);
-
-    console.log('Response:');
-    console.log(result);
-    console.log('\n✓ Ollama function-based API test completed successfully\n');
-    return true;
-  } catch (error) {
-    console.error('✗ Ollama function-based API test failed:', error.message);
-    return false;
-  }
-}
-
-async function testOllamaObjectAPI() {
-  console.log('=== Testing Ollama with Object-Based API ===\n');
-
-  try {
-    const result = await completion({
-      model: 'ollama/minimax-m2.5:cloud',
-      messages: [
-        { role: 'system', content: 'You are a helpful AI assistant.' },
-        { role: 'user', content: 'Explain the use of vs code in 2-3 sentences.' }
-      ]
-    });
-
-    console.log('Response:');
-    console.log(result);
-    console.log('\n✓ Ollama object-based API test completed successfully\n');
-    return true;
-  } catch (error) {
-    console.error('✗ Ollama object-based API test failed:', error.message);
-    return false;
-  }
-}
-
-async function testOllamaWithTools() {
-  console.log('=== Testing Ollama with Tools ===\n');
-
-  try {
-    const result = await completion({
-      model: 'ollama/minimax-m2.5:cloud',
-      messages: [
-        { role: 'user', content: 'What is the weather like in Paris?' }
-      ],
-      tools: [
-        {
-          type: 'function',
-          function: {
-            name: 'get_weather',
-            description: 'Get the current weather in a given location',
-            parameters: {
-              type: 'object',
-              properties: {
-                location: {
-                  type: 'string',
-                  description: 'The city and state, e.g. San Francisco, CA'
-                },
-                unit: {
-                  type: 'string',
-                  enum: ['celsius', 'fahrenheit'],
-                  description: 'The temperature unit to use'
-                }
-              },
-              required: ['location']
-            }
-          }
-        }
-      ]
-    });
-
-    console.log('Response:');
-    console.log(JSON.stringify(result, null, 2));
-    console.log('\n✓ Ollama tools test completed successfully\n');
-    return true;
-  } catch (error) {
-    console.error('✗ Ollama tools test failed:', error.message);
-    return false;
-  }
-}
-
-async function testOpenRouterFunctionAPI() {
-  console.log('=== Testing OpenRouter with Function-Based API ===\n');
-
-  try {
-    const prompt = 'What is the capital of France? Answer in one sentence.';
-    console.log(`Prompt: ${prompt}\n`);
-
-    const result = await completion('openrouter/openrouter/free', prompt);
-
-    console.log('Response:');
-    console.log(result);
-    console.log('\n✓ OpenRouter function-based API test completed successfully\n');
-    return true;
-  } catch (error) {
-    console.error('✗ OpenRouter function-based API test failed:', error.message);
-    return false;
-  }
-}
-
-async function testOpenRouterObjectAPI() {
-  console.log('=== Testing OpenRouter with Object-Based API ===\n');
-
-  try {
-    const result = await completion({
-      model: 'openrouter/openrouter/free',
-      messages: [
-        { role: 'system', content: 'You are a helpful AI assistant.' },
-        { role: 'user', content: 'What is the capital of France? Answer in one sentence.' }
-      ]
-    });
-
-    console.log('Response:');
-    console.log(result);
-    console.log('\n✓ OpenRouter object-based API test completed successfully\n');
-    return true;
-  } catch (error) {
-    console.error('✗ OpenRouter object-based API test failed:', error.message);
-    return false;
-  }
-}
-
-async function testOpenRouterWithTools() {
-  console.log('=== Testing OpenRouter with Tools ===\n');
-
-  try {
-    const result = await completion({
-      model: 'openrouter/openrouter/free',
-      messages: [
-        { role: 'user', content: 'What is the weather like in Paris?' }
-      ],
-      tools: [
-        {
-          type: 'function',
-          function: {
-            name: 'get_weather',
-            description: 'Get the current weather in a given location',
-            parameters: {
-              type: 'object',
-              properties: {
-                location: {
-                  type: 'string',
-                  description: 'The city and state, e.g. San Francisco, CA'
-                },
-                unit: {
-                  type: 'string',
-                  enum: ['celsius', 'fahrenheit'],
-                  description: 'The temperature unit to use'
-                }
-              },
-              required: ['location']
-            }
-          }
-        }
-      ]
-    });
-
-    console.log('Response:');
-    console.log(JSON.stringify(result, null, 2));
-    console.log('\n✓ OpenRouter tools test completed successfully\n');
-    return true;
-  } catch (error) {
-    console.error('✗ OpenRouter tools test failed:', error.message);
-    return false;
-  }
-}
-
-async function main() {
-  console.log('vs code Real Usage Test Program');
-  console.log('==============================\n');
-
-  // Check for API keys
-  const hasOllamaKey = !!process.env.OLLAMA_API_KEY;
-  const hasOpenRouterKey = !!process.env.OPEN_ROUTER_API_KEY;
-
-  console.log('API Key Status:');
-  console.log(`  Ollama: ${hasOllamaKey ? '✓ Set' : '✗ Not set'}`);
-  console.log(`  OpenRouter: ${hasOpenRouterKey ? '✓ Set' : '✗ Not set'}\n`);
-
-  if (!hasOllamaKey && !hasOpenRouterKey) {
-    console.log('⚠ No API keys found. Please set environment variables:');
-    console.log('  export OLLAMA_API_KEY=your-ollama-api-key');
-    console.log('  export OPEN_ROUTER_API_KEY=your-openrouter-api-key\n');
-    console.log('Or modify this script to pass API keys directly.\n');
-  }
-
-  const results = {
-    simpleAPI: false,
-    simpleAPIWithModel: false,
-    ollamaFunction: false,
-    ollamaObject: false,
-    ollamaTools: false,
-    openrouterFunction: false,
-    openrouterObject: false,
-    openrouterTools: false
-  };
-
-  // Test simple API if any key is available
-  if (hasOllamaKey || hasOpenRouterKey) {
-    results.simpleAPI = await testSimpleAPI();
-    results.simpleAPIWithModel = await testSimpleAPIWithModel();
-  } else {
-    console.log('=== Skipping Simple API tests (no API key) ===\n');
-  }
-
-  // Test Ollama if key is available
-  if (hasOllamaKey) {
-    results.ollamaFunction = await testOllamaFunctionAPI();
-    results.ollamaObject = await testOllamaObjectAPI();
-    results.ollamaTools = await testOllamaWithTools();
-  } else {
-    console.log('=== Skipping Ollama tests (no API key) ===\n');
-  }
-
-  // Test OpenRouter if key is available
-  if (hasOpenRouterKey) {
-    results.openrouterFunction = await testOpenRouterFunctionAPI();
-    results.openrouterObject = await testOpenRouterObjectAPI();
-    results.openrouterTools = await testOpenRouterWithTools();
-  } else {
-    console.log('=== Skipping OpenRouter tests (no API key) ===\n');
-  }
-
-  // Summary
-  console.log('==============================');
-  console.log('Test Summary:');
-  console.log(`  Simple API: ${results.simpleAPI ? '✓ Passed' : '✗ Failed/Skipped'}`);
-  console.log(`  Simple API with Model: ${results.simpleAPIWithModel ? '✓ Passed' : '✗ Failed/Skipped'}`);
-  console.log(`  Ollama Function API: ${results.ollamaFunction ? '✓ Passed' : '✗ Failed/Skipped'}`);
-  console.log(`  Ollama Object API: ${results.ollamaObject ? '✓ Passed' : '✗ Failed/Skipped'}`);
-  console.log(`  Ollama Tools: ${results.ollamaTools ? '✓ Passed' : '✗ Failed/Skipped'}`);
-  console.log(`  OpenRouter Function API: ${results.openrouterFunction ? '✓ Passed' : '✗ Failed/Skipped'}`);
-  console.log(`  OpenRouter Object API: ${results.openrouterObject ? '✓ Passed' : '✗ Failed/Skipped'}`);
-  console.log(`  OpenRouter Tools: ${results.openrouterTools ? '✓ Passed' : '✗ Failed/Skipped'}`);
-  console.log('==============================\n');
-
-  if (results.simpleAPI || results.simpleAPIWithModel || results.ollamaFunction || results.ollamaObject || results.ollamaTools || 
-      results.openrouterFunction || results.openrouterObject || results.openrouterTools) {
-    console.log('✓ At least one test passed!');
-  } else {
-    console.log('✗ No tests passed. Check your API keys and try again.');
-  }
-}
-
-main().catch(console.error);

package/test.js

@@ -1,296 +0,0 @@
-import { completion } from './index.js';
-
-// Test 1: Verify completion function is exported
-console.log('Test 1: Checking if completion function is exported...');
-if (typeof completion === 'function') {
-  console.log('✓ completion function is properly exported');
-} else {
-  console.error('✗ completion is not a function');
-  process.exit(1);
-}
-
-// Test 2: Verify error handling for empty prompt (simple API)
-console.log('\nTest 2: Testing error handling for empty prompt (simple API)...');
-try {
-  await completion('');
-  console.error('✗ Should have thrown an error for empty prompt');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Prompt parameter cannot be empty')) {
-    console.log('✓ Properly throws error for empty prompt');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 3: Verify error handling for missing API keys (simple API)
-console.log('\nTest 3: Testing error handling for missing API keys (simple API)...');
-try {
-  delete process.env.OLLAMA_API_KEY;
-  delete process.env.OPEN_ROUTER_API_KEY;
-  await completion('test prompt');
-  console.error('✗ Should have thrown an error for missing API keys');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('No API key found')) {
-    console.log('✓ Properly throws error for missing API keys');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 4: Verify error handling for empty model (simple API with model)
-console.log('\nTest 4: Testing error handling for empty model (simple API with model)...');
-try {
-  delete process.env.OLLAMA_API_KEY;
-  delete process.env.OPEN_ROUTER_API_KEY;
-  await completion('', 'test prompt');
-  console.error('✗ Should have thrown an error for empty model');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Model must be in format')) {
-    console.log('✓ Properly throws error for empty model');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 5: Verify error handling for missing model (function API)
-console.log('\nTest 5: Testing error handling for missing model (function API)...');
-try {
-  await completion();
-  console.error('✗ Should have thrown an error for missing model');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Model parameter is required')) {
-    console.log('✓ Properly throws error for missing model');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 6: Verify error handling for missing prompt (function API)
-console.log('\nTest 6: Testing error handling for missing prompt (function API)...');
-try {
-  await completion('ollama/minimax-m2.5:cloud');
-  console.error('✗ Should have thrown an error for missing prompt');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Prompt parameter is required')) {
-    console.log('✓ Properly throws error for missing prompt');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 7: Verify error handling for invalid model format (function API)
-console.log('\nTest 7: Testing error handling for invalid model format (function API)...');
-try {
-  await completion('invalidmodel', 'test prompt');
-  console.error('✗ Should have thrown an error for invalid model format');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Model must be in format')) {
-    console.log('✓ Properly throws error for invalid model format');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 8: Verify error handling for unsupported provider (function API)
-console.log('\nTest 8: Testing error handling for unsupported provider (function API)...');
-try {
-  await completion('unsupported/model', 'test prompt');
-  console.error('✗ Should have thrown an error for unsupported provider');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Unsupported provider')) {
-    console.log('✓ Properly throws error for unsupported provider');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 9: Verify error handling for missing API key (Ollama, function API)
-console.log('\nTest 9: Testing error handling for missing API key (Ollama, function API)...');
-try {
-  delete process.env.OLLAMA_API_KEY;
-  delete process.env.OPEN_ROUTER_API_KEY;
-  await completion('ollama/minimax-m2.5:cloud', 'test prompt');
-  console.error('✗ Should have thrown an error for missing API key');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('API key is required')) {
-    console.log('✓ Properly throws error for missing API key');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 10: Verify error handling for missing API key (OpenRouter, function API)
-console.log('\nTest 10: Testing error handling for missing API key (OpenRouter, function API)...');
-try {
-  delete process.env.OLLAMA_API_KEY;
-  delete process.env.OPEN_ROUTER_API_KEY;
-  await completion('openrouter/openrouter/free', 'test prompt');
-  console.error('✗ Should have thrown an error for missing API key');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('API key is required')) {
-    console.log('✓ Properly throws error for missing API key');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 11: Verify error handling for missing model (object API)
-console.log('\nTest 11: Testing error handling for missing model (object API)...');
-try {
-  await completion({
-    messages: [{ role: 'user', content: 'test' }]
-  });
-  console.error('✗ Should have thrown an error for missing model');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Model parameter is required')) {
-    console.log('✓ Properly throws error for missing model');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 12: Verify error handling for missing messages (object API)
-console.log('\nTest 12: Testing error handling for missing messages (object API)...');
-try {
-  await completion({
-    model: 'ollama/minimax-m2.5:cloud'
-  });
-  console.error('✗ Should have thrown an error for missing messages');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Messages parameter is required')) {
-    console.log('✓ Properly throws error for missing messages');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 13: Verify error handling for invalid message format (object API)
-console.log('\nTest 13: Testing error handling for invalid message format (object API)...');
-try {
-  await completion({
-    model: 'ollama/minimax-m2.5:cloud',
-    messages: [{ content: 'test' }]
-  });
-  console.error('✗ Should have thrown an error for invalid message format');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Each message must have')) {
-    console.log('✓ Properly throws error for invalid message format');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 14: Verify error handling for invalid message role (object API)
-console.log('\nTest 14: Testing error handling for invalid message role (object API)...');
-try {
-  await completion({
-    model: 'ollama/minimax-m2.5:cloud',
-    messages: [{ role: 'invalid', content: 'test' }]
-  });
-  console.error('✗ Should have thrown an error for invalid message role');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Message role must be')) {
-    console.log('✓ Properly throws error for invalid message role');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 15: Verify error handling for invalid tools format (object API)
-console.log('\nTest 15: Testing error handling for invalid tools format (object API)...');
-try {
-  await completion({
-    model: 'ollama/minimax-m2.5:cloud',
-    messages: [{ role: 'user', content: 'test' }],
-    tools: 'invalid'
-  });
-  console.error('✗ Should have thrown an error for invalid tools format');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Tools parameter must be an array')) {
-    console.log('✓ Properly throws error for invalid tools format');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 16: Verify error handling for invalid tool format (object API)
-console.log('\nTest 16: Testing error handling for invalid tool format (object API)...');
-try {
-  await completion({
-    model: 'ollama/minimax-m2.5:cloud',
-    messages: [{ role: 'user', content: 'test' }],
-    tools: [{ invalid: 'tool' }]
-  });
-  console.error('✗ Should have thrown an error for invalid tool format');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Each tool must have type "function"')) {
-    console.log('✓ Properly throws error for invalid tool format');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-// Test 17: Verify error handling for missing tool function name (object API)
-console.log('\nTest 17: Testing error handling for missing tool function name (object API)...');
-try {
-  await completion({
-    model: 'ollama/minimax-m2.5:cloud',
-    messages: [{ role: 'user', content: 'test' }],
-    tools: [{ type: 'function', function: {} }]
-  });
-  console.error('✗ Should have thrown an error for missing tool function name');
-  process.exit(1);
-} catch (error) {
-  if (error.message.includes('Each tool must have a function with a name')) {
-    console.log('✓ Properly throws error for missing tool function name');
-  } else {
-    console.error('✗ Wrong error message:', error.message);
-    process.exit(1);
-  }
-}
-
-console.log('\n✓ All tests passed!');
-console.log('\nLibrary structure is valid and ready for use.');
-console.log('\nSupported APIs:');
-console.log('  - Simple API: completion(prompt) or completion(model, prompt)');
-console.log('  - Function API: completion(model, prompt, apiKey)');
-console.log('  - Object API: completion({ model, messages, apiKey, tools })');
-console.log('\nSupported models:');
-console.log('  - Ollama: ollama/minimax-m2.5:cloud');
-console.log('  - OpenRouter: openrouter/openrouter/free');
-console.log('\nSimple API features:');
-console.log('  - Auto-detects provider based on available API keys');
-console.log('  - Uses OLLAMA_DEFAULT_MODEL or defaults to minimax-m2.5:cloud');
-console.log('  - Uses OPEN_ROUTER_DEFAULT_MODEL or defaults to openrouter/free');
-console.log('  - Randomly chooses provider if both API keys are set');
-console.log('  - Supports optional model parameter: completion(model, prompt)');