@tiledesk/tiledesk-server 2.10.55 → 2.10.57

package/.github/workflows/docker-community-profiler-latest.yml

@@ -0,0 +1,23 @@
+name: Docker Image Community Profiler latest CI
+
+on:	
+  push:	 
+    branches: [ master ]
+  pull_request:	
+    branches: [ master ]	
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2	     
+      name: Check out the repo
+    - uses: docker/build-push-action@v1
+      with:	    
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        repository: tiledesk/tiledesk-server
+        dockerfile: Dockerfile-profiler
+        tags: latest-profiler

package/CHANGELOG.md

@@ -5,7 +5,14 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
-# 2.10.55
+# 2.10.57
+- updated tybot-connector to 0.2.150
+- fix issue on reconnect to rabbit queue (kb indexing)
+- updated multi-worker to 0.1.19
+- fix issue on TILEBOT_ENDPOINT undefined
+- added endpoint for llm preview
+
+# 2.10.56
 - bug fix: wrong tilebot_endpoint declaration
 
 # 2.10.54

package/Dockerfile-profiler

@@ -0,0 +1,33 @@
+FROM node:16
+
+RUN sed -i 's/stable\/updates/stable-security\/updates/' /etc/apt/sources.list
+
+
+RUN apt-get update
+
+# Create app directory
+WORKDIR /usr/src/app
+
+ARG NPM_TOKEN
+
+RUN if [ "$NPM_TOKEN" ]; \
+    then RUN COPY .npmrc_ .npmrc \
+    else export SOMEVAR=world; \
+    fi
+
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY package*.json ./
+
+RUN npm install --production
+
+RUN rm -f .npmrc
+
+# Bundle app source
+COPY . .
+
+EXPOSE 3000
+
+CMD [ "node", "--prof", "./bin/www" ]

package/app.js

@@ -122,6 +122,7 @@ var key = require('./routes/key');
 var widgets = require('./routes/widget');
 var widgetsLoader = require('./routes/widgetLoader');
 var openai = require('./routes/openai');
+var llm = require('./routes/llm');
 var quotes = require('./routes/quotes');
 var integration = require('./routes/integration')
 var kbsettings = require('./routes/kbsettings');
@@ -600,7 +601,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/segments',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], segment);
 
-// app.use('/:projectid/openai', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent')], openai);
+app.use('/:projectid/llm', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('admin', ['bot','subscription'])], llm);
 app.use('/:projectid/openai', openai);
 app.use('/:projectid/quotes', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], quotes)
 
