wingbot 3.73.8 → 3.73.10

package/package.json

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

package/src/BuildRouter.js

@@ -142,7 +142,7 @@ const DUMMY_ROUTE = { id: 0, path: null, resolvers: [] };
  * @prop {boolean} [allowForbiddenSnippetWords] - disable security rule
  * @prop {Middleware} [defaultPlugin] - to be able to test configurations without plugins
  * @prop {RouteConfig[]} [routeConfigs] - list of disabled routes
- * @prop {boolean|keyof ILogger} [canaryLogs]
+ * @prop {boolean|string} [canaryLogs]
  * @prop {ILogger} [log]
  * @prop {C} [configuration] - context data
  */

package/src/resolvers/message.js

@@ -449,47 +449,55 @@ function message (params, context = {}) {
         if (params.type === 'prompt' && !res.llm.configuration.disableLLM) {
             res.typingOn()
                 .wait(1000);
-            const session = await res.llmSessionWithHistory(params.llmContextType);
 
-            await session.systemPrompt(text)
-                .generate();
+            let session;
+            let evaluation;
+            let discard;
 
-            const evaluation = await res.llmEvaluate(session, params.llmContextType);
+            try {
+                session = await res.llmSessionWithHistory(params.llmContextType);
 
-            if (evaluation.discard) {
+                await session.systemPrompt(text)
+                    .generate();
+
+                evaluation = await res.llmEvaluate(session, params.llmContextType);
+                ({ discard } = evaluation);
+            } catch (e) {
+                (context.log || console).error(`LLM ERR: ${e.message} [${req.senderId}]`, e);
+                discard = true;
+            }
+
+            if (discard) {
                 canaryLog(context.log, context.canaryLogs, 'LLM discarded', {
                     evaluation,
                     session
                 });
-                if (isLastMessage && !req.actionData()._resolverTag) {
-                    res.finalMessageSent = true;
-                }
-                return ret;
-            }
+            } else {
 
-            if (evaluation.action) {
-                postBack(evaluation.action);
-                return Router.END;
-            }
+                if (evaluation.action) {
+                    postBack(evaluation.action);
+                    return Router.END;
+                }
 
-            // if (!response.content) {
-            //    // no response?
-            // }
+                // if (!response.content) {
+                //    // no response?
+                // }
 
-            const messages = session.messagesToSend();
+                const messages = session.messagesToSend();
 
-            res.setFlag(LLM.GPT_FLAG);
+                res.setFlag(LLM.GPT_FLAG);
 
-            const lastMessageI = messages.length - 1;
-            messages.forEach((m, i) => {
-                if (lastMessageI === i) {
-                    text = m.content;
-                } else {
-                    res.text(m.content, null, null, {
-                        disableAutoTyping: true
-                    });
-                }
-            });
+                const lastMessageI = messages.length - 1;
+                messages.forEach((m, i) => {
+                    if (lastMessageI === i) {
+                        text = m.content;
+                    } else {
+                        res.text(m.content, null, null, {
+                            disableAutoTyping: true
+                        });
+                    }
+                });
+            }
         }
 
         res.text(text, sendReplies, voiceControl, {

package/src/utils/canaryLog.js

@@ -13,7 +13,7 @@
 /**
  *
  * @param {ILogger} logger
- * @param {boolean|keyof ILogger} setting
+ * @param {boolean|string} setting
  * @param {string} message
  * @param {...*} args
  * @returns {void}