wingbot 3.76.4-alpha.14 → 3.76.4-alpha.16

package/package.json

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

package/src/resolvers/languageText.js

@@ -0,0 +1,85 @@
+/*
+ * @author David Menger
+ */
+'use strict';
+
+/**
+ * null = text+voice
+ * t = text only
+ * v = voice only
+ * s = ssml
+ *
+ * @typedef {"t"|"v"|"s"|null} Purpose
+ */
+
+/**
+ * @typedef Translation
+ * @property {string|string[]} t - text alternatives
+ * @property {string | null} l - language
+ * @property {Purpose | Purpose[]} [p] - purposes
+ */
+
+/**
+ * @typedef {Translation[] | Translation | string[] | string} Translations
+ */
+
+/**
+ * @param {string | string[] | Translation | Translation[]} translations
+ * @returns {translations is Translation[]}
+ */
+function isArrayOfObjects (translations) {
+    return Array.isArray(translations)
+        && typeof translations[0] === 'object'
+        && translations[0] !== null;
+}
+
+function isTextObjectEmpty (text) {
+    if (!text || !text.t) {
+        return true;
+    }
+    if (Array.isArray(text.t)) {
+        return !text.t.some((t) => !!t);
+    }
+    return false;
+}
+
+/**
+ * @param {Translations} translations
+ * @param {string} [lang]
+ * @param {boolean} [disableDefaulting] - it will try to find translation for other language
+ * @returns {null|string|string[]}
+ */
+function getLanguageText (translations, lang = null, disableDefaulting = false) {
+    let foundText;
+
+    if (isArrayOfObjects(translations)) {
+        if (lang) {
+            // @ts-ignore
+            foundText = translations.find((t) => t.l === lang);
+        } else if (disableDefaulting) {
+            // @ts-ignore
+            [foundText] = translations;
+        }
+        if (isTextObjectEmpty(foundText) && !disableDefaulting) {
+            // @ts-ignore
+            foundText = translations.find((t) => !isTextObjectEmpty(t));
+        }
+        foundText = foundText ? foundText.t : null;
+    } else {
+        foundText = translations;
+    }
+    if (Array.isArray(foundText)) {
+        foundText = foundText.filter((f) => !!f);
+
+        if (foundText.length === 0) {
+            return '';
+        }
+    }
+    return foundText || '';
+}
+
+module.exports = {
+    getLanguageText,
+    isTextObjectEmpty,
+    isArrayOfObjects
+};

package/src/resolvers/utils.js

@@ -6,6 +6,7 @@
 const hbs = require('./hbs');
 const stateData = require('../utils/stateData');
 const getCondition = require('../utils/getCondition');
+const { isTextObjectEmpty, getLanguageText } = require('./languageText');
 
 const ASPECT_SQUARE = 'square';
 const ASPECT_HORISONTAL = 'horisontal';
@@ -20,10 +21,6 @@ const WEBVIEW_FULL = 'full';
 const WEBVIEW_TALL = 'tall';
 const WEBVIEW_COMPACT = 'compact';
 
-/**
- * @typedef {Translation[] | Translation | string[] | string} Translations
- */
-
 /**
  * @typedef {object} TextObject
  * @prop {string} t - text
@@ -31,76 +28,10 @@ const WEBVIEW_COMPACT = 'compact';
  * @prop {string|null} p - purpose
  */
 
