@tiledesk/tiledesk-server 2.4.52 → 2.4.54

package/CHANGELOG.md

@@ -5,6 +5,9 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.43
+- updated tybot-connector to 0.1.96
+- added segment module
 
 # 2.4.42
 - createIfNotExistsWithLeadId now update the lead email if jwt email changes

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');
@@ -129,6 +129,8 @@ var requestUtilRoot = require('./routes/requestUtilRoot');
 var urls = require('./routes/urls');
 var email = require('./routes/email');
 var property = require('./routes/property');
+var segment = require('./routes/segment');
+
 
 var bootDataLoader = require('./services/bootDataLoader');
 var settingDataLoader = require('./services/settingDataLoader');
@@ -550,8 +552,9 @@ app.use('/:projectid/campaigns',[passport.authenticate(['basic', 'jwt'], { sessi
 app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], email);
 
 app.use('/:projectid/properties',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], property);
+app.use('/:projectid/segments',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], segment);
 
-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/docs/api-dev.md

@@ -882,4 +882,45 @@ curl -v -X GET -H 'Content-Type:application/json' -H "Authorization: JWT eyJhbGc
 
 
 
-curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456 https://tiledesk-server-pre.herokuapp.com/chat21/native/auth/createCustomToken
+curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456 https://tiledesk-server-pre.herokuapp.com/chat21/native/auth/createCustomToken
+
+
+
+
+
+curl -v -X POST -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin -d '{"name":"testprj"}' http://localhost:3000/projects
+
+curl -v -X POST -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin  -d '{ "name":"segment1", "filters": [{"field":"field1","operator":"=","value":"ciao2"}]}' http://localhost:3000/651446eeaf0e4e333f86db6d/segments
+
+
+curl -v -X POST -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin -d '{"text":"firstText"}' http://localhost:3000/651446eeaf0e4e333f86db6d/requests/req123456999-651446eeaf0e4e333f86db6d/messages
+
+
+curl -v -X GET -u admin@tiledesk.com:adminadmin  http://localhost:3000/651446eeaf0e4e333f86db6d/leads?segment=651448cc39405451f2165a80
+
+
+number
+
+curl -v -X POST -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin  -d '{ "name":"segment1", "filters": [{"field":"field1","operator":"=","value":44}]}' http://localhost:3000/651446eeaf0e4e333f86db6d/segments
+
+curl -v -X GET -u admin@tiledesk.com:adminadmin  http://localhost:3000/651446eeaf0e4e333f86db6d/leads?segment=6515a7e0066727cb94bccd5c
+
+
+
+
+sudo systemctl start mongod
+
+
+
+
+curl -v -X PUT -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin  -d '{ "name":"segment2", "filters": [{"field":"field1","operator":"=","value":"ciao2"}]}' http://localhost:3000/651446eeaf0e4e333f86db6d/segments/6516eb0a11e143e3548b8dd6
+
+
+
+curl -v -X GET -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin  http://localhost:3000/651446eeaf0e4e333f86db6d/segments/6516eb0a11e143e3548b8dd6
+
+
+curl -v -X GET -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin  http://localhost:3000/651446eeaf0e4e333f86db6d/segments/
+
+
+curl -v -X DELETE -H 'Content-Type:application/json' -u admin@tiledesk.com:adminadmin  http://localhost:3000/651446eeaf0e4e333f86db6d/segments/6516eb0a11e143e3548b8dd6

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/models/segment.js

@@ -0,0 +1,67 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var winston = require('../config/winston');
+
+
+
+var SegmentFilterSchema = new Schema({
+    field: { //ex: email
+        type: String,
+        required: true,
+        // index:true
+      },
+    operator: {
+        type: String,
+        required: true
+    },
+    value: { //tidio supports date, tag, dropdown
+        //type: String,
+        type: Object,
+        required: true
+    },
+},{ _id : false });
+
+
+var SegmentSchema = new Schema({
+
+  name: {
+    type: String,
+    required: true,
+    // index: true
+  },
+  match: {
+    type: String,
+    required: true,
+    // index: 
+    default: "all" //or any
+  },
+  filters: [SegmentFilterSchema],
+  id_project: {
+    type: String,
+    required: true,
+    index: true
+  },
+  status: {
+    type: Number,
+    default: 100,  
+    required: true,
+    index: true
+  },
+  createdBy: {
+    type: String,
+    required: true
+  }
+},{
+  timestamps: true
+}
+);
+
+
+var segment = mongoose.model('segment', SegmentSchema);
+
+if (process.env.MONGOOSE_SYNCINDEX) {
+    segment.syncIndexes();
+  winston.info("segment syncIndexes")
+}
+
+module.exports = segment;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.52",
+  "version": "2.4.54",
   "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.93",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.96",
     "@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/kbsettings.js

@@ -3,6 +3,7 @@ var KBSettings = require('../models/kb_setting');
 // var KB = require('../models/kb_setting')
 var router = express.Router();
 var winston = require('../config/winston');
