@tiledesk/tiledesk-server 2.4.72 → 2.4.74

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.74
+- update tiledesk-messenger-connector to 0.1.12
+
+# 2.4.73
+- Fix KB Settings bugs
+
 # 2.4.72
 - update tiledesk-messenger-connector to 0.1.11
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.72",
+  "version": "2.4.74",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -42,10 +42,10 @@
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
-    "@tiledesk/tiledesk-messenger-connector": "0.1.11",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.16",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.17",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.52",
+    "@tiledesk/tiledesk-messenger-connector": "^0.1.12",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.8",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/routes/faq.js

@@ -122,7 +122,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
       })
       .on("end", function () {
         winston.debug("PARSE DONE");
-        faqBotEvent.emit('faq_train.create', id_faq_kb)
+        //faqBotEvent.emit('faq_train.create', id_faq_kb)
         res.json({ success: true, msg: 'CSV Parsed' });
       })
       .on("error", function (err) {
@@ -191,7 +191,7 @@ router.post('/', function (req, res) {
       winston.debug('1. ID FAQKB GET IN THE OBJECT OF NEW FAQ CREATED ', savedFaq.id_faq_kb);
 
       faqBotEvent.emit('faq.create', savedFaq);
-      faqBotEvent.emit('faq_train.create', req.body.id_faq_kb)
+      //faqBotEvent.emit('faq_train.create', req.body.id_faq_kb)
 
       res.json(savedFaq);
 
@@ -317,7 +317,7 @@ router.put('/:faqid', function (req, res) {
       }
 
       faqBotEvent.emit('faq.update', updatedFaq);
-      faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
+      //faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
   
       res.status(200).send(updatedFaq);
     })
@@ -334,7 +334,7 @@ router.put('/:faqid', function (req, res) {
       }
   
       faqBotEvent.emit('faq.update', updatedFaq);
-      faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
+      //faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
   
       res.status(200).send(updatedFaq);
       // updateRemoteFaq(updatedFaq)
@@ -373,7 +373,7 @@ router.delete('/:faqid', function (req, res) {
       winston.debug('Deleted FAQ ', faq);
       
       faqBotEvent.emit('faq.delete', faq);
-      faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
+      //faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
   
       res.status(200).send(faq);
 
@@ -387,7 +387,7 @@ router.delete('/:faqid', function (req, res) {
       winston.debug('Deleted FAQ ', faq);
   
       faqBotEvent.emit('faq.delete', faq);
-      faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
+      //faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
   
       res.status(200).send(faq);
   

package/routes/faq_kb.js

@@ -15,7 +15,7 @@ var configGlobal = require('../config/global');
 const faq = require('../models/faq');
 var jwt = require('jsonwebtoken');
 const uuidv4 = require('uuid/v4');
-var ObjectId = require('mongoose').Types.ObjectId;
+const trainingService = require('../services/trainingService');
 
 let chatbot_templates_api_url = process.env.CHATBOT_TEMPLATES_API_URL
 
@@ -130,6 +130,50 @@ router.post('/train', function (req, res) {
 
 });
 
+router.post('/aitrain/', async (req, res) => {
+  
+  let id_faq_kb = req.body.id_faq_kb;
+  let webhook_enabled = req.body.webhook_enabled;
+
+  Faq_kb.findById(id_faq_kb, async (err, chatbot) => {
+    if (err) {
+      return res.status(400).send({ success: false, error: err })
+    }
+    if (!chatbot) {
+      return res.status(404).send({ sucess: false, error: "Chatbot not found" });
+    }
+    if (chatbot.intentsEngine === 'tiledesk-ai') {
+
+      // Option 1: emit event
+      //faqBotEvent.emit('faq_train.train', id_faq_kb, webhook_enabled);
+
+      // Option 2: call service directly
+      trainingService.train(null, id_faq_kb, webhook_enabled).then((training_result) => {
+        winston.info("training result: ", training_result);
+        let response = {
+          succes: true,
+          message: "Training started"
+        }
+        if (webhook_enabled === false) {
+          response.queue_message = training_result;
+        }
+        return res.status(200).send(response);
+
+      }).catch((err) => {
+        winston.error("training error: ", err);
+        return res.status(200).send({ success: false, message: "Trained not started", error: err });
+      })
+
+
+
+    } else {
+      return res.status(200).send({ success: true, message: "Trained not started", reason: "Training available for intentsEngine equal to tiledesk-ai only" })
+    }
+  })
+
+
+})
+
 
 router.post('/askbot', function (req, res) {
 
@@ -696,7 +740,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
       }
 
     })
-    faqBotEvent.emit('faq_train.importedall', id_faq_kb);
+    //faqBotEvent.emit('faq_train.importedall', id_faq_kb);
     return res.status(200).send({ success: true, msg: "Intents imported successfully" })
 
   } else {
@@ -788,7 +832,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
     
                 })
               }
-              faqBotEvent.emit('faq_train.importedall', savedEditedFaq_kb._id);
+              //faqBotEvent.emit('faq_train.importedall', savedEditedFaq_kb._id);
               return res.status(200).send(savedEditedFaq_kb);
             })
 
@@ -914,7 +958,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
             })
 
           }
