@tiledesk/tiledesk-server 2.4.72 → 2.4.73

package/CHANGELOG.md

@@ -5,6 +5,9 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 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.73",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,7 +44,7 @@
     "@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-telegram-connector": "^0.1.8",
     "amqplib": "^0.5.5",

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

@@ -130,6 +130,27 @@ router.post('/train', function (req, res) {
 
 });
 
+router.post('/train/:id_faq_kb', async (req, res) => {
+  let id_faq_kb = req.params.id_faq_kb;
+
+  Faq_kb.findById(id_faq_kb, (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') {
+      faqBotEvent.emit('faq_train.train', id_faq_kb);
+      return res.status(200).send({ success: true, message: "Training started"})
+    } 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 +717,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 +809,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 +935,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);
   
         })

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

@@ -89,6 +89,12 @@ class TrainingService {
     start() {
         winston.info('TrainingService start');
 
+        faqBotEvent.on('faq_train.train', (id_faq_kb) => {
+            setImmediate(() => {
+                trainingService.train('faq_train.train', id_faq_kb);
+            })
+        })
+
         faqBotEvent.on('faq_train.importedall', (id_faq_kb) => {
             setImmediate(() => {
                 trainingService.train('faq.importedall', id_faq_kb);

package/test/faqkbRoute.js

@@ -73,6 +73,53 @@ describe('FaqKBRoute', () => {
 
         }).timeout(20000);
 
+        it('train with tiledesk-ai qwerty', (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) => {
+                                    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/train/' + id_faq_kb)
+                                        .auth(email, pwd)
+                                        .send({})
+                                        .end((err, res) => {
+                                            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();
         //                                 })