wingbot 3.74.8 → 3.75.9-alpha.2

package/src/Processor.js

@@ -13,6 +13,7 @@ const ReturnSender = require('./ReturnSender');
 const { prepareState, mergeState, isUserInteraction } = require('./utils/stateVariables');
 const LLM = require('./LLM');
 const LLMMockProvider = require('./LLMMockProvider');
+const LLMDispatcher = require('./LLMDispatcher');
 
 /** @typedef {import('./wingbot/CustomEntityDetectionModel').Intent} Intent */
 /** @typedef {import('./ReducerWrapper')} ReducerWrapper */
@@ -140,9 +141,9 @@ const LLMMockProvider = require('./LLMMockProvider');
  */
 
 /**
- * @template {ReducerWrapper|Router|BuildRouter} T
+ * @template {ReducerWrapper|Router|BuildRouter} R
  * @callback Preloader
- * @param {T} router
+ * @param {R} router
  * @param {Ai} ai
  * @returns {Promise<void>}
  */
@@ -268,12 +269,11 @@ class Processor extends EventEmitter {
             }
 
             if (dispatchSync) {
-                let previousAction;
                 return Promise.resolve(data)
                     .then((resolvedData) => {
                         let reduceResult;
                         Object.assign(resolvedData, { _localpostback: true });
-                        previousAction = req.setAction(action, resolvedData);
+                        req.dispatcher.overrideAction({ action, data: resolvedData });
                         if (typeof this.reducer === 'function') {
                             // @ts-ignore
                             reduceResult = this.reducer(req, res, postBack);
@@ -283,7 +283,7 @@ class Processor extends EventEmitter {
                         return reduceResult;
                     })
                     .then((reduceResult) => {
-                        req.setAction(previousAction);
+                        req.dispatcher.overrideAction(null);
                         return reduceResult;
                     });
             }
@@ -407,7 +407,7 @@ class Processor extends EventEmitter {
 
         /** @type {LLMGlobalConfig} */
         const llmConfiguration = {
-            provider: new LLMMockProvider(),
+            provider: new LLMMockProvider(message.llmMocks),
             ...this.options.llm
         };
 
@@ -533,10 +533,11 @@ class Processor extends EventEmitter {
                 ? Request.text('none', text)
                 : text;
             // @ts-ignore
-            const req = new Request(request, { lang }, pageId, this.reducer.globalIntents);
-
-            await Ai.ai.preloadAi(req);
-
+            const dispatcher = new LLMDispatcher(Ai.ai, this.reducer.routing, {
+                log: this.options.log
+            });
+            const req = new Request(request, { lang }, pageId, dispatcher);
+            await dispatcher.dispatch(req);
             const actions = req.aiActions();
 
             if (actions.length === 0 && allowEmptyAction && req.intents.length > 0) {
@@ -555,6 +556,7 @@ class Processor extends EventEmitter {
                 ];
             }
 
+            // @ts-ignore
             return actions
                 .map((a) => ({
                     ...a,
@@ -638,13 +640,14 @@ class Processor extends EventEmitter {
                 }
             }
 
-            // @ts-ignore
+            const dispatcher = new LLMDispatcher(Ai.ai, this.reducer.routing, llm, {
+                log: this.options.log
+            });
             req = new Request(
                 message,
                 state,
                 pageId,
-                // @ts-ignore
-                this.reducer.globalIntents,
+                dispatcher,
                 {
                     apiUrl: this.options.apiUrl,
                     secret: this.options.secret,
@@ -719,6 +722,7 @@ class Processor extends EventEmitter {
                 senderMeta,
                 llm
             );
+            llm.setReqRes(req, res);
             const postBack = this._createPostBack(postbackAcumulator, req, res, features);
 
             let continueDispatching = true;
@@ -738,7 +742,7 @@ class Processor extends EventEmitter {
 
             await Promise.all([
                 preloadPromise,
-                Ai.ai.preloadAi(req, res)
+                dispatcher.dispatch(req, res)
             ]);
 
             // @deprecated backward compatibility

package/src/ReducerWrapper.js

@@ -4,6 +4,11 @@
 'use strict';
 
 const EventEmitter = require('events');
+const LLMDispatcher = require('./LLMDispatcher');
+
+/** @typedef {import('./Responder')} Responder */
+/** @typedef {import('./Request')} Request */
+/** @typedef {import('./LLMDispatcher').Routing} Routing */
 
 /**
  * Solution for catching events. This is useful for analytics.
@@ -39,6 +44,25 @@ class ReducerWrapper extends EventEmitter {
         this.processMessage = null;
 
         this.setMaxListeners(Infinity);
+
+        this.globalIntents = new Map();
+
+        /** @type {Routing} */
+        this._routing = null;
+    }
+
+    resetRouter () {
+        this._routing = null;
+    }
+
+    /**
+     * @returns {Routing}
+     */
+    get routing () {
+        if (this._routing === null) {
+            this._routing = LLMDispatcher.prepareRouting(this.globalIntents);
+        }
+        return this._routing;
     }
 
     /**