@tiledesk/tiledesk-server 2.4.51 → 2.4.53

package/app.js

@@ -112,7 +112,7 @@ var jwtroute = require('./routes/jwt');
 var key = require('./routes/key');
 var widgets = require('./routes/widget');
 var widgetsLoader = require('./routes/widgetLoader');
-var openai_kbs = require('./routes/openai_kbs');
+var openai = require('./routes/openai');
 var kbsettings = require('./routes/kbsettings');
 
 // var admin = require('./routes/admin');
@@ -551,7 +551,7 @@ app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session:
 
 app.use('/:projectid/properties',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], property);
 
-app.use('/:projectid/openai_kbs', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent')], openai_kbs);
+app.use('/:projectid/openai', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent')], openai);
 app.use('/:projectid/kbsettings', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], kbsettings);
 
 

package/models/faq.js

@@ -7,6 +7,12 @@ const uuidv4 = require('uuid/v4');
 var defaultFullTextLanguage = process.env.DEFAULT_FULLTEXT_INDEX_LANGUAGE || "none";
 
 var FaqSchema = new Schema({
+  _id: {
+    type: mongoose.Schema.Types.ObjectId,
+    index: true,
+    required: true,
+    auto: true,
+  },
   id_faq_kb: {
     type: String,
     index: true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.51",
+  "version": "2.4.53",
   "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.9",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.92",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.94",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.51",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/routes/faq.js

@@ -147,6 +147,7 @@ router.post('/', function (req, res) {
     winston.debug('faq_kb ', faq_kb.toJSON());
 
     var newFaq = new Faq({
+      _id: req.body._id,
       id_faq_kb: req.body.id_faq_kb,
       question: req.body.question,
       answer: req.body.answer,
@@ -203,6 +204,8 @@ router.patch('/:faqid/attributes', function (req, res) {
   let data = req.body;
   winston.debug("data: ", data);
 
+  // aggiugnere controllo su intent_id qui
+
   Faq.findById(req.params.faqid, function (err, updatedFaq) {
     if (err) {
       winston.error('Find Faq by id ERROR: ', err);
@@ -253,6 +256,7 @@ router.patch('/:faqid/attributes', function (req, res) {
 router.put('/:faqid', function (req, res) {
 
   winston.debug('UPDATE FAQ ', req.body);
+  let faqid = req.params.faqid;
 
   var update = {};
 
@@ -296,45 +300,84 @@ router.put('/:faqid', function (req, res) {
     update.attributes = req.body.attributes;
   }
 
-  Faq.findByIdAndUpdate(req.params.faqid, update, { new: true, upsert: true }, function (err, updatedFaq) {
-    if (err) {
-      if (err.code == 11000) {
-        return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });
-      } else {
-        return res.status(500).send({ success: false, msg: 'Error updating object.' });
+  if (faqid.startsWith("intentId")) {
+    let intent_id = faqid.substring(8);
+    Faq.findOneAndUpdate({ intent_id: intent_id }, update, { new: true, upsert: true}, (err, updatedFaq) => {
+      if (err) {
+        if (err.code == 11000) {
+          return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });
+        } else {
+          return res.status(500).send({ success: false, msg: 'Error updating object.' });
+        }
       }
-    }
 
-    faqBotEvent.emit('faq.update', updatedFaq);
-    faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
+      faqBotEvent.emit('faq.update', updatedFaq);
+      faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
+  
+      res.status(200).send(updatedFaq);
+    })
 
-    res.json(updatedFaq);
+  } else {
+    Faq.findByIdAndUpdate(req.params.faqid, update, { new: true, upsert: true }, function (err, updatedFaq) {
+      if (err) {
+        if (err.code == 11000) {
+          return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });
+        } else {
+          return res.status(500).send({ success: false, msg: 'Error updating object.' });
+        }
+      }
+  
+      faqBotEvent.emit('faq.update', updatedFaq);
+      faqBotEvent.emit('faq_train.update', updatedFaq.id_faq_kb);
+  
+      res.status(200).send(updatedFaq);
+      // updateRemoteFaq(updatedFaq)
+    });
+  }
 
-    // updateRemoteFaq(updatedFaq)
-  });
 });
 
 
 // DELETE REMOTE AND LOCAL FAQ
 router.delete('/:faqid', function (req, res) {
 
-  // deleteRemoteFaq(req.params.faqid)
   winston.debug('DELETE FAQ - FAQ ID ', req.params.faqid);
 
-  Faq.findByIdAndRemove({ _id: req.params.faqid }, function (err, faq) {
-    if (err) {
-      return res.status(500).send({ success: false, msg: 'Error deleting object.' });
-    }
-    winston.debug('Deleted FAQ ', faq);
-
-    faqBotEvent.emit('faq.delete', faq);
-    faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
+  let faqid = req.params.faqid;
+  
+  if (faqid.startsWith("intentId")) {
+    console.log("faqid is an intent_id")
+    let intent_id = faqid.substring(8);
+    console.log("faq intent_id: ", intent_id);
 
-    res.json(faq);
+    Faq.findOneAndDelete({ intent_id: intent_id }, (err, faq) => {
+      if (err) {
+        return res.status(500).send({ success: false, msg: "Error deleting object." });
+      }
 
-  });
+      winston.debug('Deleted FAQ ', faq);
+  
+      faqBotEvent.emit('faq.delete', faq);
+      faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
+  
+      res.status(200).send(faq);
 
+    })
 
+  } else {
+    Faq.findByIdAndRemove({ _id: req.params.faqid }, function (err, faq) {
+      if (err) {
+        return res.status(500).send({ success: false, msg: 'Error deleting object.' });
+      }
+      winston.debug('Deleted FAQ ', faq);
+  
+      faqBotEvent.emit('faq.delete', faq);
+      faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
+  
+      res.status(200).send(faq);
+  
+    });
+  }
 });
 
 // EXPORT FAQ TO CSV

package/routes/faq_kb.js

@@ -639,6 +639,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
 
   winston.debug("json source " + json_string)
 
+  // intentOnly still existing?
   if (req.query.intentsOnly && req.query.intentsOnly == "true") {
 
     winston.debug("intents only")
@@ -658,7 +659,8 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
         enabled: intent.enabled,
         webhook_enabled: intent.webhook_enabled,
         language: intent.language,
-        actions: intent.actions
+        actions: intent.actions,
+        attributes: intent.attributes
       }
 
       // overwrite duplicated intents
@@ -746,7 +748,8 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
                     enabled: intent.enabled,
                     webhook_enabled: intent.webhook_enabled,
                     language: intent.language,
-                    actions: intent.actions
+                    actions: intent.actions,
+                    attributes: intent.attributes
                   }
     
                   // TO DELETE: no used when req.query.create = 'true'
@@ -869,7 +872,8 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
                 enabled: intent.enabled,
                 webhook_enabled: intent.webhook_enabled,
                 language: intent.language,
-                actions: intent.actions
+                actions: intent.actions,
+                attributes: intent.attributes
               }
     
               // overwrite duplicated intents

package/routes/openai.js

@@ -0,0 +1,112 @@
+var express = require('express');
+var router = express.Router();
+var KBSettings = require('../models/kb_setting');
+var openaiService = require('../services/openaiService');
+var winston = require('../config/winston');
+
+router.post('/', async (req, res) => {
+
+    let project_id = req.projectid;
+    let body = req.body;
+
+    console.log("### --> body: ", body);
+
+    KBSettings.findOne({ id_project: project_id }, (err, kbSettings) => {
+        console.log("kbSettings: ", kbSettings);
+
+        if (!kbSettings) {
+            return res.status(400).send({ success: false, message: "Missing gptkey parameter (settings not exist)" })
+        }
+
+        let gptkey = kbSettings.gptkey;
+
+        if (!gptkey) {
+            return res.status(400).send({ success: false, message: "Missing gptkey parameter" })
+        }
+
+        // attua modifiche
+        let json = {
+            "model": body.model,
+            "messages": [
+                {
+                    "role": "user",
+                    "content": body.question
+                }
+            ],
+            "max_tokens": body.max_tokens,
+            "temperature": body.temperature
+        }
+
+        let message = { role: "", content: "" };
+        if (body.context) {
+            message.role = "system";
+            message.content = body.context;
+            json.messages.unshift(message);
+        }
+        console.log("openai preview --> json: ", json);
+
+        openaiService.completions(json, gptkey).then((response) => {
+            // winston.debug("completions response: ", response);
+            res.status(200).send(response.data);
+        }).catch((err) => {
+            console.log("err: ", err);
+            // winston.error("completions error: ", err);
+            res.status(500).send(err)
+        })
+
+    })
+})
+
+// router.get('/', async (req, res) => {
+
+//     let project_id = req.projectid;
+
+//     OpenaiKbs.find({ id_project: project_id }, (err, kbs) => {
+//         if (err) {
+//             console.error("find all kbs error: ", err);
+//             return res.status(500).send({ success: false, error: err });
+//         } else {
+//             return res.status(200).send(kbs);
+//         }
+//     })
+// })
+
+// router.post('/', async (req, res) => {
+
+//     let body = req.body;
+
+//     let new_kbs = new OpenaiKbs({
+//         name: body.name,
+//         url: body.url,
+//         id_project: req.projectid,
+//         gptkey: req.body.gptkey
+//     })
+
+//     new_kbs.save(function (err, savedKbs) {
+//         if (err) {
+//             console.error("save new kbs error: ", err);
+//             return res.status(500).send({ success: false, error: err});
+//         } else {
+//             return res.status(200).send(savedKbs);
+//         }
+//     })
+// })
+
+// router.put('/', async (req, res) => {
+//     // to be implemented
+// })
+
+// router.delete('/:kbs_id', async (req, res) => {
+//     let kbs_id = req.params.kbs_id;
+
+//     OpenaiKbs.findOneAndDelete( { _id: kbs_id }, (err, kbDeleted) => {
+//         if (err) {
+//             console.error("find one and delete kbs error: ", err);
+//             return res.status(500).send({ success: false, error: err});
+//         } else {
+//             return res.status(200).send({ success: true, message: 'Knowledge Base deleted successfully', openai_kb: kbDeleted });
+//         }
+//     })
+// })
+
+module.exports = router;

package/routes/users.js

@@ -185,5 +185,29 @@ router.get('/', function (req, res) {
   });
 });
 
+router.post('/loginemail', function (req, res) {
+
+  winston.debug("/loginemail... req.body: ", req.body);
+  let user_id = req.user._id;
+  let token = req.headers.authorization;
+
+  let project_id = req.body.id_project;
+  if (!project_id) {
+    res.status(500).send({ success: false, error: "missing 'id_project' field" })
+  }
+
+  User.findById(user_id, (err, user) => {
+    if (err) {
+      return res.status(404).send({ success: false, message: "No user found" });
+    }
+    winston.debug("user found: ", user);
+
+    emailService.sendEmailRedirectOnDesktop(user.email, token, project_id, user.email)
+    return res.status(200).send("Sending email...")
+  })
+
+
+})
+
 
 module.exports = router;

package/services/emailService.js

@@ -1851,6 +1851,39 @@ async sendRequestTranscript(to, messages, request, project) {
 
 }
 
+async sendEmailRedirectOnDesktop(to, token, project_id) {
+  winston.debug("sendEmailRedirectOnDesktop: " + to);
+
+  var that = this;
+
+  let html = await this.readTemplate('redirectToDesktopEmail.html');
+
+  let envTemplate = process.env.EMAIL_REDIRECT_TO_DESKTOP_TEMPLATE
+  winston.debug("envTemplate: " + envTemplate);
+
+  if (envTemplate) {
+    html = envTemplate;
+  }
+
+  winston.debug("html: " + html);
+
+  let template = handlebars.compile(html);
+
+  let baseScope = JSON.parse(JSON.stringify(that));
+  delete baseScope.pass;
+
+  let replacements = {
+    baseScope: baseScope,
+    token: token,
+    project_id: project_id
+  }
+
+  html = template(replacements);
+
+  that.send({ to: to, subject: "Join Tiledesk from Desktop", html: html });
+
+}
+
 parseText(text, payload) {
 
  

package/services/openaiService.js

@@ -0,0 +1,41 @@
+var winston = require('../config/winston');
+const axios = require("axios").default;
+var configGlobal = require('../config/global');
+require('dotenv').config();
+
+let openai_endpoint = process.env.OPENAI_ENDPOINT;
+
+class OpenaiService {
+    
+    completions(data, gptkey) {
+        
+        console.log("****** Serivcesssssssss openai_endpoint: ", openai_endpoint);
+
+        return new Promise((resolve, reject) => {
+
+            axios({
+                url: openai_endpoint + "/chat/completions",
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': "Bearer " + gptkey
+                },
+                data: data,
+                method: 'POST'
+            }).then((resbody) => {
+                //winston.debug("[Openai] completions resbody: ", resbody.data);
+                resolve(resbody);
+            }).catch((err) => {
+                console.log("err: ", err);
+                // winston.error("[Openai] completions error: ", err);
+                reject(err);
+            })
+
+        })
+
+    }
+
+}
+
+var openaiService = new OpenaiService();
+
+module.exports = openaiService;