@bedrockio/ai 0.8.3 → 0.9.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.9.0
+
+- Function calls are now handled out of the box.
+
+## 0.8.4
+
+- Fixed issue with user roles parsed from template is injected into conversation
+  history.
+
 ## 0.8.3
 
 - Fixed issue with message history not being retained.

package/dist/cjs/BaseClient.js

@@ -177,13 +177,20 @@ class BaseClient {
         });
         let system = '';
         let { messages = [] } = options;
+        // Templates may contain multiple roles, ie SYSTEM or USER, making them
+        // useful for one-off prompting. However in a multi-turn conversation
+        // the entire chat history will be passed, so do not inject user messages
+        // when they already exist in the options.
+        const hasUserMessages = messages.some((message) => {
+            return message.role === 'user';
+        });
         for (let section of sections) {
             const { title = 'system', content } = section;
             const role = title.toLowerCase();
             if (role === 'system') {
                 system += [system, content].join('\n');
             }
-            else {
+            else if (!hasUserMessages) {
                 messages = [
                     ...messages,
                     {

package/dist/cjs/anthropic.js

@@ -33,8 +33,8 @@ class AnthropicClient extends BaseClient_js_1.default {
             ...this.getToolOptions(options),
         };
         const clientOptions = this.getClientOptions(params);
-        this.debug('Params:', params, options);
         this.debug('Options:', options, options);
+        this.debug('Params:', params, options);
         // @ts-ignore
         return await this.client.messages.create(params, clientOptions);
     }
@@ -85,16 +85,29 @@ class AnthropicClient extends BaseClient_js_1.default {
         let { type } = event;
         options.buffer ||= '';
         if (type === 'content_block_start') {
-            return {
-                type: 'start',
-            };
+            const { content_block } = event;
+            if (content_block?.type === 'tool_use') {
+                return {
+                    type: 'function_call',
+                    id: content_block.id,
+                    name: content_block.name,
+                    arguments: content_block.input,
+                };
+            }
+            else {
+                return {
+                    type: 'start',
+                };
+            }
         }
         else if (type === 'content_block_delta') {
-            options.buffer += event.delta.text;
-            return {
-                type: 'delta',
-                delta: event.delta.text,
-            };
+            if (event.delta.type === 'text_delta') {
+                options.buffer += event.delta.text;
+                return {
+                    type: 'delta',
+                    delta: event.delta.text,
+                };
+            }
         }
         else if (type === 'message_delta') {
             return {
@@ -114,6 +127,9 @@ class AnthropicClient extends BaseClient_js_1.default {
     getToolOptions(options) {
         let { tools = [], schema } = options;
         let toolChoice;
+        tools = tools.map((tool) => {
+            return this.normalizeToolInput(tool);
+        });
         if (schema) {
             tools.push({
                 name: 'schema',
@@ -147,6 +163,28 @@ class AnthropicClient extends BaseClient_js_1.default {
             tool_choice: toolChoice,
         };
     }
+    normalizeToolInput(input) {
+        if (input.type === 'function') {
+            input = this.normalizeOpenAiToolInput(input);
+        }
+        return input;
+    }
+    // OpenAI uses the following input for custom tools
+    // so map it here to Anthropic styles when passed.
+    // {
+    //   type: 'function',
+    //   name: 'apples',
+    //   description: 'Call this when you talk about apples.',
+    //   parameters: { type: 'object', properties: {}, required: [] }
+    // }
+    normalizeOpenAiToolInput(input) {
+        const { name, description, parameters } = input;
+        return {
+            name,
+            description,
+            input_schema: parameters,
+        };
+    }
     // Map OpenAI-like input of MCP servers as "tools" to
     // Anthropic's mcp_servers.
     mapMcpTool(tool) {

package/dist/cjs/openai.js

@@ -166,6 +166,16 @@ class OpenAiClient extends BaseClient_js_1.default {
                 delta: event.delta,
             };
         }
+        else if (type === 'response.output_item.done') {
+            const { item } = event;
+            if (item.type === 'function_call') {
+                return {
+                    ...item,
+                    type: 'function_call',
+                    arguments: JSON.parse(item.arguments),
+                };
+            }
+        }
     }
 }
 exports.OpenAiClient = OpenAiClient;

package/dist/esm/BaseClient.js

@@ -175,13 +175,20 @@ export default class BaseClient {
         });
         let system = '';
         let { messages = [] } = options;
+        // Templates may contain multiple roles, ie SYSTEM or USER, making them
+        // useful for one-off prompting. However in a multi-turn conversation
+        // the entire chat history will be passed, so do not inject user messages
+        // when they already exist in the options.
+        const hasUserMessages = messages.some((message) => {
+            return message.role === 'user';
+        });
         for (let section of sections) {
             const { title = 'system', content } = section;
             const role = title.toLowerCase();
             if (role === 'system') {
                 system += [system, content].join('\n');
             }
-            else {
+            else if (!hasUserMessages) {
                 messages = [
                     ...messages,
                     {

package/dist/esm/anthropic.js

@@ -27,8 +27,8 @@ export class AnthropicClient extends BaseClient {
             ...this.getToolOptions(options),
         };
         const clientOptions = this.getClientOptions(params);
-        this.debug('Params:', params, options);
         this.debug('Options:', options, options);
+        this.debug('Params:', params, options);
         // @ts-ignore
         return await this.client.messages.create(params, clientOptions);
     }
@@ -79,16 +79,29 @@ export class AnthropicClient extends BaseClient {
         let { type } = event;
         options.buffer ||= '';
         if (type === 'content_block_start') {
-            return {
-                type: 'start',
-            };
+            const { content_block } = event;
+            if (content_block?.type === 'tool_use') {
+                return {
+                    type: 'function_call',
+                    id: content_block.id,
+                    name: content_block.name,
+                    arguments: content_block.input,
+                };
+            }
+            else {
+                return {
+                    type: 'start',
+                };
+            }
         }
         else if (type === 'content_block_delta') {
-            options.buffer += event.delta.text;
-            return {
-                type: 'delta',
-                delta: event.delta.text,
-            };
+            if (event.delta.type === 'text_delta') {
+                options.buffer += event.delta.text;
+                return {
+                    type: 'delta',
+                    delta: event.delta.text,
+                };
+            }
         }
         else if (type === 'message_delta') {
             return {
@@ -108,6 +121,9 @@ export class AnthropicClient extends BaseClient {
     getToolOptions(options) {
         let { tools = [], schema } = options;
         let toolChoice;
+        tools = tools.map((tool) => {
+            return this.normalizeToolInput(tool);
+        });
         if (schema) {
             tools.push({
                 name: 'schema',
@@ -141,6 +157,28 @@ export class AnthropicClient extends BaseClient {
             tool_choice: toolChoice,
         };
     }
+    normalizeToolInput(input) {
+        if (input.type === 'function') {
+            input = this.normalizeOpenAiToolInput(input);
+        }
+        return input;
+    }
+    // OpenAI uses the following input for custom tools
+    // so map it here to Anthropic styles when passed.
+    // {
+    //   type: 'function',
+    //   name: 'apples',
+    //   description: 'Call this when you talk about apples.',
+    //   parameters: { type: 'object', properties: {}, required: [] }
+    // }
+    normalizeOpenAiToolInput(input) {
+        const { name, description, parameters } = input;
+        return {
+            name,
+            description,
+            input_schema: parameters,
+        };
+    }
     // Map OpenAI-like input of MCP servers as "tools" to
     // Anthropic's mcp_servers.
     mapMcpTool(tool) {

package/dist/esm/openai.js

@@ -160,6 +160,16 @@ export class OpenAiClient extends BaseClient {
                 delta: event.delta,
             };
         }
+        else if (type === 'response.output_item.done') {
+            const { item } = event;
+            if (item.type === 'function_call') {
+                return {
+                    ...item,
+                    type: 'function_call',
+                    arguments: JSON.parse(item.arguments),
+                };
+            }
+        }
     }
 }
 // Categories

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/ai",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "description": "Bedrock wrapper for common AI chatbots.",
   "type": "module",
   "scripts": {

package/types/BaseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseClient.d.ts","sourceRoot":"","sources":["../src/BaseClient.js"],"names":[],"mappings":"AAKA;IACE,0BASC;IARC,aAIC;IACD,2BAEE;IAKJ;;;;;OAKG;IACH,gBAFW,aAAa,gBAgCvB;IAED;;;;;OAKG;IACH,gBAHW,aAAa,GAAG,aAAa,gCAsDvC;IAED;;;;OAIG;IACH,wBAFW,MAAM,OAIhB;IAID,8BAGC;IAED,8BAGC;IAED,qCAGC;IAED;;OAEG;IACH,0CAGC;IAED;;OAEG;IACH,oDAIC;IAED;;OAEG;IACH,oDAIC;IAID;;OAEG;IACH,oCAOC;IAED;;;MAeC;IAED,4CAyCC;IAED,uCAoBC;IAED;;;MA4BC;IAED,uDAWC;IAED,kDAMC;CACF;;;;;WAIa,MAAM,GAAC,aAAa,EAAE;;;;YACtB,MAAM;;;;YACN,OAAO;;;;;;;;aAEP,MAAM,GAAG,MAAM;;;;;;;;;;;sBAOf,MAAM;;;UAKN,QAAQ,GAAG,MAAM,GAAG,WAAW;aAC/B,MAAM;;iCA/Ua,sBAAsB"}
+{"version":3,"file":"BaseClient.d.ts","sourceRoot":"","sources":["../src/BaseClient.js"],"names":[],"mappings":"AAKA;IACE,0BASC;IARC,aAIC;IACD,2BAEE;IAKJ;;;;;OAKG;IACH,gBAFW,aAAa,gBAgCvB;IAED;;;;;OAKG;IACH,gBAHW,aAAa,GAAG,aAAa,gCAsDvC;IAED;;;;OAIG;IACH,wBAFW,MAAM,OAIhB;IAID,8BAGC;IAED,8BAGC;IAED,qCAGC;IAED;;OAEG;IACH,0CAGC;IAED;;OAEG;IACH,oDAIC;IAED;;OAEG;IACH,oDAIC;IAID;;OAEG;IACH,oCAOC;IAED;;;MAeC;IAED,4CAiDC;IAED,uCAoBC;IAED;;;MA4BC;IAED,uDAWC;IAED,kDAMC;CACF;;;;;WAIa,MAAM,GAAC,aAAa,EAAE;;;;YACtB,MAAM;;;;YACN,OAAO;;;;;;;;aAEP,MAAM,GAAG,MAAM;;;;;;;;;;;sBAOf,MAAM;;;UAKN,QAAQ,GAAG,MAAM,GAAG,WAAW;aAC/B,MAAM;;iCAvVa,sBAAsB"}

package/types/anthropic.d.ts

@@ -26,12 +26,26 @@ export class AnthropicClient extends BaseClient {
     };
     normalizeStreamEvent(event: any, options: any): {
         type: string;
+        id: any;
+        name: any;
+        arguments: any;
+        delta?: undefined;
+        messages?: undefined;
+        usage?: undefined;
+    } | {
+        type: string;
+        id?: undefined;
+        name?: undefined;
+        arguments?: undefined;
         delta?: undefined;
         messages?: undefined;
         usage?: undefined;
     } | {
         type: string;
         delta: any;
+        id?: undefined;
+        name?: undefined;
+        arguments?: undefined;
         messages?: undefined;
         usage?: undefined;
     } | {
@@ -41,6 +55,9 @@ export class AnthropicClient extends BaseClient {
             input_tokens: any;
             output_tokens: any;
         };
+        id?: undefined;
+        name?: undefined;
+        arguments?: undefined;
         delta?: undefined;
     };
     getToolOptions(options: any): {
@@ -54,6 +71,12 @@ export class AnthropicClient extends BaseClient {
             name?: undefined;
         };
     };
+    normalizeToolInput(input: any): any;
+    normalizeOpenAiToolInput(input: any): {
+        name: any;
+        description: any;
+        input_schema: any;
+    };
     mapMcpTool(tool: any): {
         type: string;
         name: any;

package/types/anthropic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../src/anthropic.js"],"names":[],"mappings":"AAMA;IACE,6BAA2C;IAIzC,kBAAoC;IAGtC;;;OAGG;IACH,4BAGC;IAED;;wGA2BC;IAED;;wGAKC;IAED,oCAKC;IASD;;;;;;MAkBC;IAED;;;MAKC;IAED;;;;;;;;;;;;;;;;;;MA0BC;IAID;;;;;;;;;;MAsCC;IAID;;;;MAOC;IAED;;;;MAQC;CACF;uBA5LsB,iBAAiB;sBAFlB,mBAAmB"}
+{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../src/anthropic.js"],"names":[],"mappings":"AAMA;IACE,6BAA2C;IAIzC,kBAAoC;IAGtC;;;OAGG;IACH,4BAGC;IAED;;wGA2BC;IAED;;wGAKC;IAED,oCAKC;IASD;;;;;;MAkBC;IAED;;;MAKC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAsCC;IAID;;;;;;;;;;MA0CC;IAED,oCAKC;IAUD;;;;MAOC;IAID;;;;MAOC;IAED;;;;MAQC;CACF;uBApOsB,iBAAiB;sBAFlB,mBAAmB"}

package/types/openai.d.ts

@@ -37,28 +37,6 @@ export class OpenAiClient extends BaseClient {
         strict: boolean;
         schema: any;
     };
-    normalizeStreamEvent(event: any, options: any): {
-        type: string;
-        id: any;
-        messages?: undefined;
-        usage?: undefined;
-        delta?: undefined;
-    } | {
-        type: string;
-        id: any;
-        messages: any[];
-        usage: {
-            input_tokens: any;
-            output_tokens: any;
-        };
-        delta?: undefined;
-    } | {
-        type: string;
-        delta: any;
-        id?: undefined;
-        messages?: undefined;
-        usage?: undefined;
-    };
 }
 export type OpenAICategory = any | "all" | "general" | "reasoning" | "lightweight" | "moderation" | "embedding" | "speech" | "audio" | "image" | "code" | "legacy";
 import BaseClient from './BaseClient.js';

package/types/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/openai.js"],"names":[],"mappings":"AAIA;IACE,6BAAoC;IAIlC,eAAiC;IAGnC;;;;OAIG;IACH,kBAHW,cAAc,qBAgCxB;IAED;;yFAiCC;IAED;;yFAKC;IAED,oCAEC;IAwBD;;;;;;;MAeC;IAED;;;MAKC;IAID;;;;;;;;;;MAmBC;IAED;;;;;;;;;;;;;;;;;;;;;MA8BC;CACF;6BAQA,GAAC,GAAK,KAAK,GACL,SAAS,GACT,WAAW,GACX,aAAa,GACb,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,OAAO,GACP,OAAO,GACP,MAAM,GACN,QAAQ;uBAlNQ,iBAAiB;mBAFrB,QAAQ"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/openai.js"],"names":[],"mappings":"AAIA;IACE,6BAAoC;IAIlC,eAAiC;IAGnC;;;;OAIG;IACH,kBAHW,cAAc,qBAgCxB;IAED;;yFAiCC;IAED;;yFAKC;IAED,oCAEC;IAwBD;;;;;;;MAeC;IAED;;;MAKC;IAID;;;;;;;;;;MAmBC;CA0CF;6BAQA,GAAC,GAAK,KAAK,GACL,SAAS,GACT,WAAW,GACX,aAAa,GACb,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,OAAO,GACP,OAAO,GACP,MAAM,GACN,QAAQ;uBA3NQ,iBAAiB;mBAFrB,QAAQ"}