@bedrockio/ai 0.8.2 → 0.8.4

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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.
+
 ## 0.8.2
 
 - Fixed issue with extra input element being appended.

package/dist/cjs/BaseClient.js

@@ -160,9 +160,10 @@ class BaseClient {
         if (output === 'json') {
             system = [system, 'Output only valid JSON.'].join('\n\n');
         }
+        const messages = this.normalizeMessages(options);
         return {
             system,
-            messages: this.normalizeMessages(options),
+            messages,
         };
     }
     normalizeTemplateOptions(options) {
@@ -175,14 +176,21 @@ class BaseClient {
             template,
         });
         let system = '';
-        let messages = [];
+        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,
                     {
@@ -209,7 +217,9 @@ class BaseClient {
             return input;
         }
         else {
+            const { messages = [] } = options;
             return [
+                ...messages,
                 {
                     role: 'user',
                     content: input || '',

package/dist/esm/BaseClient.js

@@ -158,9 +158,10 @@ export default class BaseClient {
         if (output === 'json') {
             system = [system, 'Output only valid JSON.'].join('\n\n');
         }
+        const messages = this.normalizeMessages(options);
         return {
             system,
-            messages: this.normalizeMessages(options),
+            messages,
         };
     }
     normalizeTemplateOptions(options) {
@@ -173,14 +174,21 @@ export default class BaseClient {
             template,
         });
         let system = '';
-        let messages = [];
+        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,
                     {
@@ -207,7 +215,9 @@ export default class BaseClient {
             return input;
         }
         else {
+            const { messages = [] } = options;
             return [
+                ...messages,
                 {
                     role: 'user',
                     content: input || '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/ai",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "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;;;MAaC;IAED,4CAwCC;IAED,uCAkBC;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;;iCA1Ua,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"}