@tiledesk/tiledesk-server 2.2.14 → 2.2.15

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2.2.15
+
+- Added catch messageService.send for bot
+- Added external searcher for bot( ex. Rasa proxy) 
+- Faq language fix taken from bot language for create single and import from csv
+- Lower case reset password fix
+- Added alias /bots for /faq_kb AGGIORNA DOC
+
+# 2.2.14
+- Fix Tiledesk Queue 1.1.11 with authEvent.queueEnabled = true 
+
 # 2.2.13
 - Send message validation with empty text
 

package/app.js

@@ -341,7 +341,8 @@ app.use('/:projectid/faqpub', faqpub);
 
 //deprecated
 app.use('/:projectid/faq_kb', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], faq_kb);
-app.use('/:projectid/bot', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], faq_kb);
+// aggiorna doc
+app.use('/:projectid/bots', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], faq_kb);
 
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.14",
+  "version": "2.2.15",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/public/samples/bot/external/searcher/parse

@@ -0,0 +1,10 @@
+{
+    "text": "question",
+    "intent": { "name": "brutteparole", "confidence": 0.9257488250732422 },
+    "entities": [],
+    "text_tokens": [ [ 0, 8 ] ],
+    "intent_ranking": [
+      { "name": "brutteparole", "confidence": 0.9257488250732422 },
+      { "name": "eta", "confidence": 0.0742512047290802 }
+    ]
+}

package/routes/auth.js