@@ -655,11 +656,17 @@ app.use((err, req, res, next) => {
 
   winston.debug("err.name", err.name)
   if (err.name === "IpDeniedError") {
-    winston.info("IpDeniedError");
+    winston.debug("IpDeniedError");
     return res.status(401).json({ err: "error ip filter" });
+  }
+
+  //emitted by multer when the file is too big
+  if (err.code === "LIMIT_FILE_SIZE") {
+    winston.debug("LIMIT_FILE_SIZE");
+    return res.status(413).json({ err: "Content Too Large", limit_file_size: process.env.MAX_UPLOAD_FILE_SIZE });
   } 
 
-  winston.error("General error", err);
+  winston.error("General error:: ", err);
   return res.status(500).json({ err: "error" });
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.55",
+  "version": "2.10.57",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -47,8 +47,8 @@
     "@tiledesk/tiledesk-messenger-connector": "^0.1.23",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.148",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.76",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.150",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.77",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.11",
     "@tiledesk/tiledesk-sms-connector": "^0.1.11",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.67",

package/pubmodules/tilebot/listener.js

@@ -5,7 +5,7 @@ var configGlobal = require('../../config/global');
 
 var port = process.env.PORT || '3000';
 
-const TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/ext/";;
+let TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/ext/";;
 if (process.env.TILEBOT_ENDPOINT) {
     TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT + "/ext/"
 }

package/pubmodules/trigger/rulesTrigger.js

@@ -33,7 +33,7 @@ const uuidv4 = require('uuid/v4');
 var jwt = require('jsonwebtoken');
 
 const port = process.env.PORT || '3000';
-const TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/ext/";;
+let TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/ext/";;
 if (process.env.TILEBOT_ENDPOINT) {
     TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT + "/ext/"
 }

package/routes/faq.js

@@ -3,7 +3,6 @@ var router = express.Router();
 var Faq = require("../models/faq");
 var Faq_kb = require("../models/faq_kb");
 var multer = require('multer')
-var upload = multer()
 const faqBotEvent = require('../event/faqBotEvent');
 var winston = require('../config/winston');
 const faqEvent = require('../event/faqBotEvent')
@@ -20,6 +19,19 @@ const roleChecker = require('../middleware/has-role');
 
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
+
+let MAX_UPLOAD_FILE_SIZE = process.env.MAX_UPLOAD_FILE_SIZE;
+let uploadlimits = undefined;
+
+if (MAX_UPLOAD_FILE_SIZE) {
+  uploadlimits = {fileSize: parseInt(MAX_UPLOAD_FILE_SIZE)} ;
+  winston.debug("Max upload file size is : " + MAX_UPLOAD_FILE_SIZE);
+} else {
+  winston.debug("Max upload file size is infinity");
+}
+var upload = multer({limits: uploadlimits});
+
+
 // POST CSV FILE UPLOAD FROM CLIENT
 router.post('/uploadcsv', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscription']), upload.single('uploadFile'), function (req, res, next) {
   winston.debug(' -> -> REQ BODY ', req.body);

package/routes/faq_kb.js

@@ -10,7 +10,6 @@ var winston = require('../config/winston');
 var httpUtil = require("../utils/httpUtil");
 const { forEach } = require('lodash');
 var multer = require('multer')
-var upload = multer()
 var configGlobal = require('../config/global');
 const faq = require('../models/faq');
 var jwt = require('jsonwebtoken');
@@ -22,6 +21,19 @@ const errorCodes = require('../errorCodes');
 
 let chatbot_templates_api_url = process.env.CHATBOT_TEMPLATES_API_URL
 
+
+let MAX_UPLOAD_FILE_SIZE = process.env.MAX_UPLOAD_FILE_SIZE;
+let uploadlimits = undefined;
+
+if (MAX_UPLOAD_FILE_SIZE) {
+  uploadlimits = {fileSize: parseInt(MAX_UPLOAD_FILE_SIZE)} ;
+  winston.debug("Max upload file size is : " + MAX_UPLOAD_FILE_SIZE);
+} else {
+  winston.debug("Max upload file size is infinity");
+}
+var upload = multer({limits: uploadlimits});
+
+
 router.post('/', roleChecker.hasRole('admin'), async function (req, res) {
   winston.debug('create BOT ', req.body);
 
@@ -250,7 +262,7 @@ router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res)
     botEvent.emit('faqbot.update', updatedForkedChabot);
 
     const port = process.env.PORT || '3000';
-    const TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/ext/";;
+    let TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/ext/";;
     if (process.env.TILEBOT_ENDPOINT) {
       TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT + "/ext/"
     }

package/routes/files.js

@@ -19,8 +19,16 @@ const fileService = new FileGridFsService("files");
 
 
 
-
-const upload = multer({ storage: fileService.getStorage("files") });
+let MAX_UPLOAD_FILE_SIZE = process.env.MAX_UPLOAD_FILE_SIZE;
+let uploadlimits = undefined;
+
+if (MAX_UPLOAD_FILE_SIZE) {
+  uploadlimits = {fileSize: parseInt(MAX_UPLOAD_FILE_SIZE)} ;
+  winston.info("Max upload file size is : " + MAX_UPLOAD_FILE_SIZE);
+} else {
+  winston.info("Max upload file size is infinity");
+}
+const upload = multer({ storage: fileService.getStorage("files"),limits: uploadlimits});
 
 /*
 curl -u andrea.leo@f21.it:123456 \

package/routes/images.js

@@ -35,6 +35,18 @@ const fileFilter = (req, file, cb) => {
   }
 }
 
+
+let MAX_UPLOAD_FILE_SIZE = process.env.MAX_UPLOAD_FILE_SIZE;
+let uploadlimits = undefined;
+
+if (MAX_UPLOAD_FILE_SIZE) {
+  uploadlimits = {fileSize: parseInt(MAX_UPLOAD_FILE_SIZE)} ;
+  winston.debug("Max upload file size is : " + MAX_UPLOAD_FILE_SIZE);
+} else {
+  winston.debug("Max upload file size is infinity");
+}
+
+
 // const bodymiddleware = function(req, res, next) {
 //   winston.info("YYYYYY req.body.folder:"+req.body.folder);
 //   winston.info("YYYYYY req.body:",req.body);
@@ -42,7 +54,7 @@ const fileFilter = (req, file, cb) => {
 // }
 
 
-const upload = multer({ storage: fileService.getStorage("images"), fileFilter: fileFilter });
+const upload = multer({ storage: fileService.getStorage("images"), fileFilter: fileFilter, limits: uploadlimits });
 
 /*
 curl -u andrea.leo@f21.it:123456 \
@@ -96,7 +108,7 @@ upload.single('file'), (req, res, next) => {
 
 
 
-const uploadFixedFolder = multer({ storage: fileService.getStorageFixFolder("images"), fileFilter: fileFilter });
+const uploadFixedFolder = multer({ storage: fileService.getStorageFixFolder("images"), fileFilter: fileFilter, limits: uploadlimits });
 
 /*
 curl -v -X PUT -u andrea.leo@f21.it:123456 \
@@ -158,7 +170,7 @@ uploadFixedFolder.single('file'), (req, res, next) => {
 
 
 
-const uploadAvatar= multer({ storage: fileService.getStorageAvatar("images"), fileFilter: fileFilter });
+const uploadAvatar= multer({ storage: fileService.getStorageAvatar("images"), fileFilter: fileFilter, limits: uploadlimits });
 
 /*
 curl -v -X PUT -u andrea.leo@f21.it:123456 \

package/routes/kb.js

@@ -24,6 +24,19 @@ const JOB_TOPIC_EXCHANGE = process.env.JOB_TOPIC_EXCHANGE_TRAIN || 'tiledesk-tra
 const KB_WEBHOOK_TOKEN = process.env.KB_WEBHOOK_TOKEN || 'kbcustomtoken';
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
+
+let MAX_UPLOAD_FILE_SIZE = process.env.MAX_UPLOAD_FILE_SIZE;
+let uploadlimits = undefined;
+
+if (MAX_UPLOAD_FILE_SIZE) {
+  uploadlimits = {fileSize: parseInt(MAX_UPLOAD_FILE_SIZE)} ;
+  winston.debug("Max upload file size is : " + MAX_UPLOAD_FILE_SIZE);
+} else {
+  winston.debug("Max upload file size is infinity");
+}
+var upload = multer({limits: uploadlimits});
+
+
 let jobManager = new JobManager(AMQP_MANAGER_URL, {
   debug: false,
   topic: JOB_TOPIC_EXCHANGE,

package/routes/llm.js

@@ -0,0 +1,61 @@
+var express = require('express');
+var router = express.Router();
+var winston = require('../config/winston');
+let Integration = require('../models/integrations');
+const aiService = require('../services/aiService');
+
+router.post('/preview', async (req, res) => {
+
+    let id_project = req.projectid;
+    let body = req.body;
+    let key;
+
+    if (!body.llm) {
+        return res.status(400).send({ success: false, error: "Missing required parameter 'llm'" });
+    }
+
+    let integration = await Integration.findOne({ id_project: id_project, name: body.llm }).catch((err) => {
+        winston.error("Error finding integration with name: ", body.llm);
+        return res.status(500).send({ success: false, error: "Error finding integration for " + body.llm});
+    })
+
+    if (!integration) {
+        winston.verbose("Integration for " + body.llm + " not found.")
+        return res.status(404).send({ success: false, error: "Integration for " + body.llm + " not found."})
+    }
+
+    if (!integration?.value?.apikey) {
+        return res.status(422).send({ success: false, error: "The key provided for " + body.llm + " is not valid or undefined." })
+    }
+
+    key = integration.value.apikey;
+
+    let json = {
+        question: body.question,
+        llm: body.llm,
+        model: body.model,
+        llm_key: key,
+        temperature: body.temperature,
+        max_tokens: body.max_tokens
+    }
+
+    if (body.context) {
+        json.system_context = body.context;
+    }
+
+    aiService.askllm(json).then((response) => {
+        winston.verbose("Askllm response: ", response);
+        res.status(200).send(response.data)
+    }).catch((err) => {
+        if (err.response?.data?.detail[0]) {
+            res.status(400).send({ success: false, error: err.response.data.detail[0]?.msg, detail: err.response.data.detail });
+        } else if (err.response?.data?.detail?.answer) {
+            res.status(400).send({ success: false, error: err.response.data.detail.answer, detail: err.response.data.detail });
+        } else {
+            res.status(500).send({ success: false, error: err.response.data });
+        }
+    })
+
+})
+
+module.exports = router;

package/routes/message.js

@@ -247,12 +247,6 @@ async (req, res)  => {
                     });
                 }).catch(function (err) {    //pubblica questo
                   winston.error('Error creating request: ' + JSON.stringify(err));
-                  winston.log({
-                    level: 'error',
-                    message: 'Error creating request: ' + JSON.stringify(err) + " " + JSON.stringify(req.body),
-                    label: req.projectid
-                  });
-                  // winston.error("Error creating message", err);
                   return res.status(500).send({ success: false, msg: 'Error creating request', err: err });
                 });
 

package/services/aiService.js

@@ -36,8 +36,29 @@ class AiService {
 
   }
 
+  // LLM
+  askllm(data) {
+    winston.debug("[OPENAI SERVICE] llm endpoint: " + kb_endpoint);
 
-  // PUGLIA AI
+    return new Promise((resolve, reject) => {
+
+      axios({
+        url: kb_endpoint + "/ask",
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        data: data,
+        method: 'POST'
+      }).then((resbody) => {
+        resolve(resbody)
+      }).catch((err) => {
+        reject(err)
+      })
+    })
+  }
+
+
+  // KB
   checkStatus(data) {
     winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
 

package/services/requestService.js

@@ -21,7 +21,7 @@ const projectService = require('./projectService');
 const axios = require("axios").default;
 
 let port = process.env.PORT || '3000';
-const TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/ext/";;
+let TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/ext/";;
 if (process.env.TILEBOT_ENDPOINT) {
     TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT + "/ext/"
 }

package/websocket/webSocketServer.js

@@ -93,7 +93,7 @@ class WebSocketServer {
           token = token.replace('JWT ', '');
           jwt.verify(token, configSecretOrPubicKay, function (err, decoded) {  //pub_jwt pp_jwt
             if (err) {
-              winston.error('WebSocket error verifing websocket jwt token ', err);
+              winston.error('WebSocket error verifing websocket jwt token: ' + token, err);
               return cb(false, 401, 'Unauthorized');
             } else {
               // uncomment it