@tiledesk/tiledesk-tybot-connector 0.1.55 → 0.1.56

package/CHANGELOG.md

@@ -5,6 +5,11 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.56
+- DirWebRequest added
+- SetAttribute added
+- JsonCondition added
+
 ### 0.1.55
 - fixed bug on DirCondition $data. replace with regex
 

package/TiledeskExpression.js

@@ -5,33 +5,74 @@ class TiledeskExpression {
     // check valid operators (only those in operators are allowed)
     // check valid variable names /^[_0-9a-zA-Z\.]$/
 
-    static operators = {
-        ">" : {
-            applyPattern: "Number(${1}) > Number(${2})"
+    static OPERATORS = {
+        "equalAsNumbers" : {
+            name: "equalAsNumbers",
+            applyPattern: "Number(#1) === Number(#2)"
         },
-        ">=" : {
-            applyPattern: "Number(${1}) >= Number(${2})"
+        "equalAsStrings" : {
+            name: "equalAsStrings",
+            applyPattern: "String(#1) === String(#2)"
         },
-        "<" : {
-            applyPattern: "Number(${1}) < Number(${2})"
+        "notEqualAsNumbers" : {
+            name: "notEqualAsNumbers",
+            applyPattern: "Number(#1) !== Number(#2)"
         },
-        "&&": {
-            applyPattern: " && ${2}"
+        "notEqualAsStrings" : {
+            name: "notEqualAsStrings",
+            applyPattern: "String(#1) !== String(#2)"
         },
-        "||": {
-            applyPattern: " && ${2}"
+        "greaterThan" : {
+            name: "greaterThan",
+            applyPattern: "Number(#1) > Number(#2)"
+        },
+        "greaterThanOrEqual" : {
+            name: "greaterThanOrEqual",
+            applyPattern: "Number(#1) >= Number(#2)"
+        },
+        "lessThan" : {
+            name: "lessThan",
+            applyPattern: "Number(#1) < Number(#2)"
+        },
+        "lessThanOrEqual" : {
+            name: "lessThanOrEqual",
+            applyPattern: "Number(#1) <= Number(#2)"
+        },
+        "AND": {
+            name: "AND",
+            applyPattern: " && "
+        },
+        "OR": {
+            name: "OR",
+            applyPattern: " || "
         },
         "startsWith": {
-            applyPattern: "${1}.startsWith(${2})"
+            name: "startsWith",
+            applyPattern: "String(#1).startsWith(String(#2))"
+        },
+        "startsWithIgnoreCase": {
+            name: "startsWithIgnoreCase",
+            applyPattern: "String(#1).toLowerCase().startsWith(String(#2).toLowerCase())"
         },
         "contains": {
-            applyPattern: "?"
+            name: "contains",
+            applyPattern: "#1.includes(#2)"
+        },
+        "containsIgnoreCase": {
+            name: "containsIgnoreCase",
+            applyPattern: "#1.toLowerCase().includes(#2.toLowerCase())"
         },
         "endsWith": {
-            applyPattern: "?"
+            name: "endsWith",
+            applyPattern: "#1.toLowerCase().endsWith(#2.toLowerCase())"
+        },
+        "isEmpty": {
+            name: "isEmpty",
+            applyPattern: "#1 === \"\""
         },
         "matches": {
-            applyPattern: "?"
+            name: "matches",
+            applyPattern: "#1.matches(/#2/)"
         }
     }
 
@@ -46,6 +87,12 @@ class TiledeskExpression {
         return result;
     }
 
+    // public
+    evaluateStaticExpression(expression) {
+        const result = new TiledeskExpression().evaluate(expression);
+        return result;
+    }
+
     // private
     // evaluate(expression, context) {
     //     let fn;
@@ -62,6 +109,8 @@ class TiledeskExpression {
     // }
 
     evaluate(expression, context) {
+        // console.log("evaluating:", expression)
+        // console.log("context:", context)
         let res;
         try {
             const vm = new VM({
@@ -77,8 +126,95 @@ class TiledeskExpression {
         return res;
     }
 
-    JSON2condition(json) {
-        return "";
+    static JSONConditionToExpression(condition, variables) {
+        // console.log("condition:", condition);
+        // console.log("condition.operand1:", condition.operand1);
+        // console.log("condition.operand2:", condition.operand2);
+        const operator_name = condition.operator;
+        const operator = TiledeskExpression.OPERATORS[operator_name];
+        // console.log("operator:", operator);
+        const applyPattern = operator.applyPattern;
+        // console.log("applyPattern:", applyPattern);
+        const operand1_s = TiledeskExpression.stringValueOperand(condition.operand1, variables);
+        // console.log("operand1_s:", operand1_s);
+        const operand2_s = TiledeskExpression.stringValueOperand(condition.operand2, variables);
+        // console.log("operand2_s:", operand2_s);
+        const expression = 
+            applyPattern
+                .replace("#1", operand1_s)
+                .replace("#2", operand2_s);
+        return expression;
+    }
+
+    static JSONGroupToExpression(group, variables) {
+        let conditions = group.conditions;
+        let group_expression = "";
+        // console.log("conditions:", conditions)
+        for(let i = 0; i < conditions.length; i++) {
+            let part = conditions[i];
+            if (part.type === "condition") {
+                let expression = TiledeskExpression.JSONConditionToExpression(part, variables);
+                group_expression += expression;
+            }
+            else if (part.type === "operator") {
+                const operator = TiledeskExpression.OPERATORS[part.operatorName];
+                group_expression += operator.applyPattern;
+            }
+        }
+        return "(" + group_expression + ")";
+    }
+
+    static JSONGroupsToExpression(groups, variables) {
+        let full_expression = "";
+        // console.log("groups:", groups)
+        for(let i = 0; i < groups.length; i++) {
+            let g = groups[i];
+            if (g.type === "expression") {
+                let group_expression = TiledeskExpression.JSONGroupToExpression(g, variables);
+                full_expression += group_expression;
+            }
+            else if (g.type === "operator") {
+                const operator = TiledeskExpression.OPERATORS[g.operatorName];
+                full_expression += operator.applyPattern;
+            }
+        }
+        return full_expression;
+    }
+
+
+    static stringValueOperand(operand, variables) {
+        // return operand;
+        if (!operand) {
+            return TiledeskExpression.quotedString(""); //"\"\"";
+        }
+        else if (!variables) {
+            // return "\"" + JSON.stringify(operand) + "\"";
+            return TiledeskExpression.quotedString(operand);
+        }
+        else {
+            // console.log("vars!", variables)
+            let _operand = operand.trim();
+            let operandAsString = TiledeskExpression.quotedString(operand); //"\"" + JSON.stringify(operand) + "\"";
+            if (_operand.startsWith("$")) {
+                // console.log("_operand with $", _operand);
+                let varName = _operand.replace(/\$/g, "");
+                // console.log("varName:", varName);
+                let value = variables[varName];
+                if (value) {
+                    operandAsString = TiledeskExpression.quotedString(value); //'"' + JSON.stringify(value) + '"';
+                }
+                return operandAsString;
+            }
+            else {
+                // return "\"" + JSON.stringify(operand) + "\"";
+                return TiledeskExpression.quotedString(operand);
+            }
+        }
+        
+    }
+
+    static quotedString(s) {
+        return JSON.stringify(s);
     }
 
 }

package/index.js

@@ -99,7 +99,9 @@ router.post('/ext/:botid', async (req, res) => {
   // get the bot metadata
   let bot = null;
   try {
-    bot = await botsDS.getBotById(botId);
+    // bot = await botsDS.getBotById(botId);
+    // bot = await botById(botId, projectId, tdcache, botsDS);
+    bot = botsDS.getBotByIdCache(botId, tdcache);
   }
   catch(error) {
     console.error("Error getting botId:", botId);
@@ -139,7 +141,8 @@ router.post('/ext/:botid', async (req, res) => {
     projectId: projectId,
     log: log
   });
-  
+  // console.log("log:", log)
+  // process.exit(1)
   await updateRequestVariables(chatbot, message, projectId, requestId);
 
   let reply = await chatbot.replyToMessage(message);
@@ -198,6 +201,35 @@ router.post('/ext/:botid', async (req, res) => {
   
 });
 
+// async function botById(botId, projectId, tdcache, botsDS) {
+//   let bot = null;
+//   // let botCacheKey = "cacheman:cachegoose-cache:" + projectId + ":faq_kbs:id:" + botId;
+//   let botCacheKey = "cacheman:cachegoose-cache:faq_kbs:id:" + botId;
+//   try {
+//     let _bot_as_string = await tdcache.get(botCacheKey);
+//     const value_type = typeof _bot_as_string;
+//     console.log("_bot_as_string found in chache:", _bot_as_string);
+//     console.log("value_type:", value_type);
+//     if (_bot_as_string) {
+//       bot = JSON.parse(_bot_as_string);
+//       console.log("got bot from cache:", JSON.stringify(bot));
+//     }
+//     else {
+//       console.log("bot not found, getting from datasource...");
+//       bot = await botsDS.getBotById(botId);
+//       console.log("bot found in datasource:", JSON.stringify(bot));
+//       await tdcache.set(botCacheKey, JSON.stringify(bot));
+//       // DEBUG CODE REMOVE
+//       let bot_ = await tdcache.get(botCacheKey);
+//       console.log("_bot_as_string from cache debug:", bot_)
+//     }
+//   }
+//   catch(err) {
+//     console.error("error getting bot by id:", err);
+//   }
+//   return bot;
+// }
+
 async function updateRequestVariables(chatbot, message, projectId, requestId) {
   // update request context
   const messageId = message._id;
@@ -440,9 +472,22 @@ router.get('/', (req, res) => {
   res.send('Hello Tilebot!');
 });
 
+router.get('/test/webrequest/get/plain', async (req, res) => {
+  res.send("Application var");
+});
+
+router.post('/test/webrequest/post/plain', async (req, res) => {
+  console.log("/post/plain req.body:", req.body);
+  if (req && req.body && req.body.name) {
+    res.send("Your name is " + req.body.name);
+  }
+  else {
+    res.send("No HTTP POST provided");
+  }
+});
+
 async function startApp(settings, completionCallback) {
   // console.log("Starting Tilebot with Settings:", settings);
-
   if (settings.bots) { // static bots data source
     staticBots = settings.bots;
   }

package/models/IntentForm.js

@@ -111,7 +111,7 @@ class IntentForm {
         return await this.getMessage(is_current_value);
       }
       if (this.log) {console.log("Form asking fist value. No 'is_current_value' for first form field", is_current_value);}
-      if (this.log) {console.log("INTENT_FORM:", this.form);}
+      // if (this.log) {console.log("INTENT_FORM:", this.form);}
       if (this.log) {console.log("CURRENT FIELD:", current_field);}
       let message = {
         text: this.form.fields[current_field].label

package/models/MockBotsDataSource.js

@@ -22,6 +22,10 @@ class MockBotsDataSource {
     }
     return null;
   }
+  
+  async getBotByIdCache(botId, tdcache) {
+    return this.getBotById(botId);
+  }
 
   /**
    * 
@@ -48,6 +52,21 @@ class MockBotsDataSource {
     return intent;
   }
 
+  async getByIntentDisplayNameCache(botId, key, tdcache) {
+    let faq = null;
+    if (tdcache) {
+      // console.log("mock chache. anyway in mock getting faq from datasource...");
+      faq = await this.getByIntentDisplayName(botId, key);
+      // console.log("faq found in datasource.:", JSON.stringify(faq));
+    }
+    else {
+      // console.log("mock no chache. getting faq from datasource...");
+      faq = await this.getByIntentDisplayName(botId, key);
+      // console.log("faq found in datasource..:", JSON.stringify(faq));
+    }
+    return faq;
+  }
+
   /**
    * intentsFinder Adapter
    * @param {String} text 

package/models/MongodbBotsDataSource.js

@@ -18,6 +18,41 @@ class MongodbBotsDataSource {
     return null;
   }
 
+  async getBotByIdCache(botId, tdcache) {
+    let bot = null;
+    if (tdcache) {
+      let botCacheKey = "cacheman:cachegoose-cache:faq_kbs:id:" + botId;
+      try {
+        let _bot_as_string = await tdcache.get(botCacheKey);
+        const value_type = typeof _bot_as_string;
+        console.log("__bot_as_string found in chache:", _bot_as_string);
+        console.log("value_type:", value_type);
+        if (_bot_as_string) {
+          bot = JSON.parse(_bot_as_string);
+          console.log("got bot from cache:", JSON.stringify(bot));
+        }
+        else {
+          console.log("bot not found, getting from datasource...");
+          bot = await this.getBotById(botId);
+          console.log("bot found in datasource:", JSON.stringify(bot));
+          await tdcache.set(botCacheKey, JSON.stringify(bot));
+          // DEBUG CODE REMOVE
+          let bot_ = await tdcache.get(botCacheKey);
+          console.log("_bot_as_string from cache debug:", bot_)
+        }
+      }
+      catch(err) {
+        console.error("error getting bot by id:", err);
+      }
+    }
+    else {
+      console.log("no chache. getting bot from datasource...");
+      bot = await this.getBotById(botId);
+      console.log("bot found in datasource:", JSON.stringify(bot));
+    }
+    return bot;
+  }
+
   /**
    * 
    * @param {String} text 
@@ -49,16 +84,27 @@ class MongodbBotsDataSource {
    * @param {String} intentName
    * @returns a single Intent
    */
-  async getByIntentDisplayName(botId, name) {
+  async getByIntentDisplayName(botId, key) {
     return new Promise((resolve, reject) => {
       // var query = { "id_project": this.projectId, "id_faq_kb": botId, "intent_display_name": name};
-      var query = { "id_faq_kb": botId, "intent_display_name": name };
+      let query = null;
+      key = key.trim();
+      if (key.startsWith("#")) {
+        let intent_id = key.substring(key.indexOf("#") + 1);
+        console.log("Query by intent_id:", intent_id );
+        query = { "id_faq_kb": botId, "intent_id": intent_id };
+      }
+      else {
+        console.log("Query by intent name:", key );
+        query = { "id_faq_kb": botId, "intent_display_name": key };
+      }
+      
       if (this.log) {console.debug('query', query);}
       Faq.find(query).lean().exec( (err, faqs) => {
         if (err) {
           return reject(err);
         }
-        if (this.log) {console.debug("getByIntentDisplayName faqs", faqs);}
+        if (this.log) {console.debug("getByIntentDisplayName faqs", JSON.stringify(faqs));}
         if (faqs && faqs.length > 0) {
           const intent = faqs[0];
           return resolve(intent);
@@ -69,6 +115,47 @@ class MongodbBotsDataSource {
       });
     });
   }
+
+  async getByIntentDisplayNameCache(botId, key, tdcache) {
+    let faq = null;
+    console.log("botID:", botId);
+    console.log("key:", key);
+    if (tdcache) {
+      console.log("in tdchace");
+      let faqCacheKey = "cacheman:cachegoose-cache:faqs:botid:"+ botId + ":faq:id:" + key;
+      console.log("Looking in cache for:", faqCacheKey);
+      try {
+        let _faq_as_string = await tdcache.get(faqCacheKey);
+        const value_type = typeof _faq_as_string;
+        console.log("_faq_as_string found in chache:", _faq_as_string);
+        console.log("value_type:", value_type);
+        if (_faq_as_string) {
+          faq = JSON.parse(_faq_as_string);
+          console.log("got faq from cache:", JSON.stringify(faq));
+        }
+        else {
+          console.log("faq not found, getting from datasource...");
+          faq = await this.getByIntentDisplayName(botId, key);
+          console.log(".faq found in datasource:", JSON.stringify(faq));
+          await tdcache.set(faqCacheKey, JSON.stringify(faq));
+          // DEBUG CODE REMOVE
+          let faq_ = await tdcache.get(faqCacheKey);
+          console.log("_faq_as_string from cache debug:", faq_)
+        }
+      }
+      catch(err) {
+        console.error("error getting faq by id:", err);
+      }
+    }
+    else {
+      console.log("no chache. getting faq from datasource...");
+      faq = await this.getByIntentDisplayName(botId, key);
+      console.log("faq found in datasource:", JSON.stringify(faq));
+    }
+    return faq;
+  }
+
+  // query = { "id_project": message.id_project, "id_faq_kb": faq_kb._id,  $or:[{"intent_id": action}, {"intent_display_name": action}]};
   
 }
 

package/models/TiledeskChatbot.js

@@ -43,9 +43,9 @@ class TiledeskChatbot {
   async replyToMessage(message, callback) {
     return new Promise( async (resolve, reject) => {
       // get bot info
-      if (this.log) {
-        console.log("replyToMessage():", JSON.stringify(message));
-      }
+      // if (this.log) {
+      //   console.log("replyToMessage():", JSON.stringify(message));
+      // }
       let lead = null;
       if (message.request) {
         this.request = message.request;
@@ -97,7 +97,8 @@ class TiledeskChatbot {
             log: false
           });
           // it only gets the locked_intent
-          const faq = await this.botsDataSource.getByIntentDisplayName(this.botId, locked_intent);
+          // const faq = await this.botsDataSource.getByIntentDisplayName(this.botId, locked_intent);
+          const faq = await this.botsDataSource.getByIntentDisplayNameCache(this.botId, locked_intent, this.tdcache);
           if (this.log) {console.log("locked intent. got faqs", JSON.stringify(faq))}
           let reply;
           if (faq) {
@@ -156,9 +157,22 @@ class TiledeskChatbot {
           }
         }
         else {
-          let faq = await this.botsDataSource.getByIntentDisplayName(this.botId, intent.name);
+          if (this.log) {console.log("processing intent:", explicit_intent_name);}
+          // let faq = await this.botsDataSource.getByIntentDisplayName(this.botId, intent.name);
+          if (this.log) {
+            console.log("intent this.botId:", this.botId);
+            console.log("intent intent.name:", intent.name);
+            if (this.tdcache) {
+              console.log("intent this.tdcache ok");
+            }
+            else {
+              console.log("no intent this.tdcache");
+            }
+          }
+          let faq = await this.botsDataSource.getByIntentDisplayNameCache(this.botId, intent.name, this.tdcache);
           if (faq) {
-            if (this.log) {console.log("Got a reply (faq) by Intent name:", JSON.stringify(faq));}
+            if (this.log) {
+              console.log("Got a reply (faq) by Intent name:", JSON.stringify(faq));}
             try {
               if (intent.parameters) {
                 for (const [key, value] of Object.entries(intent.parameters)) {
@@ -176,7 +190,7 @@ class TiledeskChatbot {
           else {
             if (this.log) {console.log("Intent not found:", explicit_intent_name);}
             reply = {
-              "text": "Intent not found: *" + explicit_intent_name + "*"
+              "text": "Intent not found: " + explicit_intent_name
             }
           }
         }
@@ -217,7 +231,8 @@ class TiledeskChatbot {
         }
         if (this.log) {console.log("NLP decoded found:", intents);}
         if (intents && intents.length > 0) {
-          let faq = await this.botsDataSource.getByIntentDisplayName(this.botId, intents[0].intent_display_name);
+          // let faq = await this.botsDataSource.getByIntentDisplayName(this.botId, intents[0].intent_display_name);
+          let faq = await this.botsDataSource.getByIntentDisplayNameCache(this.botId, intents[0].intent_display_name, this.tdcache);
           let reply;
           try {
             reply = await this.execIntent(faq, message, lead);//, bot);
@@ -232,12 +247,10 @@ class TiledeskChatbot {
         }
         else {
           // fallback
-          let fallbackIntent = await this.botsDataSource.getByIntentDisplayName(this.botId, "defaultFallback");
-          // console.log("In mongodb botId:", this.botId);
-          // console.log("getByIntentDisplayName(this.botId, 'defaultFallback'):", this.botId, "defaultFallback");
-          // console.log("fallbackIntent found!", JSON.stringify(fallbackIntent));
+          // let fallbackIntent = await this.botsDataSource.getByIntentDisplayName(this.botId, "defaultFallback");
+          let fallbackIntent = await this.botsDataSource.getByIntentDisplayNameCache(this.botId, "defaultFallback", this.tdcache);
           if (!fallbackIntent) {
-            console.log("No defaultFallback found!");
+            // console.log("No defaultFallback found!");
             resolve(null);
             return;
           }
@@ -399,7 +412,7 @@ class TiledeskChatbot {
       };
     }
     else {
-      console.error("Invalid intent. No actions or answer.", JSON.stringify(answerObj) );
+      console.error("Intent with no actions or answer.", JSON.stringify(answerObj) );
       return null;
     }
     

package/models/faqKbService.js

@@ -2,17 +2,21 @@ var Faq_kb = require("./faq_kb");
 
 class FaqKbService {
 
-  async getAll(options) {
-    if (!options) {
-      options = {
+  async getAll(_query) {
+    let query = _query;
+    if (!query) {
+      query = {
         public: true,
-        certified: true
+        certified: true,
+        "trashed": { $in: [null, false] }
       }
     }
+    var sortQuery = {};
+    sortQuery["score"] = -1;
     console.log("(Service) GET ALL FAQ_KBs");
     return new Promise((resolve, reject) => {
-      let query = {public: options.public, certified: options.certified};
-      Faq_kb.find(query).lean().exec( (err, bots) => {
+      // let query = {public: options.public, certified: options.certified};
+      Faq_kb.find(query).sort(sortQuery).lean().exec( (err, bots) => {
         if (err) {
           reject(err);
         }

package/models/faq_kb.js

@@ -58,18 +58,39 @@ var Faq_kbSchema = new Schema({
     type: String,
     required: false
   },
+  bigImage: {
+    type: String,
+    required: false
+  },
+  tags: {
+    type: Array,
+    required: false
+  },
+  templateFeatures: {
+    type: Array,
+    required: false
+  },
   attributes: {
     type: Object,
   },
   createdBy: {
     type: String,
     required: true
-  }
+  },
+  score: {
+    type: Number,
+    required: false,
+    index: true,
+    default: 0
+  },
 },{
   timestamps: true
 }
 );
 
+Faq_kbSchema.index({name: 'text', description: 'text', "tags": 'text'},  
+ {"name":"faqkb_fulltext","default_language": "none","language_override": "language"}); // schema level
+
 var faq_kb = mongoose.model('faq_kb', Faq_kbSchema);
 
 module.exports = faq_kb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {

package/test/anomaly-detection-test.js

@@ -38,7 +38,7 @@ describe('Conversation for anomaly detection test', async () => {
           console.log("ACTIONS Tilebot route successfully started.");
           var port = process.env.PORT || 10001;
           app_listener = app.listen(port, () => {
-            console.log('Tilebot connector listening on port ', port);
+            console.log('Tilebot connector listening on port... ', port);
             resolve();
           });
         });
@@ -52,7 +52,7 @@ describe('Conversation for anomaly detection test', async () => {
   });
 
   it('/anomaly', (done) => {
-    // console.log("/anomaly story...");
+    console.log("/anomaly story...");
     let message_id = uuidv4();
     let listener;
     let endpointServer = express();
@@ -71,7 +71,7 @@ describe('Conversation for anomaly detection test', async () => {
     });
 
     listener = endpointServer.listen(10002, '0.0.0.0', () => {
-      // console.log('endpointServer started', listener.address());
+      console.log('endpointServer started', listener.address());
       let request = {
         "payload": {
           "_id": message_id,