wingbot 3.58.2 → 3.59.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.58.2",
+  "version": "3.59.1",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "doc": "npm run doc:gql && node ./bin/makeApiDoc.js && cpy ./CHANGELOG.md ./doc && gitbook install ./doc && gitbook build ./doc && rimraf -rf ./docs && rimraf --rf ./doc/CHANGELOG.md && move-cli ./doc/_book ./docs",
     "test": "npm run test:lint && npm run test:coverage && npm run test:coverage:threshold",
     "test:coverage": "nyc --reporter=html mocha ./test && nyc report",
-    "test:coverage:threshold": "nyc check-coverage --lines 89 --functions 89 --branches 80",
+    "test:coverage:threshold": "nyc check-coverage --lines 90 --functions 89 --branches 80",
     "test:backend": "mocha ./test",
     "test:lint": "eslint --ext .js src test *.js plugins"
   },

package/plugins/ai.wingbot.openai/plugin.js

@@ -4,6 +4,7 @@
 'use strict';
 
 const fetch = require('node-fetch').default;
+const Responder = require('../../src/Responder');
 const compileWithState = require('../../src/utils/compileWithState');
 
 const MSG_REPLACE = '#MSG-REPLACE#';
@@ -31,7 +32,7 @@ function chatgptPlugin (params, configuration = {}) {
 
         const maxTokens = parseFloat(compileWithState(req, res, params.maxTokens).trim() || '512') || 512;
 
-        const limit = parseInt(compileWithState(req, res, params.maxTokens).trim() || '10', 10) || 10;
+        const limit = parseInt(compileWithState(req, res, params.limit).trim() || '10', 10) || 10;
 
         const user = `${req.pageId}|${req.senderId}`;
 
@@ -45,6 +46,7 @@ function chatgptPlugin (params, configuration = {}) {
         let body;
 
         try {
+            res.setFlag('gpt');
             res.typingOn();
 
             body = {
@@ -56,7 +58,9 @@ function chatgptPlugin (params, configuration = {}) {
                 user
             };
 
-            const ts = await res.getTranscript(limit);
+            const onlyFlag = Math.sign(limit) === -1 ? 'gpt' : null;
+
+            const ts = await res.getTranscript(Math.abs(limit), onlyFlag);
 
             const messages = [
                 ...(system ? [{ role: 'system', content: system }] : []),
@@ -119,6 +123,28 @@ function chatgptPlugin (params, configuration = {}) {
                         .forEach((t) => {
                             let trim = t.trim();
 
+                            if (annotation) {
+                                // replace the annotation first
+
+                                const replacements = annotation.split(MSG_REPLACE);
+                                const last = replacements.length > 1
+                                    ? replacements.length - 1
+                                    : replacements.length;
+                                replacements.forEach((r, i) => {
+                                    const foundI = trim.indexOf(r.trim(), i === last
+                                        ? trim.length - r.trim().length
+                                        : 0);
+
+                                    if (foundI === -1
+                                        || (i === 0 && foundI > 0)
+                                        || (i === last && (trim.length - foundI - r.length) > 0)) {
+                                        return;
+                                    }
+
+                                    trim = trim.replace(r.trim(), '').trim();
+                                });
+                            }
+
                             if (annotation && annotation.includes(MSG_REPLACE)) {
                                 trim = annotation.replace(MSG_REPLACE, trim);
                             } else if (annotation) {

package/plugins/plugins.json

@@ -552,6 +552,18 @@
                         }
                     ]
                 },
+                {
+                    "type": "text",
+                    "name": "limit",
+                    "label": "History context limit: (10)",
+                    "validations": [
+                        {
+                            "type": "regexp",
+                            "value": "^-?[0-9]*$",
+                            "message": "History context limit should be a valid number"
+                        }
+                    ]
+                },
                 {
                     "type": "text",
                     "name": "persona",

package/src/Responder.js

@@ -216,14 +216,25 @@ class Responder {
         return this._configuration._cachedPersonas.get(nameKey);
     }
 
+    /**
+     *
+     * @param {string} flag
+     * @returns {this}
+     */
+    setFlag (flag) {
+        this._senderMeta.flag = flag;
+        return this;
+    }
+
     /**
      *
      * Returns current conversation transcript
      *
      * @param {number} [limit]
+     * @param {string} [onlyFlag]
      * @returns {Promise<Transcript[]>}
      */
-    async getTranscript (limit = 10) {
+    async getTranscript (limit = 10, onlyFlag = null) {
         const { chatLogStorage } = this._messageSender;
         if (!chatLogStorage) {
             return [];
@@ -232,7 +243,8 @@ class Responder {
             chatLogStorage,
             this._senderId,
             this._pageId,
-            limit
+            limit,
+            onlyFlag
         );
         const { responseTexts = [] } = chatLogStorage;
         transcript.push(...responseTexts.map((text) => ({

package/src/transcript/transcriptFromHistory.js

@@ -29,14 +29,25 @@ const extractText = require('./extractText');
  * @param {IChatStorage} chatLogStorage
  * @param {string} senderId
  * @param {string} pageId
- * @param {number} limit
+ * @param {number} [limit]
+ * @param {string} [onlyFlag]
  * @returns {Promise<Transcript[]>}
  */
-async function transcriptFromHistory (chatLogStorage, senderId, pageId, limit = 20) {
+async function transcriptFromHistory (
+    chatLogStorage,
+    senderId,
+    pageId,
+    limit = 20,
+    onlyFlag = null
+) {
     if (typeof chatLogStorage.getInteractions !== 'function') {
         return [];
     }
-    const data = await chatLogStorage.getInteractions(senderId, pageId, limit);
+    let data = await chatLogStorage.getInteractions(senderId, pageId, limit);
+
+    if (onlyFlag) {
+        data = data.filter((h) => h.flag === onlyFlag);
+    }
 
     return data
         .map((turn) => {