@layer-ai/core 0.2.0 → 0.2.2

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Layer AI
+
+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/dist/services/providers/anthropic-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-adapter.d.ts","sourceRoot":"","sources":["../../../src/services/providers/anthropic-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACL,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,YAAY,EACZ,UAAU,EACX,MAAM,eAAe,CAAC;AAavB,qBAAa,gBAAiB,SAAQ,mBAAmB;IACvD,SAAS,CAAC,QAAQ,SAAe;IAEjC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAQ1C;IAEF,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAI3D;IAEF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAM1D;IAEF,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS;IAalE,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;YAiB3C,UAAU;CA2JzB"}
+{"version":3,"file":"anthropic-adapter.d.ts","sourceRoot":"","sources":["../../../src/services/providers/anthropic-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACL,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,YAAY,EACZ,UAAU,EACX,MAAM,eAAe,CAAC;AAavB,qBAAa,gBAAiB,SAAQ,mBAAmB;IACvD,SAAS,CAAC,QAAQ,SAAe;IAEjC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAQ1C;IAEF,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAI3D;IAEF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAM1D;IAEF,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS;IAalE,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;YAiB3C,UAAU;CA4JzB"}

package/dist/services/providers/anthropic-adapter.js

@@ -51,13 +51,13 @@ export class AnthropicAdapter extends BaseProviderAdapter {
             case 'chat':
                 return this.handleChat(request);
             case 'image':
-                throw new Error('image generation not yet supported by LayerAI');
+                throw new Error('Image generation not yet supported by Anthropic');
             case 'embeddings':
-                throw new Error('embeddings not yet supported by LayerAI');
+                throw new Error('Embeddings not yet supported by Anthropic');
             case 'tts':
-                throw new Error('tts generation not yet supported by LayerAI');
+                throw new Error('TTS generation not yet supported by Anthropic');
             case 'video':
-                throw new Error('Video generation not yet supported by LayerAI');
+                throw new Error('Video generation not yet supported by Anthropic');
             default:
                 throw new Error(`Unknown modality: ${request.type}`);
         }
@@ -76,59 +76,64 @@ export class AnthropicAdapter extends BaseProviderAdapter {
             if (msg.role === 'system')
                 continue;
             const role = this.mapRole(msg.role);
-            if (msg.images && msg.images.length > 0) {
+            // Handle tool responses (mutually exclusive with other content types)
+            if (msg.toolCallId) {
+                messages.push({
+                    role: 'user',
+                    content: [{
+                            type: 'tool_result',
+                            tool_use_id: msg.toolCallId,
+                            content: msg.content || '',
+                        }],
+                });
+            }
+            // Handle messages with images and/or tool calls
+            else if (msg.images?.length || msg.toolCalls?.length) {
                 const content = [];
+                // Add text content if present
                 if (msg.content) {
                     content.push({ type: 'text', text: msg.content });
                 }
-                for (const image of msg.images) {
-                    if (image.url) {
-                        content.push({
-                            type: 'image',
-                            source: {
-                                type: 'url',
-                                url: image.url,
-                            }
-                        });
+                // Add images if present
+                if (msg.images) {
+                    for (const image of msg.images) {
+                        if (image.url) {
+                            content.push({
+                                type: 'image',
+                                source: {
+                                    type: 'url',
+                                    url: image.url,
+                                }
+                            });
+                        }
+                        else if (image.base64) {
+                            content.push({
+                                type: 'image',
+                                source: {
+                                    type: 'base64',
+                                    media_type: image.mimeType || 'image/jpeg',
+                                    data: image.base64
+                                }
+                            });
+                        }
                     }
-                    else if (image.base64) {
+                }
+                // Add tool calls if present
+                if (msg.toolCalls) {
+                    for (const toolCall of msg.toolCalls) {
                         content.push({
-                            type: 'image',
-                            source: {
-                                type: 'base64',
-                                media_type: image.mimeType || 'image/jpeg',
-                                data: image.base64
-                            }
+                            type: 'tool_use',
+                            id: toolCall.id,
+                            name: toolCall.function.name,
+                            input: JSON.parse(toolCall.function.arguments),
                         });
                     }
                 }
-                messages.push({ role: role, content });
-            }
-            else if (msg.toolCalls) {
-                const content = [];
-                if (msg.content) {
-                    content.push({ type: 'text', text: msg.content });
-                }
-                for (const toolCall of msg.toolCalls) {
-                    content.push({
-                        type: 'tool_use',
-                        id: toolCall.id,
-                        name: toolCall.function.name,
-                        input: JSON.parse(toolCall.function.arguments),
-                    });
-                }
-                messages.push({ role: 'assistant', content });
-            }
-            else if (msg.toolCallId) {
-                messages.push({
-                    role: 'user',
-                    content: [{
-                            type: 'tool_result',
-                            tool_use_id: msg.toolCallId,
-                            content: msg.content || '',
-                        }],
-                });
+                // Determine role based on content
+                const messageRole = msg.images?.length ? 'user' : (msg.toolCalls?.length ? 'assistant' : role);
+                messages.push({ role: messageRole, content });
             }
+            // Handle regular text messages
             else {
                 messages.push({
                     role: role,

package/dist/services/providers/openai-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-adapter.d.ts","sourceRoot":"","sources":["../../../src/services/providers/openai-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EACL,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,WAAW,EACX,SAAS,EACT,YAAY,EACZ,UAAU,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACb,MAAM,eAAe,CAAC;AAavB,qBAAa,aAAc,SAAQ,mBAAmB;IACpD,SAAS,CAAC,QAAQ,SAAY;IAE9B,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAQ1C;IAEF,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAIxD;IAEF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAK1D;IAEF,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAQpD;IAEF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAG1D;IAEF,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAGtD;IAEF,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAKpD;IAEF,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAOxD;IAEI,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;YAiB3C,UAAU;YAoGV,qBAAqB;YA6BrB,gBAAgB;YAiChB,kBAAkB;CA8BjC"}
+{"version":3,"file":"openai-adapter.d.ts","sourceRoot":"","sources":["../../../src/services/providers/openai-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EACL,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,WAAW,EACX,SAAS,EACT,YAAY,EACZ,UAAU,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACb,MAAM,eAAe,CAAC;AAavB,qBAAa,aAAc,SAAQ,mBAAmB;IACpD,SAAS,CAAC,QAAQ,SAAY;IAE9B,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAQ1C;IAEF,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAIxD;IAEF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAK1D;IAEF,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAQpD;IAEF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAG1D;IAEF,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAGtD;IAEF,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAKpD;IAEF,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAOxD;IAEI,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;YAiB3C,UAAU;YA2GV,qBAAqB;YA6BrB,gBAAgB;YAiChB,kBAAkB;CA8BjC"}

package/dist/services/providers/openai-adapter.js

@@ -76,7 +76,7 @@ export class OpenAIAdapter extends BaseProviderAdapter {
             case 'tts':
                 return this.handleTextToSpeech(request);
             case 'video':
-                throw new Error('Video generation not yet supported by LayerAI');
+                throw new Error('Video generation not yet supported by OpenAI');
             default:
                 throw new Error(`Unknown modality: ${request.type}`);
         }
@@ -94,6 +94,7 @@ export class OpenAIAdapter extends BaseProviderAdapter {
         }
         for (const msg of chat.messages) {
             const role = this.mapRole(msg.role);
+            // Handle vision messages (content + images)
             if (msg.images && msg.images.length > 0) {
                 const content = [];
                 if (msg.content) {
@@ -111,13 +112,7 @@ export class OpenAIAdapter extends BaseProviderAdapter {
                 }
                 messages.push({ role: role, content });
             }
-            else if (msg.toolCalls) {
-                messages.push({
-                    role: 'assistant',
-                    content: msg.content || null,
-                    tool_calls: msg.toolCalls,
-                });
-            }
+            // Handle tool responses (mutually exclusive)
             else if (msg.toolCallId) {
                 messages.push({
                     role: 'tool',
@@ -125,6 +120,15 @@ export class OpenAIAdapter extends BaseProviderAdapter {
                     tool_call_id: msg.toolCallId,
                 });
             }
+            // Handle assistant messages with tool calls (can have content + tool_calls)
+            else if (msg.toolCalls) {
+                messages.push({
+                    role: 'assistant',
+                    content: msg.content || null,
+                    tool_calls: msg.toolCalls,
+                });
+            }
+            // Handle regular text messages
             else {
                 messages.push({
                     role,

package/dist/services/providers/tests/test-anthropic-adapter.js

@@ -48,6 +48,7 @@ async function testChatWithVision() {
 }
 async function testToolCalls() {
     console.log('Testing tool calls...');
+    // Step 1: Initial request with tool available
     const request = {
         gate: 'test-gate',
         model: 'claude-sonnet-4-5-20250929',
@@ -75,19 +76,46 @@ async function testToolCalls() {
                     },
                 },
             ],
-            maxTokens: 100,
+            maxTokens: 200,
         }
     };
     const response = await adapter.call(request);
-    console.log('Response:', response.content);
+    console.log('Response content:', response.content);
     console.log('Tool calls:', response.toolCalls);
     console.log('Finish reason:', response.finishReason);
-    if (response.toolCalls && response.toolCalls.length > 0) {
-        console.log('✅ Tool calls test passed\n');
-    }
-    else {
+    if (!response.toolCalls || response.toolCalls.length === 0) {
         throw new Error('Expected tool calls but got none');
     }
+    const toolCall = response.toolCalls[0];
+    console.log('Function called:', toolCall.function.name);
+    console.log('Function arguments:', toolCall.function.arguments);
+    // Step 2: Send tool response back
+    const toolResponseRequest = {
+        gate: 'test-gate',
+        model: 'claude-sonnet-4-5-20250929',
+        type: 'chat',
+        data: {
+            messages: [
+                { role: 'user', content: 'What is the weather in San Francisco?' },
+                {
+                    role: 'assistant',
+                    content: response.content,
+                    toolCalls: response.toolCalls,
+                },
+                {
+                    role: 'tool',
+                    toolCallId: toolCall.id,
+                    name: toolCall.function.name,
+                    content: JSON.stringify({ temperature: 72, condition: 'sunny', humidity: 65 }),
+                },
+            ],
+            tools: request.data.tools,
+            maxTokens: 200,
+        }
+    };
+    const finalResponse = await adapter.call(toolResponseRequest);
+    console.log('Final response:', finalResponse.content);
+    console.log('✅ Tool calls test passed\n');
 }
 async function runTests() {
     try {

package/dist/services/providers/tests/test-openai-adapter.js

@@ -100,11 +100,124 @@ async function testTextToSpeech() {
     console.log('Audio base64 length:', response.audio?.base64?.length);
     console.log('✅ Text-to-speech test passed\n');
 }
+async function testToolCalling() {
+    console.log('Testing tool calling...');
+    // Step 1: Initial request with tool available
+    const request = {
+        gate: 'test-gate',
+        model: 'gpt-4o-mini',
+        type: 'chat',
+        data: {
+            messages: [
+                { role: 'user', content: 'What is the weather in San Francisco?' }
+            ],
+            tools: [
+                {
+                    type: 'function',
+                    function: {
+                        name: 'get_weather',
+                        description: 'Get the current weather for a location',
+                        parameters: {
+                            type: 'object',
+                            properties: {
+                                location: {
+                                    type: 'string',
+                                    description: 'The city and state, e.g. San Francisco, CA',
+                                },
+                            },
+                            required: ['location'],
+                        },
+                    },
+                },
+            ],
+            maxTokens: 100,
+        }
+    };
+    const response = await adapter.call(request);
+    console.log('Response content:', response.content);
+    console.log('Tool calls:', response.toolCalls);
+    console.log('Finish reason:', response.finishReason);
+    if (!response.toolCalls || response.toolCalls.length === 0) {
+        throw new Error('Expected tool calls but got none');
+    }
+    const toolCall = response.toolCalls[0];
+    console.log('Function called:', toolCall.function.name);
+    console.log('Function arguments:', toolCall.function.arguments);
+    // Step 2: Send tool response back
+    const toolResponseRequest = {
+        gate: 'test-gate',
+        model: 'gpt-4o-mini',
+        type: 'chat',
+        data: {
+            messages: [
+                { role: 'user', content: 'What is the weather in San Francisco?' },
+                {
+                    role: 'assistant',
+                    content: response.content,
+                    toolCalls: response.toolCalls,
+                },
+                {
+                    role: 'tool',
+                    toolCallId: toolCall.id,
+                    content: JSON.stringify({ temperature: 72, condition: 'sunny' }),
+                },
+            ],
+            tools: request.data.tools,
+        }
+    };
+    const finalResponse = await adapter.call(toolResponseRequest);
+    console.log('Final response:', finalResponse.content);
+    console.log('✅ Tool calling test passed\n');
+}
+async function testContentAndToolCalls() {
+    console.log('Testing content + tool calls in same message...');
+    // This tests the fix we made - assistant messages can have BOTH content and toolCalls
+    const request = {
+        gate: 'test-gate',
+        model: 'gpt-4o-mini',
+        type: 'chat',
+        data: {
+            messages: [
+                { role: 'user', content: 'Calculate 5 + 3 and explain why' },
+                {
+                    role: 'assistant',
+                    content: 'Let me calculate that for you.',
+                    toolCalls: [
+                        {
+                            id: 'call_test_123',
+                            type: 'function',
+                            function: {
+                                name: 'calculate',
+                                arguments: JSON.stringify({ operation: 'add', a: 5, b: 3 }),
+                            },
+                        },
+                    ],
+                },
+                {
+                    role: 'tool',
+                    toolCallId: 'call_test_123',
+                    content: JSON.stringify({ result: 8 }),
+                },
+            ],
+            maxTokens: 100,
+        }
+    };
+    const response = await adapter.call(request);
+    console.log('Response:', response.content);
+    if (!response.content) {
+        throw new Error('Expected content in response');
+    }
+    console.log('✅ Content + tool calls test passed\n');
+}
 async function runTests() {
     try {
         await testChatCompletion();
         console.log('Testing vision...');
         await testChatWithVision();
+        console.log('Testing tool calling...');
+        await testToolCalling();
+        console.log('Testing content + tool calls...');
+        await testContentAndToolCalls();
         await testImageGeneration();
         await testEmbeddings();
         await testTextToSpeech();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layer-ai/core",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Core API routes and services for Layer AI",
   "type": "module",
   "main": "./dist/index.js",
@@ -14,11 +14,6 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch",
-    "clean": "rm -rf dist"
-  },
   "author": "Micah Nettey",
   "license": "MIT",
   "repository": {
@@ -33,14 +28,14 @@
   "dependencies": {
     "@anthropic-ai/sdk": "^0.39.0",
     "@google/genai": "^1.30.0",
-    "@layer-ai/sdk": "workspace:^",
     "bcryptjs": "^2.4.3",
     "express": "^4.18.2",
     "ioredis": "^5.3.2",
     "jsonwebtoken": "^9.0.2",
     "nanoid": "^5.0.4",
     "openai": "^4.24.0",
-    "pg": "^8.11.3"
+    "pg": "^8.11.3",
+    "@layer-ai/sdk": "^0.2.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
@@ -49,5 +44,10 @@
     "@types/node": "^20.10.4",
     "@types/pg": "^8.10.9",
     "typescript": "^5.3.3"
+  },
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "clean": "rm -rf dist"
   }
-}
+}