-/**
- * null = text+voice
- * t = text only
- * v = voice only
- * s = ssml
- *
- * @typedef {"t"|"v"|"s"|null} Purpose
- */
-
-/**
- * @typedef Translation
- * @property {string|string[]} t - text alternatives
- * @property {string | null} l - language
- * @property {Purpose | Purpose[]} [p] - purposes
- */
-
-/**
- * @param {string | string[] | Translation | Translation[]} translations
- * @returns {translations is Translation[]}
- */
-function isArrayOfObjects (translations) {
-    return Array.isArray(translations)
-        && typeof translations[0] === 'object'
-        && translations[0] !== null;
-}
-
-function isTextObjectEmpty (text) {
-    if (!text || !text.t) {
-        return true;
-    }
-    if (Array.isArray(text.t)) {
-        return !text.t.some((t) => !!t);
-    }
-    return false;
-}
-
-/**
- * @param {Translations} translations
- * @param {string} [lang]
- * @param {boolean} [disableDefaulting] - it will try to find translation for other language
- * @returns {null|string|string[]}
- */
-function getLanguageText (translations, lang = null, disableDefaulting = false) {
-    let foundText;
-
-    if (isArrayOfObjects(translations)) {
-        if (lang) {
-            // @ts-ignore
-            foundText = translations.find((t) => t.l === lang);
-        } else if (disableDefaulting) {
-            // @ts-ignore
-            [foundText] = translations;
-        }
-        if (isTextObjectEmpty(foundText) && !disableDefaulting) {
-            // @ts-ignore
-            foundText = translations.find((t) => !isTextObjectEmpty(t));
-        }
-        foundText = foundText ? foundText.t : null;
-    } else {
-        foundText = translations;
-    }
-    if (Array.isArray(foundText)) {
-        foundText = foundText.filter((f) => !!f);
+/** @typedef {import('./languageText').Translation} Translation */
+/** @typedef {import('./languageText').Translations} Translations */
+/** @typedef {import('./languageText').Purpose} Purpose */
 
-        if (foundText.length === 0) {
-            return '';
-        }
-    }
-    return foundText || '';
-}
 /**
  *
  * @param {Translations} translations

package/src/transcript/extractText.js

@@ -16,13 +16,19 @@ function extractText (payload) {
         return payload.message.text;
     }
 
-    // button message
-    if (payload.message && payload.message.attachment
-        && payload.message.attachment.type === 'template'
-        && payload.message.attachment.payload
-        && payload.message.attachment.payload.text) {
-
-        return payload.message.attachment.payload.text;
+    // button message — the orchestrator normalizes a singular `attachment` into
+    // a plural `attachments` array before persisting, so accept both shapes;
+    // otherwise template messages (e.g. button templates) logged via the
+    // orchestrator drop out of the transcript entirely.
+    const attachment = payload.message
+        && (payload.message.attachment
+            || (Array.isArray(payload.message.attachments) && payload.message.attachments[0]));
+    if (attachment
+        && attachment.type === 'template'
+        && attachment.payload
+        && attachment.payload.text) {
+
+        return attachment.payload.text;
     }
 
     if (!payload.postback) {

package/src/utils/compileWithState.js

@@ -10,17 +10,41 @@ try {
 } catch (er) {
     handlebars = { compile: (text) => () => text };
 }
+const { getLanguageText } = require('../resolvers/languageText');
 const stateData = require('./stateData');
 
+/** @typedef {import('../resolvers/languageText').Translation} Translation */
+
 /** @typedef {import('../Request')} Request */
 /** @typedef {import('../Responder')} Responder */
 
+function compileAndRenderOut (template, req, res, data) {
+    if (!template) {
+        return '';
+    }
+    if (typeof template !== 'string') {
+        return `${template}`;
+    }
+    if (!template.includes('{{')) {
+        return template;
+    }
+
+    const useData = data || stateData(req, res);
+    let result = template;
+    let hasHandlebars = true;
+    for (let i = 0; i < 10 && hasHandlebars; i++) {
+        result = handlebars.compile(result)(useData);
+        hasHandlebars = template.includes('{{');
+    }
+    return result;
+}
+
 /**
  * Utility, which helps to render handlebars syntax with all variables within conversations state
  *
  * @param {Request} req
  * @param {Responder} res
- * @param {string} template
+ * @param {string|Translation[]} template
  * @param {object} forcedData
  * @returns {string}
  * @example
@@ -39,15 +63,15 @@ function compileWithState (req, res, template, forcedData = null) {
     if (!template) {
         return '';
     }
-    if (typeof template !== 'string') {
-        return `${template}`;
-    }
-    const data = forcedData || stateData(req, res);
-    let result = template;
-    for (let i = 0; i < 10 && result.includes('{{'); i++) {
-        result = handlebars.compile(result)(data);
+    let tpl;
+    let data;
+    if (Array.isArray(template)) {
+        data = stateData(req, res);
+        tpl = getLanguageText(template, data.lang);
+    } else {
+        tpl = template;
     }
-    return result;
+    return compileAndRenderOut(tpl, req, res, forcedData || data);
 }
 
 module.exports = compileWithState;

package/.claude/settings.local.json

@@ -1,11 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npx mocha:*)",
-      "Bash(npx tsc *)",
-      "Bash(npm test *)",
-      "Bash(node -e \"const p = require\\('./bot/plugins/BTMLLM'\\); console.log\\('factory type:', typeof p\\); console.log\\('factory name:', p.name\\);\")",
-      "Bash(grep -n \"prompt\\\\`\\\\|tagged\\\\|render\\\\|compile\\\\|hbs\" /Users/ondrejveres/Wingbot/wingbot-llm/src/prompt.js)"
-    ]
-  }
-}