-          faqBotEvent.emit('faq_train.importedall', id_faq_kb);
+          //faqBotEvent.emit('faq_train.importedall', id_faq_kb);
           return res.send(updatedFaq_kb);
   
         })
@@ -989,6 +1033,7 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
 router.post('/:faq_kbid/training', function (req, res) {
 
   winston.debug(req.body);
+  winston.info(req.params.faq_kbid + "/training called" );
 
   var update = {};
   update.trained = true;

package/routes/kbsettings.js

@@ -132,12 +132,43 @@ router.post('/startscrape', async (req, res) => {
 
 router.post('/checkstatus', async (req, res) => {
 
-    let data = req.body;
-    winston.debug("/checkstatus data: ", data);
+    // let data = req.body;
+    winston.debug("/checkstatus req.body: ", req.body);
+
+    let full_url = req.body.full_url;
+    let data = {
+        url_list: [ req.body.full_url ]
+    }
 
     openaiService.checkStatus(data).then((resp) => {
         winston.debug("checkStatus resp: ", resp.data);
-        res.status(200).send(resp.data);
+        winston.debug("checkStatus resp: ", resp.data);
+        winston.debug("checkStatus resp: ", resp.data[full_url]);
+
+        let response = resp.data[full_url];
+
+        let return_data = {
+            status_message: response.status_message
+        }
+
+        if (response.status_code === 3) {
+            return_data.status_code = 2;
+        }
+
+        if (response.status_code === 1 || response.status_code === 2 ) {
+            return_data.status_code = 1;
+        }
+
+        if (response.status_code === 0) {
+            return_data.status_code = 0;
+        }
+
+        if (!response.status_code) {
+            return_data.status_code = 0;
+        }
+
+        
+        res.status(200).send(return_data);
     }).catch((err) => {
         winston.error("checkstatus err: ", err);
         let status = err.response.status;

package/services/openaiService.js

@@ -62,7 +62,7 @@ class OpenaiService {
         return new Promise((resolve, reject) => {
 
             axios({
-                url: kb_endpoint + "/scrape/",
+                url: kb_endpoint + "/scrape",
                 headers: {
                     'Content-Type': 'application/json'
                 },
@@ -83,7 +83,7 @@ class OpenaiService {
         return new Promise((resolve, reject) => {
 
             axios({
-                url: kb_endpoint + "/qa/",
+                url: kb_endpoint + "/qa",
                 headers: {
                     'Content-Type': 'application/json'
                 },

package/services/trainingService.js

@@ -6,78 +6,97 @@ const axios = require("axios").default;
 var configGlobal = require('../config/global');
 
 
-let chatbot_training_api_url = "http://34.65.210.38/model/train"
+let training_api_url = process.env.CHATBOT_TRAINING_API_URL || "http://34.65.210.38/model/enqueuetrain";
+let token = process.env.TRAINING_BOT_JWT_TOKEN;
 
 class TrainingService {
 
 
-    train(eventName, id_faq_kb) {
-
-        Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
-
-            if (err) {
-                winston.error("train error: ", err)
-                return null;
-            }
-
-            if (!faq_kb) {
-                winston.error("faq_kb is undefined");
-                return null;
-            }
-
-            if (faq_kb.intentsEngine !== 'tiledesk-ai') {
-                winston.debug("intentsEngine: off")
-                return null;
-            }
-
-            winston.debug("intentsEngine: on")
-            Faq.find({ id_faq_kb: id_faq_kb }, (err, faqs) => {
+    async train(eventName, id_faq_kb, webhook_enabled) {
 
+        return new Promise((resolve, reject) => {
+            
+            Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
+    
                 if (err) {
-                    winston.error("[Training] find all error: ", err);
-                } else {
-                      
-                    let json = {
-                        "configuration": {
-                            "language": faq_kb.language,
-                            "pipeline":["lstm"]
-                        },
-                        "model": faq_kb._id,
-                        "nlu": [],
-
-                        // curl -v -X PUT -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin -d '{"trained":false}'  http://localhost:3000/63ed15febb8a5eb3b247fdfd/bots/64551b3422cdfb93ddb1b784
-                        "webhook_url":  process.env.API_URL || configGlobal.apiUrl + "/" + faq_kb.id_project + "/bots/" + faq_kb._id+"/training",
-                        "token" : process.env.TRAINING_BOT_JWT_TOKEN
-                    }
-
-                    faqs.forEach((f) => {
-                        if (f.enabled == true) {
-                            let intent = {
-                                "intent": f.intent_display_name,
-                                "examples": []
-                            }
-                            let questions = f.question.split("\n");
-                            intent.examples = questions;
-                            json.nlu.push(intent);
-                        }
-                    })
-
-                    winston.debug("training json: \n" + JSON.stringify(json, null, 2));
-
-                    axios({
-                        url: chatbot_training_api_url,
-                        headers: {
-                            'Content-Type': 'application/json'
-                        },
-                        data: json,
-                        method: 'POST'
-                    }).then((resbody) => {
-                        winston.info("[Training] resbody: ", resbody.data);
-                        return true;
-                    }).catch((err) => {
-                        winston.error("[Training] error: ", err.response.data);
-                    })
+                    winston.error("train error: ", err)
+                    // return null;
+                    reject(null);
+                }
+    
+                if (!faq_kb) {
+                    winston.error("faq_kb is undefined");
+                    // return null;
+                    reject(null);
                 }
+    
+                if (faq_kb.intentsEngine !== 'tiledesk-ai') {
+                    winston.debug("intentsEngine: off")
+                    // return null;
+                    reject(null);
+                }
+    
+                winston.debug("intentsEngine: on")
+                Faq.find({ id_faq_kb: id_faq_kb }, async (err, faqs) => {
+    
+                    if (err) {
+                        winston.error("[Training] find all error: ", err);
+                    } else {
+    
+                        let json = {
+                            "configuration": {
+                                "language": faq_kb.language,
+                                "pipeline":["lstm"]
+                            },
+                            "model": faq_kb._id,
+                            "nlu": [],
+                            //"webhook_url":  process.env.API_URL || configGlobal.apiUrl + "/" + faq_kb.id_project + "/bots/" + faq_kb._id+"/training",
+                            // curl -v -X PUT -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin -d '{"trained":false}'  http://localhost:3000/63ed15febb8a5eb3b247fdfd/bots/64551b3422cdfb93ddb1b784
+                        }
+    
+                        if (webhook_enabled === true) {
+                            json.webhook_url = process.env.API_URL || configGlobal.apiUrl + "/" + faq_kb.id_project + "/bots/" + faq_kb._id+"/training"
+                        }
+    
+                        faqs.forEach((f) => {
+                            if (f.enabled == true) {
+                                let intent = {
+                                    "intent": f.intent_display_name,
+                                    "examples": []
+                                }
+                                if (f.question) {
+                                    let questions = f.question.split("\n");
+                                    intent.examples = questions;
+                                    json.nlu.push(intent);
+                                } else {
+                                    winston.debug("faq question null!")
+                                }
+                            }
+                        })
+    
+                        winston.debug("training json: \n", json);
+    
+                        await axios({
+                            url: training_api_url,
+                            headers: {
+                                'Content-Type': 'application/json',
+                                'Authorization': token
+                            },
+                            data: json,
+                            method: 'POST'
+                        }).then((resbody) => {
+                            winston.debug("[Training] resbody: ", resbody.data);
+                            // return true;
+                            resolve(resbody.data);
+                        }).catch((err) => {
+                            winston.error("[Training] error: ", err);
+                            // return false;
+                            reject(false);
+                            // winston.error("[Training] error: ", err);
+                        })
+                    }
+                })
+    
             })
 
         })
@@ -89,6 +108,12 @@ class TrainingService {
     start() {
         winston.info('TrainingService start');
 
+        faqBotEvent.on('faq_train.train', (id_faq_kb, webhook_enabled) => {
+            setImmediate(() => {
+                trainingService.train('faq_train.train', id_faq_kb, webhook_enabled);
+            })
+        })
+
         faqBotEvent.on('faq_train.importedall', (id_faq_kb) => {
             setImmediate(() => {
                 trainingService.train('faq.importedall', id_faq_kb);

package/test/faqRoute.js

@@ -28,7 +28,7 @@ describe('FaqKBRoute', () => {
 
     describe('/create', () => {
 
-        it('create qwerty', (done) => {
+        it('create', (done) => {
 
             //   this.timeout();
 
@@ -469,9 +469,7 @@ describe('FaqKBRoute', () => {
                         .auth(email, pwd)
                         .send({ "name": "testbot", type: "internal", template: "example" })
                         .end((err, res) => {
-                            if (log) {
-                                console.log("res.body", res.body);
-                            }
+                            if (log) { console.log("res.body", res.body); }
                             res.should.have.status(200);
                             res.body.should.be.a('object');
                             expect(res.body.name).to.equal("testbot");
@@ -483,9 +481,7 @@ describe('FaqKBRoute', () => {
                                 .get('/' + savedProject._id + '/faq?id_faq_kb=' + id_faq_kb + "&page=0&limit=25&text=looking")
                                 .auth(email, pwd)
                                 .end((err, res) => {
-                                    if (log) {
-                                        console.log("found these faqs: \n", res.body);
-                                    }
+                                    if (log) { console.log("found these faqs: \n", res.body); }
                                     res.should.have.status(200);
                                     res.body.should.be.an('array');
 
@@ -509,11 +505,9 @@ describe('FaqKBRoute', () => {
                     chai.request(server)
                         .post('/' + savedProject._id + '/faq_kb')
                         .auth(email, pwd)
-                        .send({ "name": "testbot", type: "internal", template: "example", intentsEngine: 'tiledesk-ai' })
+                        .send({ "name": "testbot", type: "internal", template: "blank", intentsEngine: 'tiledesk-ai' })
                         .end((err, res) => {
-                            if (log) {
-                                console.log("res.body", res.body);
-                            }
+                            if (log) { console.log("res.body", res.body); }
                             res.should.have.status(200);
                             res.body.should.be.a('object');
                             expect(res.body.name).to.equal("testbot");
@@ -523,7 +517,7 @@ describe('FaqKBRoute', () => {
                             chai.request(server)
                                 .post('/' + savedProject._id + '/faq')
                                 .auth(email, pwd)
-                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1" })
+                                .send({ id_faq_kb: id_faq_kb, question: "question1\nciao\nbuongiorno", answer: "answer1" })
                                 .end((err, res) => {
                                     if (log) {  console.log("intentEngin on resbody (create faq): \n", res.body); }
                                     res.should.have.status(200);

package/test/faqkbRoute.js

@@ -73,6 +73,53 @@ describe('FaqKBRoute', () => {
 
         }).timeout(20000);
 
+        // it('train with tiledesk-ai', (done) => {
+        //     var email = "test-signup-" + Date.now() + "@email.com";
+        //     var pwd = "pwd";
+
+        //     userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+        //         projectService.create("test-faqkb-create", savedUser._id).then((savedProject) => {
+
+        //             chai.request(server)
+        //                 .post('/' + savedProject._id + '/faq_kb')
+        //                 .auth(email, pwd)
+        //                 .send({ "name": "testbot", type: "internal", template: "example", intentsEngine: "tiledesk-ai" })
+        //                 .end((err, res) => {
+        //                     if (log) {
+        //                         console.log("res.body", res.body);
+        //                     }
+        //                     res.should.have.status(200);
+        //                     res.body.should.be.a('object');
+        //                     expect(res.body.name).to.equal("testbot");
+        //                     var id_faq_kb = res.body._id;
+
+        //                     chai.request(server)
+        //                         .get('/' + savedProject._id + '/faq?id_faq_kb=' + id_faq_kb)
+        //                         .auth(email, pwd)
+        //                         .end((err, res) => {
+        //                             if (log) { console.log("faq_list: ", res.body); }
+        //                             res.should.have.status(200);
+        //                             res.body.should.be.an('array').that.is.not.empty;
+
+        //                             chai.request(server)
+        //                                 .post('/' + savedProject._id + '/faq_kb/aitrain')
+        //                                 .auth(email, pwd)
+        //                                 .send({ id_faq_kb: id_faq_kb, webhook_enabled: false })
+        //                                 .end((err, res) => {
+        //                                     if (log) { console.log("train res.body: ", res.body); }
+
+        //                                     done();
+        //                                 })
+
+        //                         })
+
+
+
+        //                 });
+        //         })
+        //     })
+        // })
+
 
         it('create with template example', (done) => {
 

package/test/kbsettingsRoute.js

@@ -453,7 +453,7 @@ describe('KbSettingsRoute', () => {
 
         // }).timeout(20000)
 
-        // it('check status error - no db created for', (done) => {
+        // it('checkstatuserror - no db created for', (done) => {
 
         //     var email = "test-signup-" + Date.now() + "@email.com";
         //     var pwd = "pwd";
@@ -474,7 +474,7 @@ describe('KbSettingsRoute', () => {
         //                     chai.request(server)
         //                         .post('/' + savedProject._id + "/kbsettings/" + res.body._id)
         //                         .auth(email, pwd)
-        //                         .send({ name: "dbnevercreated.com/kb/", url: "https://exampleurl.com/kb/" })
+        //                         .send({ name: "gethelp.tiledesk.com/", url: "https://gethelp.tiledesk.com/" })
         //                         .end((err, res) => {
         //                             if (log) { console.log("add kb to kb settings res.body: ", res.body); }
         //                             res.should.have.status(200);
@@ -484,12 +484,12 @@ describe('KbSettingsRoute', () => {
         //                             chai.request(server)
         //                                 .post('/' + savedProject._id + "/kbsettings/checkstatus")
         //                                 .auth(email, pwd)
-        //                                 .send({ full_url: "dbnevercreated.com/kb/" })
+        //                                 .send({ full_url: "https://gethelp.tiledesk.com/" })
         //                                 .end((err, res) => {
         //                                     res.should.have.status(200);
         //                                     res.body.should.be.a('object');
-        //                                     expect(res.body.status_message).to.equal("Database is not created yet for dbnevercreated.com/kb/, please wait a few minutes and try again");
-        //                                     expect(res.body.status_code).to.equal(0);
+        //                                     // expect(res.body.status_message).to.equal("Database is not created yet for dbnevercreated.com/kb/, please wait a few minutes and try again");
+        //                                     // expect(res.body.status_code).to.equal(0);
 
         //                                     done();
         //                                 })