@tiledesk/tiledesk-server 2.10.80 → 2.10.81

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.81
+- Fix bug on webhook import and fork (wrong blank template)
+- Updated whatsapp-connector to 0.1.82
+
 # 2.10.80
 - Updated tybot-connector to 2.0.9
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.80",
+  "version": "2.10.81",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -48,7 +48,7 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
     "@tiledesk/tiledesk-tybot-connector": "^2.0.9",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.81",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.82",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.12",
     "@tiledesk/tiledesk-sms-connector": "^0.1.11",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.76",

package/routes/faq_kb.js

@@ -643,6 +643,8 @@ router.post('/fork/:id_faq_kb', roleChecker.hasRole('admin'), async (req, res) =
     }
   }
 
+  chatbot.template = "empty";
+
   let savedChatbot = await cs.createBot(api_url, token, chatbot, landing_project_id);
   winston.debug("savedChatbot: ", savedChatbot)
 
@@ -685,6 +687,9 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
   // **** CREATE TRUE option ****
   // ****************************
   if (req.query.create === 'true') {
+    if (json.subtype && (json.subtype === 'webhook' || json.subtype === 'copilot')) {
+      json.template = 'empty';
+    }
     let savedChatbot = await faqService.create(req.projectid, req.user.id, json)
       .catch((err) => {
           winston.error("Error creating new chatbot")

package/services/faqService.js

@@ -50,12 +50,19 @@ class FaqService {
         let template = "empty";
 
         if (data.type === "internal" || data.type === "tilebot") {
-
           if (data.subtype) {
             if (data.subtype === chatbotTypes.WEBHOOK) {
-              template = "blank_webhook"
+              if (data.template && data.template !== 'blank') {
+                template = data.template;
+              } else {
+                template = "blank_webhook"
+              }
             } else if (data.subtype === chatbotTypes.COPILOT) {
-              template = "blank_copilot"
+              if (data.template && data.template !== 'blank') {
+                template = data.template;
+              } else {
+                template = "blank_copilot"
+              }
             } else if (data.subtype === chatbotTypes.CHATBOT) {
               if (data.template) {
                 template = data.template;

package/test/example-webhook-json.txt

@@ -0,0 +1 @@
+{"webhook_enabled":false,"language":"en","name":"Flow 1","slug":"flow-1","type":"tilebot","subtype":"webhook","intents":[{"webhook_enabled":false,"enabled":true,"actions":[{"_tdActionType":"intent","intentName":"#5da40c2c-8711-47b0-98c7-744c253fa255","_tdActionId":"5f54ccf7328a4f6e9ac2e6cf06374595"}],"intent_id":"93882faf-e0b7-4fab-8816-70ecea96d70d","question":"","intent_display_name":"webhook","language":"en","attributes":{"position":{"x":172,"y":384},"readonly":true,"nextBlockAction":{"_tdActionTitle":"","_tdActionId":"bdc317fa-9372-49ac-8373-b922210292e9","_tdActionType":"intent"},"connectors":{}},"agents_available":false},{"webhook_enabled":false,"enabled":true,"actions":[{"_tdActionTitle":"","_tdActionId":"0eeee924-7b2b-41a4-8c10-731d1c28ee6c","_tdActionType":"gpt_task","max_tokens":256,"temperature":0.7,"model":"gpt-4o","assignReplyTo":"gpt_reply","preview":[],"formatType":"none","question":"Quanto fa 2+2? Rispondi solo con il risultato.","context":"","trueIntent":"#f38844ea-c490-40ee-b32a-6a59e77410fc","falseIntent":null}],"language":"en","intent_display_name":"untitled_block_1","intent_id":"5da40c2c-8711-47b0-98c7-744c253fa255","agents_available":false,"attributes":{"position":{"x":560,"y":281},"nextBlockAction":{"_tdActionId":"8f98f384-adb2-4b6b-a31a-de5f751cd658","_tdActionType":"intent","intentName":""},"connectors":{},"color":"156,163,205","readonly":false}},{"webhook_enabled":false,"enabled":true,"actions":[{"_tdActionTitle":"","_tdActionId":"f046856f-afbd-47b3-9f23-f6d109ce25f4","payload":"{\n\"success\": true,\n\"result\": {{gpt_reply}}\n}","headersString":{"Content-Type":"*/*","Cache-Control":"no-cache","User-Agent":"TiledeskBotRuntime","Accept":"*/*"},"bodyType":"json","assignTo":"","_tdActionType":"web_response","status":"200"}],"language":"en","intent_display_name":"untitled_block_2","intent_id":"f38844ea-c490-40ee-b32a-6a59e77410fc","agents_available":false,"attributes":{"position":{"x":1001,"y":296},"nextBlockAction":{"_tdActionId":"db01c4fd-f14a-413a-8d4d-12a53da49267","_tdActionType":"intent","intentName":""},"color":"156,163,205","readonly":false}}]}

package/test/faqkbRoute.js

@@ -369,6 +369,50 @@ describe('FaqKBRoute', () => {
             })
         })
 
+        it('create-new-webhook', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+                projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
+                        .auth(email, pwd)
+                        .send({ name: "testflow", type: "tilebot", subtype: "webhook", language: 'en' })
+                        .end((err, res) => {
+
+                            if (err) { console.error("err: ", err); }
+                            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("testflow");
+                            expect(res.body.language).to.equal("en");
+                            expect(res.body.type).to.equal("tilebot");
+                            expect(res.body.subtype).to.equal("webhook")
+
+
+                            chai.request(server)
+                                .get('/' + savedProject._id + '/faq/?id_faq_kb=' + res.body._id)
+                                .auth(email, pwd)
+                                .end((err, res) => {
+
+                                    if (err) { console.error("err: ", err); }
+                                    if (log) { console.log("res.body", res.body); }
+                                    console.log("res.body", res.body);
+                                    res.should.have.status(200);
+
+                                    done();
+
+                                });
+                        });
+                });
+            });
+
+        })
+
     });
 
 
@@ -1021,6 +1065,52 @@ describe('FaqKBRoute', () => {
 
         }).timeout(20000);
 
+        it('import-webhook-json', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+                projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb/importjson/null?create=true')
+                        .auth(email, pwd)
+                        .set('Content-Type', 'text/plain')
+                        .attach('uploadFile', fs.readFileSync(path.resolve(__dirname, './example-webhook-json.txt')), 'example-webhook-json.txt')
+                        .end((err, res) => {
+
+                            if (err) { console.error("err: ", err) };
+                            if (log) { console.log("res.body: ", res.body) };
+                            console.log("res.body: ", res.body)
+                            res.should.have.status(200);
+                            res.should.be.a('object');
+                            expect(res.body.name).to.equal("Flow 1");
+                            expect(res.body.language).to.equal("en");
+
+                            let 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 (err) { console.error("err: ", err) };
+                                    if (log) { console.log("res.body: ", res.body) };
+
+                                    res.should.have.status(200);
+                                    res.body.should.be.an('array').that.is.not.empty;
+                                    expect(res.body.length).to.equal(3);
+
+                                    done();
+
+                                })
+                        })
+                })
+            })
+        })
+        
+
     })
 
     // describe('Train', () => {