wingbot 3.71.5 → 3.72.0

package/src/testTools/asserts.js

@@ -7,6 +7,9 @@ const assert = require('assert');
 const deepExtend = require('deep-extend');
 const { actionMatches, parseActionPayload } = require('../utils');
 
+/** @typedef {import('../LLM').PromptInfo} PromptInfo */
+/** @typedef {import('../LLM').LLMMessage} LLMMessage */
+
 /**
  * Format message
  *
@@ -29,9 +32,21 @@ function m (text, actual = null, expected = null) {
     return `${text}${result}`;
 }
 
-function ex (message, expected, actual) {
-    const actuals = Array.isArray(actual) ? actual : [actual];
-    return `${message}\n  + expected: "${expected}"\n  - actual:   ${actuals
+function ex (message, expected, actual = null) {
+    let actuals;
+    if (Array.isArray(actual)) {
+        actuals = actual;
+    } else {
+        actuals = actual === null ? [] : [actual];
+    }
+
+    const msg = `${message}\n  + expected: "${expected}"`;
+
+    if (actuals.length === 0) {
+        return msg;
+    }
+
+    return `${msg}\n  - actual:   ${actuals
         .map((a) => `"${a}"`).join('\n              ')}`;
 }
 
@@ -144,6 +159,28 @@ function contains (response, search, message = 'Should contain a text') {
     return true;
 }
 
+/**
+ *
+ * @param {LLMMessage} llmMsg
+ * @param {string} search
+ * @param {string|false} message
+ */
+function llmContains (llmMsg, search, message = 'Should contain a text') {
+    const text = llmMsg.content;
+
+    const typeIsText = typeof text === 'string';
+    if (message === false && !typeIsText) {
+        return false;
+    }
+    assert.ok(typeIsText, m(message, search, 'not a text message'));
+    const match = searchMatchesText(search, text);
+    if (message === false) {
+        return match;
+    }
+    assert.ok(match, m(message, text, search));
+    return true;
+}
+
 /**
  * Checks quick response action
  *
@@ -374,5 +411,6 @@ module.exports = {
     quickReplyText,
     getText,
     parseActionPayload,
-    ex
+    ex,
+    llmContains
 };

package/src/utils/customCondition.js

@@ -175,9 +175,22 @@ const compare = (variable, operator, value = undefined) => {
     }
 };
 
+/** @typedef {'if'|'it'|'c'|'nc'|'mr'|'nmr'|'st'|'gt'|'set'|'get'|'eq'|'neq'} ConditionOperator */
+
+/**
+ * @typedef {object} EditableConditionRule
+ * @prop {string} value
+ * @prop {ConditionOperator} operator
+ * @prop {string} variable
+ */
+
+/**
+ * @typedef {EditableConditionRule[][]} EditableCondition
+ */
+
 /**
  *
- * @param {{value:string, operator:string, variable:string}[][]} condition
+ * @param {EditableCondition} condition
  * @param {object} configuration
  * @param {string} description
  */

package/src/utils/getCondition.js

@@ -7,11 +7,23 @@ const customCondition = require('./customCondition');
 const customFn = require('./customFn');
 
 /** @typedef {import('../BuildRouter').BotContext} BotContext */
+/** @typedef {import('./customCondition').EditableCondition} EditableCondition */
+
+// eslint-disable-next-line max-len
+/** @typedef {Pick<BotContext,'configuration'|'allowForbiddenSnippetWords'|'linksMap'|'ai'>} ConditionContext */
+
+/**
+ * @typedef {object} ConditionDefinition
+ * @prop {boolean} [hasCondition]
+ * @prop {string} [conditionFn]
+ * @prop {boolean} [hasEditableCondition]
+ * @prop {EditableCondition} [editableCondition]
+ */
 
 /**
  *
- * @param {object} params
- * @param {BotContext} context
+ * @param {ConditionDefinition} params
+ * @param {ConditionContext} context
  * @param {string} description
  * @returns {Function}
  */
@@ -27,7 +39,7 @@ module.exports = function getCondition (params, context, description = '') {
         editableCondition = []
     } = params;
 
-    let condition = null;
+    let condition;
 
     if (hasCondition) {
         if (hasEditableCondition) {
@@ -36,7 +48,7 @@ module.exports = function getCondition (params, context, description = '') {
             condition = customFn(conditionFn, description, allowForbiddenSnippetWords);
         }
     } else {
-        condition = customFn('(req,res)=>true', description, allowForbiddenSnippetWords);
+        condition = () => true;
     }
     return condition;
 };

package/src/utils/getUpdate.js

@@ -88,7 +88,7 @@ function toArray (previousValue) {
 const ENTITY_HBS_REGEXP = /^\s*\{\{\[?@([^@[\]{}\s]+)(\])?\}\}\s*$/;
 const VARIABLE_HBS_REGEXP = /^\s*\{\{\[?([^$@[\]{}\s]+)\]?\}\}\s*$/;
 
-function getSetState (setState, req, res = null, useState = null, configuration = null) {
+function getSetState (setState, req, res = null, stateOverride = null, configuration = null) {
     if (!setState) {
         return {};
     }
@@ -96,7 +96,7 @@ function getSetState (setState, req, res = null, useState = null, configuration
         .filter((k) => k !== '_');
 
     let obj = {};
-    let state = stateData(req, res, configuration, useState);
+    let state = stateData(req, res, configuration, stateOverride);
 
     keys.forEach((k) => {
         const val = setState[k];
@@ -166,8 +166,8 @@ function getSetState (setState, req, res = null, useState = null, configuration
                     if (entity && (!rear || req.entities.some((e) => e.entity === entity))) {
                         values = req.entities.filter((e) => e.entity === entity)
                             .map((e) => e.value);
-                        if (values.length === 0 && useState && useState[`@${entity}`]) {
-                            values = [useState[`@${entity}`]];
+                        if (values.length === 0 && stateOverride && stateOverride[`@${entity}`]) {
+                            values = [stateOverride[`@${entity}`]];
                         }
                     } else if (variable) {
                         values = toArray(getValue(variable, state));

package/src/utils/stateData.js

@@ -16,6 +16,7 @@ const { dateToISO8601String, zeroHourDate } = require('./datetime');
  * @prop {object} [configuration]
  * @prop {Function} text
  * @prop {Function} [actionData]
+ * @prop {Function} [isConfidentInput]
  */
 
 /**
@@ -68,6 +69,7 @@ module.exports = function stateData (
         $today,
         $tomorrow,
         $yesterday,
+        $llmResult: res?.llm?.lastResult?.content,
         // yes - res because of circular dependency
         ...(res && req && req.actionData()),
         ...(res ? res.data : {}),