wingbot 3.67.22 → 3.67.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.67.22",
+  "version": "3.67.24",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",

package/src/Ai.js

@@ -553,9 +553,15 @@ class Ai {
         };
     }
 
-    ruleIsMatching (intent, req, stateless = false) {
+    ruleIsMatching (intent, req, stateless = false, noEntityThreshold = false) {
         const rules = this.matcher.preprocessRule(intent);
-        const winningIntent = this.matcher.match(req, rules, stateless);
+        const winningIntent = this.matcher.match(
+            req,
+            rules,
+            stateless,
+            undefined,
+            noEntityThreshold
+        );
 
         if (!winningIntent || winningIntent.score < this.threshold) {
             return null;

package/src/AiMatching.js

@@ -467,9 +467,10 @@ class AiMatching {
      * @param {PreprocessorOutput} rule
      * @param {boolean} [stateless]
      * @param {Entity[]} [reqEntities]
+     * @param {boolean} [noEntityThreshold]
      * @returns {Intent|null}
      */
-    match (req, rule, stateless = false, reqEntities = req.entities) {
+    match (req, rule, stateless = false, reqEntities = req.entities, noEntityThreshold = false) {
         const { regexps, intents, entities } = rule;
 
         const noIntentHandicap = req.intents.length === 0 ? 0 : this.redundantIntentHandicap;
@@ -510,7 +511,10 @@ class AiMatching {
                     textLength,
                     entities,
                     reqEntities,
-                    useState
+                    useState,
+                    undefined,
+                    undefined,
+                    noEntityThreshold
                 );
 
             const allOptional = entities.every((e) => e.optional
@@ -576,7 +580,8 @@ class AiMatching {
                             requestIntent,
                             entities,
                             req,
-                            useState
+                            useState,
+                            noEntityThreshold
                         );
 
                     if (score > max) {
@@ -610,6 +615,7 @@ class AiMatching {
      * @param {EntityExpression[]} wantedEntities
      * @param {AIRequest} req
      * @param {object} useState
+     * @param {boolean} [noEntityThreshold]
      * @returns {{score:number,entities:Entity[]}}
      */
     _intentMatchingScore (
@@ -618,7 +624,8 @@ class AiMatching {
         requestIntent,
         wantedEntities,
         req,
-        useState
+        useState,
+        noEntityThreshold = false
     ) {
         if (wantedIntent !== requestIntent.intent) {
             return { score: 0, entities: [] };
@@ -644,7 +651,8 @@ class AiMatching {
                 requestIntent.entities
                     ? (x) => Math.atan((x - 0.76) * 40) / Math.atan((1 - 0.76) * 40)
                     : (x) => x,
-                req.entities
+                req.entities,
+                noEntityThreshold
             );
 
         // eslint-disable-next-line max-len,object-curly-newline
@@ -680,7 +688,8 @@ class AiMatching {
      * @param {Entity[]} requestEntities
      * @param {object} [requestState]
      * @param {Function} [scoreFn]
-     * @param {Entity[]} allEntities
+     * @param {Entity[]} [allEntities]
+     * @param {boolean} [noEntityThreshold]
      *
      * @returns {EntityMatchingResult}
      */
@@ -690,7 +699,8 @@ class AiMatching {
         requestEntities = [],
         requestState = {},
         scoreFn = (x) => x,
-        allEntities = requestEntities
+        allEntities = requestEntities,
+        noEntityThreshold = false
     ) {
         const occurences = new Map();
 
@@ -713,7 +723,7 @@ class AiMatching {
                 .findIndex((e, i) => {
                     if (e.entity !== wanted.entity
                         || usedIndexes.includes(i)
-                        || e.score < ENTITY_OK) {
+                        || (!noEntityThreshold && e.score < ENTITY_OK)) {
                         return false;
                     }
                     entityExists = true;

package/src/BotApp.js

@@ -166,24 +166,33 @@ class BotApp {
              * @param {Responder} res
              */
             afterProcessMessage (req, res) {
-                const wasSet = req.getSetContext(true);
-                const updatedVariables = Object.keys(res.newState)
-                    .filter((key) => key.match(/^§/) && wasSet[key] !== res.newState[key]);
-
-                if (updatedVariables.length !== 0) {
-                    const setContext = updatedVariables
-                        .reduce((o, key) => Object.assign(o, {
-                            [key.replace(/^§/, '')]: res.newState[key]
-                        }), {});
-
-                    res.send({
-                        set_context: setContext
-                    });
-                }
+                BotApp.sendContext(req, res);
             }
         };
     }
 
+    /**
+     *
+     * @param {Request} req
+     * @param {Responder} res
+     */
+    static sendContext (req, res) {
+        const wasSet = req.getSetContext(true);
+        const updatedVariables = Object.keys(res.newState)
+            .filter((key) => key.match(/^§/) && wasSet[key] !== res.newState[key]);
+
+        if (updatedVariables.length !== 0) {
+            const setContext = updatedVariables
+                .reduce((o, key) => Object.assign(o, {
+                    [key.replace(/^§/, '')]: res.newState[key]
+                }), {});
+
+            res.send({
+                set_context: setContext
+            });
+        }
+    }
+
     /**
      * Get the processor instance
      *

package/src/Request.js

@@ -1649,7 +1649,7 @@ It looks like the bot isn't connected to class BotApp or the Processor is used w
         entity,
         value,
         score = 1,
-        entityScore = Math.max(score, 0.8),
+        entityScore = Math.max(score, 0.835),
         timestamp = makeTimestamp()
     ) {
         const res = Request.text(senderId, text, timestamp);

package/src/Tester.js

@@ -461,13 +461,21 @@ class Tester {
      * @param {string} [value]
      * @param {string} [text]
      * @param {number} [score]
+     * @param {number} [entityScore]
      * @returns {Promise}
      *
      * @memberOf Tester
      */
-    intentWithEntity (intent, entity, value = entity, text = intent, score = 1) {
+    intentWithEntity (
+        intent,
+        entity,
+        value = entity,
+        text = intent,
+        score = 1,
+        entityScore = score
+    ) {
         return this.processMessage(Request
-            .intentWithEntity(this.senderId, text, intent, entity, value, score));
+            .intentWithEntity(this.senderId, text, intent, entity, value, score, entityScore));
     }
 
     /**

package/src/fuzzy/factoryFuzzySearch.js

@@ -41,7 +41,7 @@ function getIndexesToIterate (ngrams, tfEntry) {
 function searchFnFactory (indexMap, ngramCounts, entities, maxIdf, {
     stemmer = null,
     keepMultipleValues = false,
-    threshold = 0.79,
+    threshold = 0.835,
     limit = undefined
 }, hasFuzzyMultiplier = false) {
     /** @type {WordEntityDetector} */