+const openaiService = require('../services/openaiService');
 
 router.get('/', async (req, res) => {
     let project_id = req.projectid;
@@ -54,35 +55,6 @@ router.post('/', async (req, res) => {
     })
 })
 
-router.post('/:settings_id', async (req, res) => {
-
-    let settings_id = req.params.settings_id;
-    let body = req.body;
-
-    KBSettings.findById(settings_id, (err, settings) => {
-        if (err) {
-            winston.error("find knoledge base error: ", err);
-            return res.status(500).send({ success: false, error: err});
-        } else {
-
-            let new_kb = {
-                name: body.name,
-                url: body.url
-            }
-            settings.kbs.push(new_kb);
-
-            KBSettings.findByIdAndUpdate( settings_id, settings, { new: true }, (err, savedSettings) => {
-                if (err) {
-                    winston.err("findByIdAndUpdate error: ", err);
-                    res.status(500).send({ success: false, error: err });
-                } else {
-                    res.status(200).send(savedSettings);
-                }
-            })
-        }
-    })
-})
-
 router.put('/:settings_id', async (req, res) => {
 
     let settings_id = req.params.settings_id;
@@ -123,6 +95,81 @@ router.delete('/:settings_id/:kb_id', async (req, res) => {
             res.status(200).send(settings);
         }
     })
+
+})
+
+
+// PROXY PUGLIA AI - START
+router.post('/qa', async (req, res) => {
+    let data = req.body;
+    console.log("data: ", data);
+
+    openaiService.ask(data).then((resp) => {
+        // console.log("qa resp: ", resp.data);
+        res.status(200).send(resp.data);
+    }).catch((err) => {
+        winston.error("qa err: ", err);
+        res.status(500).send(err);
+    })
+})
+
+router.post('/startscrape', async (req, res) => {
+    
+    let data = req.body;
+    console.log("data: ", data);
+
+    openaiService.startScrape(data).then((resp) => {
+        // console.log("startScrape resp: ", resp.data);
+        res.status(200).send(resp.data);
+    }).catch((err) => {
+        winston.error("startScrape err: ", err);
+        res.status(500).send(err);
+    })
+})
+
+
+router.post('/checkstatus', async (req, res) => {
+
+    let data = req.body;
+    console.log("data: ", data);
+
+    openaiService.checkStatus(data).then((resp) => {
+        // console.log("checkStatus resp: ", resp.data);
+        res.status(200).send(resp.data);
+    }).catch((err) => {
+        winston.error("checkStatus err: ", err);
+        res.status(500).send(err);
+    })
+})
+// PROXY PUGLIA AI - END
+
+router.post('/:settings_id', async (req, res) => {
+
+    let settings_id = req.params.settings_id;
+    let body = req.body;
+
+    KBSettings.findById(settings_id, (err, settings) => {
+        if (err) {
+            winston.error("find knoledge base error: ", err);
+            return res.status(500).send({ success: false, error: err});
+        } else {
+
+            let new_kb = {
+                name: body.name,
+                url: body.url
+            }
+            settings.kbs.push(new_kb);
+
+            KBSettings.findByIdAndUpdate( settings_id, settings, { new: true }, (err, savedSettings) => {
+                if (err) {
+                    winston.err("findByIdAndUpdate error: ", err);
+                    res.status(500).send({ success: false, error: err });
+                } else {
+                    res.status(200).send(savedSettings);
+                }
+            })
+        }
+    })
 })
 
 module.exports = router;

package/routes/lead.js

@@ -7,6 +7,8 @@ var leadService = require("../services/leadService");
 csv = require('csv-express');
 csv.separator = ';';
 const leadEvent = require('../event/leadEvent');
+var Segment = require("../models/segment");
+var Segment2MongoConverter = require("../utils/segment2mongoConverter");
 
 
 router.post('/', function (req, res) {
@@ -388,7 +390,7 @@ router.get('/:leadid', function (req, res) {
 });
 
 
-router.get('/', function (req, res) {
+router.get('/', async(req, res) => {
 
   var limit = 40; // Number of request per page
 
@@ -407,7 +409,7 @@ router.get('/', function (req, res) {
   winston.debug('LEAD ROUTE - SKIP PAGE ', skip);
 
 
-  var query = { "id_project": req.projectid, "status": LeadConstants.NORMAL};
+  var query = {};
 
   if (req.query.full_text) {
     winston.debug('LEAD ROUTE req.query.fulltext', req.query.full_text);
@@ -440,6 +442,24 @@ router.get('/', function (req, res) {
     query["tags"] = req.query.tags;
   }
 
+  
+  if (req.query.segment) {
+    let segment = await Segment.findOne({id_project: req.projectid, _id: req.query.segment }).exec();
+    if (!segment) {
+      return res.status(404).send({ success: false, msg: 'Error segment not found' });
+    }
+    Segment2MongoConverter.convert(query, segment);
+  }
+
+
+
+  // last query modifier
+  query["id_project"] = req.projectid;
+  query["status"] = LeadConstants.NORMAL;
+
+  winston.debug("query", query);
+
+
   var direction = -1; //-1 descending , 1 ascending
   if (req.query.direction) {
     direction = req.query.direction;

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;