wingbot 3.53.2 → 3.53.4

package/package.json

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

package/src/AiMatching.js

@@ -504,22 +504,31 @@ class AiMatching {
                     ? (tot + (entity.end - entity.start))
                     : null
             ), 0);
+            const textLength = req.text().trim().length;
 
-            let finalScore = (baseScore - handicap)
-                * (this.multiMatchGain ** countOfAdditionalItems);
+            const useHandicap = textLength <= matchedEntitiesTextLength
+                ? Math.max(-this.redundantEntityHandicap, baseScore - 1)
+                : handicap;
 
-            const textLength = req.text().length;
+            let finalScore = (baseScore - useHandicap)
+                * (this.multiMatchGain ** countOfAdditionalItems);
 
             if (matchedEntitiesTextLength && textLength) {
                 const remainingScore = Math.max(0, Math.min(1, finalScore) - (
                     this._ai.confidence + this.redundantEntityHandicap
                 ));
 
-                finalScore -= (matchedEntitiesTextLength / textLength) * remainingScore;
+                const remainingTextLen = (textLength - matchedEntitiesTextLength);
+                const minus = (remainingTextLen / textLength) * remainingScore;
+
+                // eslint-disable-next-line max-len,object-curly-newline
+                // console.log({ minus, matchedEntitiesTextLength, textLength, remainingScore })
+
+                finalScore -= minus;
             }
 
-            // eslint-disable-next-line no-console,max-len,object-curly-newline
-            // console.log({ finalScore, rule, baseScore, score, allOptional, entities, reqEntities, matchedEntitiesTextLength, countOfAdditionalItems });
+            // eslint-disable-next-line max-len,object-curly-newline
+            // console.log({ countOfAdditionalItems, multiMatch: this.multiMatchGain ** countOfAdditionalItems, handicap, useHandicap, finalScore, rule, baseScore, score, allOptional, entities, reqEntities, matchedEntitiesTextLength });
 
             if (finalScore <= 0) {
                 return null;
@@ -603,7 +612,7 @@ class AiMatching {
                     : (x) => x
             );
 
-        // eslint-disable-next-line no-console,max-len,object-curly-newline
+        // eslint-disable-next-line max-len,object-curly-newline
         // console.log({ wantedEntities, entitiesScore, handicap, matched, minScore, requestIntent });
 
         const allOptional = wantedEntities.every((e) => e.optional
@@ -618,7 +627,7 @@ class AiMatching {
 
         const score = Math.round((scoreWithHandicap * multiMatchGain) * 10000) / 10000;
 
-        // eslint-disable-next-line no-console,max-len,object-curly-newline
+        // eslint-disable-next-line max-len,object-curly-newline
         // console.log({ IMS: score, normalizedScore, scoreWithHandicap, multiMatchGain, wantedEntities });
 
         return {
@@ -738,7 +747,7 @@ class AiMatching {
             }
         }
 
-        // eslint-disable-next-line no-console,max-len
+        // eslint-disable-next-line max-len
         // console.log({ wantedEntities, sum, handicap, rl: requestEntities.length, ml: matched.length });
 
         // @todo - neni mozne, by doslo k negativnimu handicapu

package/src/Router.js

@@ -14,9 +14,7 @@ function defaultPathContext () {
     return { globalIntentsMeta: {}, path: '/*' };
 }
 
-/**
- * @typedef {true|false|null|undefined|-1|void} RoutingInstruction
- */
+/** @typedef {true|false|null|undefined|number|void} RoutingInstruction */
 
 /**
  * @callback PostBackDataCallback