wingbot 3.36.0 → 3.36.1

package/package.json

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

package/src/Ai.js

@@ -205,6 +205,10 @@ class Ai {
         return model;
     }
 
+    get localEnhancement () {
+        return (1 - this.confidence) / 2;
+    }
+
     async processSetStateEntities (req, setState) {
         const keys = Object.keys(setState);
 

package/src/AiMatching.js

@@ -132,6 +132,12 @@ class AiMatching {
          * @type {number}
          */
         this.multiMatchGain = 1.2;
+
+        /**
+         * Score of a context entity within a conversation state
+         * (1 by default)
+         */
+        this.stateEntityScore = 1;
     }
 
     get redundantHandicap () {
@@ -480,6 +486,10 @@ class AiMatching {
         return winningIntent;
     }
 
+    _getMultiMatchGain (entitiesScore, matchedCount, fromState = 0) {
+        return (this.multiMatchGain * entitiesScore) ** (matchedCount - fromState);
+    }
+
     /**
      *
      * @private
@@ -505,7 +515,7 @@ class AiMatching {
         }
 
         const {
-            score: entitiesScore, handicap, matched, minScore
+            score: entitiesScore, handicap, matched, minScore, fromState
         } = this
             ._entityMatching(
                 wantedEntities,
@@ -516,13 +526,20 @@ class AiMatching {
                     : (x) => x
             );
 
+        // console.log({ entitiesScore, handicap, matched, minScore, requestIntent })
+
         const allOptional = wantedEntities.every((e) => e.optional);
         if (entitiesScore === 0 && !allOptional) {
             return { score: 0, entities: [] };
         }
 
-        const score = (Math.min(minScore + (handicap / 2), requestIntent.score) - handicap)
-            * ((this.multiMatchGain * entitiesScore) ** matched.length);
+        const normalizedScore = Math.min(minScore + (handicap / 2), requestIntent.score);
+        const scoreWithHandicap = normalizedScore - handicap;
+        const multiMatchGain = this._getMultiMatchGain(entitiesScore, matched.length, fromState);
+
+        const score = scoreWithHandicap * multiMatchGain;
+
+        // console.log({ IMS: score, normalizedScore, scoreWithHandicap, multiMatchGain });
 
         return {
             score,
@@ -537,7 +554,7 @@ class AiMatching {
      * @param {Entity[]} requestEntities
      * @param {object} [requestState]
      * @param {Function} [scoreFn]
-     * @returns {{score: number, handicap: number, matched: Entity[], minScore: number }}
+     * @returns {{score:number,handicap:number, matched:Entity[],minScore:number,fromState:number}}
      */
     _entityMatching (wantedEntities, requestEntities = [], requestState = {}, scoreFn = (x) => x) {
         const occurences = new Map();
@@ -546,6 +563,7 @@ class AiMatching {
         let handicap = 0;
         let sum = 0;
         let minScore = 1;
+        let fromState = 0;
 
         for (const wanted of wantedEntities) {
             const usedIndexes = occurences.has(wanted.entity)
@@ -579,9 +597,11 @@ class AiMatching {
                     requestEntity = {
                         value: requestState[`@${wanted.entity}`],
                         entity: wanted.entity,
-                        score: 1
+                        score: this.stateEntityScore
                     };
 
+                    fromState += 1;
+
                     matching = this._entityIsMatching(
                         wanted.op,
                         wanted.compare,
@@ -596,7 +616,7 @@ class AiMatching {
 
             if (!matching && !wanted.optional) {
                 return {
-                    score: 0, handicap: 0, matched: [], minScore
+                    score: 0, handicap: 0, matched: [], minScore, fromState
                 };
             }
 
@@ -636,11 +656,15 @@ class AiMatching {
             }
         }
 
-        handicap += (requestEntities.length - matched.length) * this.redundantEntityHandicap;
+        // console.log({ sum, handicap, rl: requestEntities.length, ml: matched.length });
+
+        // @todo - neni mozne, by doslo k negativnimu handicapu
+        handicap += (requestEntities.length + fromState - matched.length)
+            * this.redundantEntityHandicap;
         const score = matched.length === 0 ? 0 : sum / matched.length;
 
         return {
-            score, handicap, matched, minScore
+            score, handicap, matched, minScore, fromState
         };
     }
 

package/src/Request.js

@@ -1227,7 +1227,6 @@ class Request {
         // to match the local context intent
         const localRegexToMatch = this._getLocalPathRegexp();
 
-        const localEnhancement = (1 - Ai.ai.confidence) / 2;
         for (const gi of this.globalIntents.values()) {
             const pathMatches = localRegexToMatch && localRegexToMatch.exec(gi.action);
             if (gi.local && !pathMatches) {
@@ -1235,7 +1234,9 @@ class Request {
             }
             const intent = gi.matcher(this, null, true);
             if (intent !== null) {
-                const sort = intent.score + (pathMatches ? localEnhancement : 0);
+                const sort = intent.score + (pathMatches
+                    ? Ai.ai.localEnhancement
+                    : 0);
                 // console.log(sort, wi.intent);
                 aiActions.push({
                     ...gi,