@@ -476,8 +476,12 @@ router.get('/pendinginvitationsnoauth/:pendinginvitationid', function (req, res)
 router.put('/requestresetpsw', function (req, res) {
 
   winston.debug('REQUEST RESET PSW - EMAIL REQ BODY ', req.body);
+
+  var email = req.body.email.toLowerCase();
+  winston.debug("email", email);
+
 // auttype
-  User.findOne({ email: req.body.email, status: 100
+  User.findOne({ email: email, status: 100
     // , authType: 'email_password' 
   }, function (err, user) {
     if (err) {

package/routes/faq.js

@@ -1,6 +1,7 @@
 var express = require('express');
 var router = express.Router();
 var Faq = require("../models/faq");
+var Faq_kb = require("../models/faq_kb");
 var multer = require('multer')
 var upload = multer()
 const faqBotEvent = require('../event/faqBotEvent');
@@ -31,6 +32,16 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
   // PARSE CSV
  
 
+
+  Faq_kb.findById(id_faq_kb).exec(function(err, faq_kb) {
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
+    }
+    if (!faq_kb) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+    winston.debug('faq_kb ', faq_kb.toJSON());
+
   // getFaqKbKeyById(req.body.id_faq_kb, function (remote_faqkb_key) {
 
     parsecsv.parseString(csv, { headers: false, delimiter: delimiter })
@@ -57,6 +68,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
           intent_id:intent_id,
           intent_display_name: intent_display_name,
           webhook_enabled: webhook_enabled_boolean,
+          language: faq_kb.language,
           id_project: req.projectid,
           createdBy: req.user.id,
           updatedBy: req.user.id
@@ -81,45 +93,56 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
         winston.error("PARSE ERROR uploadcsv", err);
         res.json({ success: false, msg: 'Parsing error' });
       });
-  // });
+  });
 });
 
 
 router.post('/', function (req, res) {
 
   winston.debug(req.body);
-  var newFaq = new Faq({
-    id_faq_kb: req.body.id_faq_kb,
-    question: req.body.question,
-    answer: req.body.answer,
-    id_project: req.projectid,
-    topic: req.body.topic,
-    webhook_enabled: req.body.webhook_enabled,
-    intent_display_name: req.body.intent_display_name,
-    createdBy: req.user.id,
-    updatedBy: req.user.id
-  });
 
-  newFaq.save(function (err, savedFaq) {
+  Faq_kb.findById(req.body.id_faq_kb).exec(function(err, faq_kb) {
     if (err) {
-      if (err.code == 11000) {
-        return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });
-      } else {
-        winston.debug('--- > ERROR ', err)
-        return res.status(500).send({ success: false, msg: 'Error saving object.' });
-      }     
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
-    winston.debug('1. ID OF THE NEW FAQ CREATED ', savedFaq._id)
-    winston.debug('1. QUESTION OF THE NEW FAQ CREATED ', savedFaq.question)
-    winston.debug('1. ANSWER OF THE NEW FAQ CREATED ', savedFaq.answer)
-    winston.debug('1. ID FAQKB GET IN THE OBJECT OF NEW FAQ CREATED ', savedFaq.id_faq_kb);
+    if (!faq_kb) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+    winston.debug('faq_kb ', faq_kb.toJSON());
+
+    var newFaq = new Faq({
+      id_faq_kb: req.body.id_faq_kb,
+      question: req.body.question,
+      answer: req.body.answer,
+      id_project: req.projectid,
+      topic: req.body.topic,
+      language: faq_kb.language,
+      webhook_enabled: req.body.webhook_enabled,
+      intent_display_name: req.body.intent_display_name,
+      createdBy: req.user.id,
+      updatedBy: req.user.id
+    });
 
-    faqBotEvent.emit('faq.create', savedFaq);
+    newFaq.save(function (err, savedFaq) {
+      if (err) {
+        if (err.code == 11000) {
+          return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });
+        } else {
+          winston.debug('--- > ERROR ', err)
+          return res.status(500).send({ success: false, msg: 'Error saving object.' });
+        }     
+      }
+      winston.debug('1. ID OF THE NEW FAQ CREATED ', savedFaq._id)
+      winston.debug('1. QUESTION OF THE NEW FAQ CREATED ', savedFaq.question)
+      winston.debug('1. ANSWER OF THE NEW FAQ CREATED ', savedFaq.answer)
+      winston.debug('1. ID FAQKB GET IN THE OBJECT OF NEW FAQ CREATED ', savedFaq.id_faq_kb);
 
-    res.json(savedFaq);
+      faqBotEvent.emit('faq.create', savedFaq);
 
-  
+      res.json(savedFaq);
 
+    
+    });
   });
 });
 

package/routes/faq_kb.js

@@ -6,8 +6,10 @@ var Department = require("../models/department");
 var faqService = require("../services/faqService");
 const botEvent = require('../event/botEvent');
 var winston = require('../config/winston');
+var httpUtil = require("../utils/httpUtil");
 
 router.post('/', function (req, res) {
+  winston.info('create BOT ', req.body);
   // create(name, url, projectid, user_id, type, description) {
   faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined,
     req.body.language).then(function(savedFaq_kb) {
@@ -18,6 +20,106 @@ router.post('/', function (req, res) {
 });
 
 
+router.post('/train', function (req, res) {
+
+  winston.info('train BOT ', req.body);
+
+  Faq_kb.findById(req.body.id_faq_kb).exec(function(err, faq_kb) {
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
+    }
+    if (!faq_kb) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+    winston.debug('faq_kb ', faq_kb.toJSON());
+
+    winston.debug('faq_kb.type :'+ faq_kb.type);
+    if (faq_kb.type =="internal" && faq_kb.url) {
+
+
+
+      var train =   {
+        language:faq_kb.language,
+        nlu:[]
+      };
+      winston.info("train", train);     
+      
+
+      var query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb};
+
+      Faq.find(query) 
+      .limit(10000)
+      .lean().               
+       exec(async (err, faqs) => {
+         if (err) {
+           return res.status(500).send({ success: false, msg: 'Error getting object.' });
+         }
+         if (faqs && faqs.length>0) {
+          winston.info("faqs exact", faqs);              
+
+          faqs.forEach(function(f) {
+            var intent = {
+              intent:f.intent_display_name,
+              examples:[]
+            }
+            var questions = f.question.split("\n");
+            winston.info("questions", questions);
+
+            questions.forEach(function(q) {
+              winston.info("q", q);
+              intent.examples.push(q);
+            });       
+            winston.info("intent", intent);
+            train.nlu.push(intent);            
+          });
+          winston.info("train", train);
+
+          try {
+            var trainHttp = await httpUtil.call(faq_kb.url+"/trainandload", undefined, train, "POST");
+          }catch(e) {
+            winston.error("error training", e);
+          }
+          
+
+          return res.json({train:train, httpResponse:trainHttp});
+          // return res.json(trainHttp);
+         }else {
+          return res.status(400).send({ success: false, msg: 'no faq to  train on external bot.' });
+         }
+        });
+    } else {
+      winston.debug('external query: ');
+      return res.status(400).send({ success: false, msg: 'you can train a standard internal bot or an external bot.' });
+    }
+
+  });
+
+    /*
+  {
+    "language":"it",
+    "nlu":[
+       {
+          "intent":"eta",
+          "examples":[
+             "quanti anni hai",
+             "dimmi la tua età",
+             "quanto sei grande",
+             "parlami della tua età"
+          ]
+       },
+       {
+          "intent":"brutteparole",
+          "examples":[
+             "non dire parolacce",
+             "le brutte parole non dovrebbero dirsi"
+          ]
+       }
+    ]
+ }
+*/
+
+});
+
 
 router.post('/askbot', function (req, res) {
 

package/services/faqBotHandler.js

@@ -12,6 +12,10 @@ var eventService = require('../pubmodules/events/eventService');
 var mongoose = require('mongoose');
 const { TiledeskChatbotUtil } = require('@tiledesk/tiledesk-chatbot-util');
 const ActionsConstants = require('../models/actionsConstants');
+var httpUtil = require('../utils/httpUtil');
+
+var webhook_origin = process.env.WEBHOOK_ORIGIN || "http://localhost:3000";
+winston.debug("webhook_origin: "+webhook_origin);
 
 class FaqBotHandler {
  
@@ -137,7 +141,7 @@ class FaqBotHandler {
 
             Faq.find(query) 
             .lean().               
-             exec(function (err, faqs) {
+             exec(async (err, faqs) => {
                if (err) {
                 return winston.error("Error getting faq object.",err);                
                }
@@ -209,7 +213,13 @@ class FaqBotHandler {
                                 messageService.send(sender, botName, message.recipient, command_parsed.command, 
                                     message.id_project, sender, {subtype: "info"}, 'text', undefined).then(function(savedMessage){
                                         winston.debug("agent_handoff faqs agent sent ", savedMessage.toObject());  
-                                });                                                       
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });                                                                
                                  // PATCH: Chat clients (i.e. web widget) remove messages with text = null
                                 // command_parsed.text contains the eventual text before the \agent command
                                 // or 'all the message text' if \agent was not found
@@ -224,7 +234,13 @@ class FaqBotHandler {
                                 messageService.send(sender, botName, message.recipient, bot_answer.text, 
                                     message.id_project, sender, attr, bot_answer.type, bot_answer.metadata, bot_answer.language).then(function(savedMessage){
                                         winston.debug("faqbot message botAns ", savedMessage.toObject());  
-                                });                         
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });                                    
                             // }
                             
                                                     
@@ -238,20 +254,57 @@ class FaqBotHandler {
 
                } else {
  
+
                 query = { "id_project": message.id_project, "id_faq_kb": faq_kb._id};
-        
-                var search_obj = {"$search": message.text};
+                var mongoproject = undefined;
+                var sort = undefined;
 
-                if (faq_kb.language) {
-                    search_obj["$language"] = faq_kb.language;
-                }
-                query.$text = search_obj;
-                winston.debug("fulltext search query", query);   
+                //make http request external   
+                if (faq_kb.url) {
+
+                                                                                        
+                    var url = faq_kb.url+"/parse";
+                    winston.verbose("fulltext search external url " + url);   
 
-                Faq.find(query,  {score: { $meta: "textScore" } })  
-                .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+                    var json = {text: message.text, language: faq_kb.language, id_project: message.id_project, id_faq_kb: faq_kb._id};
+                    winston.verbose("fulltext search external json", json);   
+
+                    var headers = {
+                        'Content-Type' : 'application/json', 
+                        'User-Agent': 'tiledesk-bot',
+                        'Origin': webhook_origin
+                        };
+
+                    var res = await httpUtil.call(url, headers, json, "POST")
+                    winston.verbose("res", res);
+                    
+                    if (res && res.intent && res.intent.name) {
+                        var intent_name = res.intent.name;
+                        winston.verbose("intent_name", intent_name);
+                        //filtra su intent name
+                        query.intent_display_name = intent_name;
+                        winston.info("query",query);                        
+                    
+                    }
+                } else {
+
+                    var search_obj = {"$search": message.text};
+
+                    if (faq_kb.language) {
+                        search_obj["$language"] = faq_kb.language;
+                    }
+                    query.$text = search_obj;
+                    winston.info("fulltext search query", query);   
+                    
+                    mongoproject = {score: { $meta: "textScore" } };
+                    sort = { score: { $meta: "textScore" } } //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+                }               
+        
+            
+                Faq.find(query,  mongoproject)  
+                .sort(sort) 
                 .lean().               
-                exec(function (err, faqs) {
+                exec(async (err, faqs) => {
                     if (err) {
                         return winston.error('Error getting fulltext objects.', err);      
                     }
@@ -266,6 +319,53 @@ class FaqBotHandler {
                     if (faqs && faqs.length>0 && faqs[0].answer) {
                         answerObj = faqs[0];                
 
+
+                        // non fare la ricerca fulltext 
+                        //make http request external   
+                        /*
+                        if (faq_kb.url) {
+
+                                                                                                
+                            var url = faq_kb.url+"/parse";
+                            winston.verbose("fulltext search external url " + url);   
+
+                            var json = {text: message.text, language: faq_kb.language, id_project: message.id_project, id_faq_kb: faq_kb._id};
+                            winston.verbose("fulltext search external json", json);   
+
+                            var headers = {
+                                'Content-Type' : 'application/json', 
+                                'User-Agent': 'tiledesk-bot',
+                                'Origin': webhook_origin
+                                };
+
+                            var res = await httpUtil.call(url, headers, json, "POST")
+                            console.log("res", res);
+                            
+                            if (res && res.intent && res.intent.name) {
+                                var intent_name = res.intent.name;
+                                console.log("intent_name", intent_name);
+                                                        //filtra su intent name
+                                var queryExternal = { id_project: message.id_project, id_faq_kb: faq_kb._id, intent_display_name: intent_name};
+                                winston.verbose("queryExternal",queryExternal);
+
+                                var faqExternal = await Faq.findOne(queryExternal) 
+                                    .lean().               
+                                    exec();
+
+                                winston.verbose("faqExternal",faqExternal);
+
+                                if (faqExternal) {
+                                    answerObj = faqExternal;
+                                }
+                            
+                            }
+                        }
+                        */
+
+
+
+
+
                         // qui
                         faqBotSupport.getParsedMessage(answerObj.answer, message, faq_kb, answerObj).then(function(bot_answer) {
 
@@ -315,7 +415,14 @@ class FaqBotHandler {
                                 messageService.send(sender, botName, message.recipient, command_parsed.command, 
                                     message.id_project, sender, {subtype: "info"}, 'text', undefined).then(function(savedMessage){
                                         winston.debug("agent_handoff faqs agent sent ", savedMessage.toObject());  
-                                });                                                       
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });           
+
                                  // PATCH: Chat clients (i.e. web widget) remove messages with text = null
                                 // command_parsed.text contains the eventual text before the \agent command
                                 // or 'all the message text' if \agent was not found
@@ -330,7 +437,13 @@ class FaqBotHandler {
                                     message.id_project, sender, attr, bot_answer.type, bot_answer.metadata, bot_answer.language).then(function(savedMessage){
 
                                         winston.debug("faqbot message sending ", savedMessage.toObject());  
-                                });
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });           
                         });
                         
         
@@ -408,7 +521,13 @@ class FaqBotHandler {
                                 messageService.send(sender, botName, message.recipient, command_parsed.command, 
                                     message.id_project, sender, {subtype: "info"}, 'text', undefined).then(function(savedMessage){
                                         winston.debug("agent_handoff faqs agent sent ", savedMessage.toObject());  
-                                });                                                       
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });                                                      
                                  // PATCH: Chat clients (i.e. web widget) remove messages with text = null
                                 // command_parsed.text contains the eventual text before the \agent command
                                 // or 'all the message text' if \agent was not found
@@ -423,6 +542,13 @@ class FaqBotHandler {
                             messageService.send(sender, botName, message.recipient, botAns.text, 
                                 message.id_project, sender, attr, botAns.type, botAns.metadata, botAns.language).then(function(savedMessage){
                                     winston.debug("faqbot message botAns " ,savedMessage.toObject());  
+                            })
+                            .catch(function(err){    
+                                winston.log({
+                                  level: 'error',
+                                  message: 'Error sending message bot: '+ JSON.stringify(err) + " " + JSON.stringify(botAns.text) ,
+                                  label: message.id_project
+                                });
                             });
                         }