wingbot 3.65.10 → 3.65.12

package/package.json

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

package/plugins/index.js

@@ -8,14 +8,14 @@ const pluginsJson = require('./plugins.json');
 const plugins = new Map();
 
 for (const plugin of pluginsJson.plugins) {
-    // @ts-ignore
-    const fn = module.require(`./${plugin.id}/plugin`);
+    plugins.set(plugin.id, {
+        pluginFactory: (...args) => {
+            // @ts-ignore
+            const fn = module.require(`./${plugin.id}/plugin`);
 
-    if (plugin.isFactory) {
-        plugins.set(plugin.id, { pluginFactory: fn });
-    } else {
-        plugins.set(plugin.id, fn);
-    }
+            return plugin.isFactory ? fn(...args) : fn;
+        }
+    });
 }
 
 module.exports = plugins;

package/src/AiMatching.js

@@ -160,6 +160,13 @@ class AiMatching {
          */
         this.redundantEntityHandicap = 0.02;
 
+        /**
+         * Upper threshold for redundant entity handicaps
+         *
+         * @type {number}
+         */
+        this.redundantEntityClamp = 0.1;
+
         /**
          * When there is additional intent, the final score will be lowered by this value
          * (0.02 by default)
@@ -808,11 +815,31 @@ class AiMatching {
                 ? 1
                 : 0;
 
-            handicap += (requestEntities.length + fromState - matched.length + coveringHandicap)
-                * this.redundantEntityHandicap;
+            const matchingSame = requestEntities.reduce((cnt, e) => {
+                const inMatching = matched.some((me) => e.entity === me.entity);
+                return cnt + (inMatching ? 1 : 0);
+            }, 0);
+
+            // all of them can be in state
+            const distinctEntities = new Set(matched.map((m) => m.entity)).size;
+            const matchSameOver = matchingSame - matched.length;
+            const nonMatching = requestEntities.length - matchingSame;
+
+            const redundantCount = nonMatching
+                + (matchSameOver > distinctEntities ? matchSameOver * 0.5 : matchSameOver);
+
+            // eslint-disable-next-line max-len
+            // console.log({ distinctEntities, redundantCount, nonMatching, matchSameOver, mat: matched.length, req: requestEntities.length });
+
+            const redundantHandicap = Math.min(
+                this.redundantEntityHandicap * (redundantCount + fromState + coveringHandicap),
+                this.redundantEntityClamp
+            );
+
+            handicap += redundantHandicap;
 
             // eslint-disable-next-line max-len
-            // console.log({ requestEntities, matched, handicap, coveringHandicap, otherEntitiesTextLen });
+            // console.log({ redundantHandicap, requestEntities, matched, handicap, coveringHandicap, otherEntitiesTextLen });
 
         }
         const score = matched.length === 0 ? 0 : sum / matched.length;

package/src/graphApi/GraphApi.js

@@ -4,7 +4,6 @@
 'use strict';
 
 const assert = require('assert');
-const { graphql, buildSchema } = require('graphql');
 const WingbotApiConnector = require('./WingbotApiConnector');
 // @ts-ignore
 const packageJson = require('../../package.json');
@@ -21,6 +20,7 @@ const DEFAULT_CACHE = 86400000; // 24 hours
  */
 
 /** @typedef {import('../CallbackAuditLog')} AuditLog */
+/** @typedef {import('graphql')} GqlLib */
 
 /**
  * Experimental chatbot API
@@ -81,6 +81,19 @@ class GraphApi {
             cacheKeys: opts.cacheKeys,
             useBundledGql: opts.useBundledGql
         });
+
+        this._lib = null;
+    }
+
+    /**
+     * @returns {GqlLib}
+     */
+    get _gql () {
+        if (this._lib === null) {
+            // eslint-disable-next-line global-require
+            this._lib = require('graphql');
+        }
+        return this._lib;
     }
 
     /**
@@ -139,7 +152,7 @@ class GraphApi {
             audit
         };
 
-        const response = await graphql({
+        const response = await this._gql.graphql({
             schema,
             source: body.query,
             rootValue: this._root,
@@ -159,7 +172,7 @@ class GraphApi {
 
         if (!schemaIsSame) {
             this._originalSchema = loadedSchema;
-            this._cachedSchema = buildSchema(loadedSchema);
+            this._cachedSchema = this._gql.buildSchema(loadedSchema);
         }
         return this._cachedSchema;
     }