wingbot 3.35.1 → 3.36.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.35.1",
+  "version": "3.36.0",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/Ai.js

@@ -40,6 +40,8 @@ let uq = 1;
 
 /** @typedef {import('./Request').IntentAction} IntentAction */
 /** @typedef {import('./Request')} Request */
+/** @typedef {import('./Responder')} Responder */
+/** @typedef {import('./wingbot/CachedModel').Result} Result */
 /** @typedef {import('./wingbot/CustomEntityDetectionModel').Phrases} Phrases */
 
 /**
@@ -348,13 +350,13 @@ class Ai {
         const rules = this.matcher.preprocessRule(intent);
         const matcher = this._createIntentMatcher(rules, usedEntities);
 
-        return async (req) => {
+        return async (req, res) => {
             if (!req.isTextOrIntent()) {
                 return false;
             }
 
             if (!req.intents) {
-                await this._loadIntents(req);
+                await this._loadIntents(req, res);
             }
 
             const winningIntent = matcher(req);
@@ -523,9 +525,10 @@ class Ai {
     /**
      *
      * @param {Request} req
+     * @param {Responder} [res]
      * @returns {Promise}
      */
-    async preloadAi (req) {
+    async preloadAi (req, res = null) {
         if (req.supportsFeature(req.FEATURE_PHRASES)) {
             const model = this._getModelForRequest(req, false);
 
@@ -534,7 +537,7 @@ class Ai {
                     .catch(() => {});
             }
         }
-        return this._preloadIntent(req);
+        return this._preloadIntent(req, res);
     }
 
     /**
@@ -552,12 +555,43 @@ class Ai {
         return CustomEntityDetectionModel.getEmptyPhrasesObject();
     }
 
-    async _preloadIntent (req) {
+    /**
+     *
+     * @param {Request} req
+     * @param {Responder} res
+     * @param {Result} result
+     * @returns {void}
+     */
+    _setResultToReqRes (req, res, result) {
+        const { text = null, intents, entities = [] } = result;
+        Object.assign(req, { intents, entities, _anonymizedText: text });
+
+        if (!res) {
+            return;
+        }
+
+        const entitiesObj = (entities || []).reduce((o, { entity, value }) => {
+            const list = o[entity] || [];
+            list.push(value);
+            return Object.assign(o, { [entity]: list });
+        }, {});
+
+        res.setData({
+            '@': entitiesObj
+        });
+    }
+
+    /**
+     *
+     * @param {Request} req
+     * @param {Responder} [res]
+     * @returns {Promise}
+     */
+    async _preloadIntent (req, res = null) {
         const mockIntent = this._getMockIntent(req);
 
         if (mockIntent) {
-            req.intents = mockIntent.intents;
-            req.entities = mockIntent.entities;
+            this._setResultToReqRes(req, res, mockIntent);
             return;
         }
 
@@ -571,15 +605,15 @@ class Ai {
                 req.intents = [];
                 return;
             }
-            await this._loadIntents(req, model);
+            await this._loadIntents(req, res, model);
         } else {
             req.intents = [];
         }
     }
 
-    async _loadIntents (req, model = null) {
-        const { text = null, intents, entities = [] } = await this._queryModel(req, model);
-        Object.assign(req, { intents, entities, _anonymizedText: text });
+    async _loadIntents (req, res = null, model = null) {
+        const result = await this._queryModel(req, model);
+        this._setResultToReqRes(req, res, result);
     }
 
     async _queryModel (req, useModel = null) {

package/src/Processor.js

@@ -541,7 +541,7 @@ class Processor extends EventEmitter {
                 }
             }
 
-            await Ai.ai.preloadAi(req);
+            await Ai.ai.preloadAi(req, res);
 
             // @deprecated backward compatibility
             const aByAi = req.actionByAi();

package/src/utils/stateData.js

@@ -3,8 +3,19 @@
  */
 'use strict';
 
+/** @typedef {import('../Request')} Request */
+/** @typedef {import('../Responder')} Responder */
+
+/**
+ *
+ * @param {Request} req
+ * @param {Responder} res
+ * @param {object} configuration
+ * @returns {object}
+ */
 module.exports = function stateData (req, res = null, configuration = null) {
     const c = configuration || req.configuration;
+
     return {
         ...req.state,
         ...(res ? res.newState : {}),