@tiledesk/tiledesk-server 2.13.22 → 2.13.24

package/CHANGELOG.md

@@ -5,6 +5,14 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.13.24
+- Code improvements
+
+# 2.13.23
+- Updated whatsapp-connector to 1.0.9
+- Updated messenger-connector to 0.1.28
+- Code improvements
+
 # 2.13.22
 - Updated whatsapp-connector to 1.0.9
 

package/config/labels/widget.json

@@ -96,7 +96,10 @@
             "SENT_AN_IMAGE": "sent an image",
     
             "LABEL_PREVIEW": "Preview",
-            "SWITCH_TO":"Or switch to:"
+            "SWITCH_TO":"Or switch to:",
+			"MAX_ATTACHMENT": "Max allowed size {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "The file exceeds the maximum allowed size",
+    		"EMOJI": "Emoji"
         }
     },
     {
@@ -196,7 +199,10 @@
             "SENT_AN_IMAGE":"ha inviato un'immagine",
             
             "LABEL_PREVIEW": "Anteprima",
-            "SWITCH_TO":"Oppure passa a:"
+            "SWITCH_TO":"Oppure passa a:",
+			"MAX_ATTACHMENT": "Dimensione massima consentita {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Il file supera la dimensione massima consentita",
+    		"EMOJI": "Emoji"
         }
     },
     {
@@ -296,7 +302,10 @@
             "SENT_AN_IMAGE": "envoyé une image",
 
             "LABEL_PREVIEW": "Aperçu",
-            "SWITCH_TO":"Ou passer à:"
+            "SWITCH_TO":"Ou passer à:",
+			"MAX_ATTACHMENT": "Taille maximale autorisée {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Le fichier dépasse la taille maximale autorisée",
+    		"EMOJI": "Emoji"
         }
      },
      {
@@ -396,7 +405,10 @@
             "SENT_AN_IMAGE": "envió una imagen",
 
             "LABEL_PREVIEW": "Avance",
-            "SWITCH_TO":"O cambiar a:"
+            "SWITCH_TO":"O cambiar a:",
+			"MAX_ATTACHMENT": "Tamaño máximo permitido {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "El archivo supera el tamaño máximo permitido",
+    		"EMOJI": "Emoji"
         }
     },
     {
@@ -496,7 +508,10 @@
             "SENT_AN_IMAGE": "ein Bild gesendet",
     
             "LABEL_PREVIEW": "Vorschau",
-            "SWITCH_TO":"Oder wechseln Sie zu:"
+            "SWITCH_TO":"Oder wechseln Sie zu:",
+			"MAX_ATTACHMENT": "Maximal zulässige Größe {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Die Datei überschreitet die maximal zulässige Größe",
+    		"EMOJI": "Emoji"
         }
     },
     {
@@ -596,7 +611,10 @@
             "SENT_AN_IMAGE": "enviou uma imagem",
     
             "LABEL_PREVIEW": "Visualizar",
-            "SWITCH_TO":"Ou mude para:"
+            "SWITCH_TO":"Ou mude para:",
+			"MAX_ATTACHMENT": "Tamanho máximo permitido {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "O arquivo excede o tamanho máximo permitido",
+    		"EMOJI": "Emoji"
         }
     },
     {
@@ -696,7 +714,10 @@
             "SENT_AN_IMAGE": "отправил изображение",
     
             "LABEL_PREVIEW": "Превью",
-            "SWITCH_TO":"Или переключитесь на:"
+            "SWITCH_TO":"Или переключитесь на:",
+			"MAX_ATTACHMENT": "Максимально допустимый размер {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Файл превышает максимально допустимый размер",
+    		"EMOJI": "Эмодзи"
         }
     },
     {
@@ -796,7 +817,10 @@
             "SENT_AN_IMAGE": "bir resim gönderdi",
     
             "LABEL_PREVIEW": "Ön izleme",
-            "SWITCH_TO":"Veya geçiş yapın:"
+            "SWITCH_TO":"Veya geçiş yapın:",
+			"MAX_ATTACHMENT": "İzin verilen maksimum boyut {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Dosya izin verilen maksimum boyutu aşıyor",
+    		"EMOJI": "Emoji"
         }
     },
 
@@ -898,7 +922,10 @@
             "SENT_AN_IMAGE":"послао имаге",
             
             "LABEL_PREVIEW": "Преглед",
-            "SWITCH_TO":"Или пређите на:"
+            "SWITCH_TO":"Или пређите на:",
+			"MAX_ATTACHMENT": "Максимално дозвољена величина {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Фајл прелази максимално дозвољену величину",
+    		"EMOJI": "Емоџи"
         }
      },
 
@@ -1000,7 +1027,10 @@
             "SENT_AN_IMAGE": "أرسل صورة",
             
             "LABEL_PREVIEW": "معاينة",
-            "SWITCH_TO": "أو قم بالتبديل إلى:"
+            "SWITCH_TO": "أو قم بالتبديل إلى:",
+			"MAX_ATTACHMENT": "الحد الأقصى للحجم المسموح به {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "الملف يتجاوز الحد الأقصى المسموح به",
+    		"EMOJI": "رموز تعبيرية"
         }
     },
 
@@ -1102,7 +1132,10 @@
             "SENT_AN_IMAGE": "надіслав зображення",
             
             "LABEL_PREVIEW": "Попередній перегляд",
-            "SWITCH_TO": "Або перейдіть на:"
+            "SWITCH_TO": "Або перейдіть на:",
+			"MAX_ATTACHMENT": "Максимально допустимий розмір {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Файл перевищує максимально допустимий розмір",
+    		"EMOJI": "Емодзі"
         }
     },
     {
@@ -1203,7 +1236,10 @@
             "SENT_AN_IMAGE": "skickade en bild",
             
             "LABEL_PREVIEW": "Förhandsvisning",
-            "SWITCH_TO": "Eller byt till:"
+            "SWITCH_TO": "Eller byt till:",
+			"MAX_ATTACHMENT": "Max tillåten storlek {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Filen överskrider den maximalt tillåtna storleken",
+    		"EMOJI": "Emoji"
         }
     },
     {
@@ -1304,7 +1340,10 @@
             "SENT_AN_IMAGE": "сурет жіберді",
             
             "LABEL_PREVIEW": "Алдын ала қарау",
-            "SWITCH_TO": "Немесе келесіге ауысыңыз:"
+            "SWITCH_TO": "Немесе келесіге ауысыңыз:",
+			"MAX_ATTACHMENT": "Максималды рұқсат етілген өлшем {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Файл максималды рұқсат етілген өлшемнен асады",
+    		"EMOJI": "Эмодзи"
         }
     },
     {
@@ -1404,8 +1443,11 @@
             "SENT_AN_ATTACHMENT": "ilova yubordi",
             "SENT_AN_IMAGE": "rasm yubordi",
             
-            "LABEL_PREVIEW": "Ko‘rib chiqish",
-            "SWITCH_TO": "Yoki o'tish:"
+            "LABEL_PREVIEW": "Ko'rib chiqish",
+            "SWITCH_TO": "Yoki o'tish:",
+			"MAX_ATTACHMENT": "Maksimal ruxsat etilgan o'lcham {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Fayl maksimal ruxsat etilgan o'lchamdan oshadi",
+    		"EMOJI": "Emoji"
         }
     },
     {
@@ -1506,7 +1548,10 @@
             "SENT_AN_IMAGE": "şəkil göndərdi",
             
             "LABEL_PREVIEW": "Önizləmə",
-            "SWITCH_TO": "Və ya keçin:"
+            "SWITCH_TO": "Və ya keçin:",
+			"MAX_ATTACHMENT": "Maksimal icazə verilən ölçü {{file_size_limit}}Mb",
+			"MAX_ATTACHMENT_ERROR": "Fayl maksimal icazə verilən ölçünü aşır",
+    		"EMOJI": "Emoji"
         }
     }
 ]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.13.22",
+  "version": "2.13.24",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,7 +44,7 @@
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
-    "@tiledesk/tiledesk-messenger-connector": "^0.1.27",
+    "@tiledesk/tiledesk-messenger-connector": "^0.1.28",
     "@tiledesk/tiledesk-multi-worker": "^0.3.3",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-sms-connector": "^0.1.11",
@@ -52,7 +52,7 @@
     "@tiledesk/tiledesk-tybot-connector": "^2.0.31",
     "@tiledesk/tiledesk-voice-twilio-connector": "^0.1.22",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.78",
-    "@tiledesk/tiledesk-whatsapp-connector": "1.0.9",
+    "@tiledesk/tiledesk-whatsapp-connector": "1.0.10",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.13",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/pubmodules/events/eventRoute.js

@@ -33,57 +33,17 @@ router.post('/', [
     return res.status(422).json({ errors: errors.array() });
   }
 
-   
     var pu = undefined;
     if (req.projectuser) { //if the bot creates the event -> pu is undefined
       pu = req.projectuser.id
     }   
-    
-
-
-    // // da qui
-    
-    // performance log
-    // console.log("************* emit event"+new Date().toISOString());
-
-    // // message.senderFullname,     message.recipient, 
-    //             // message.recipient_fullname, message.text, message.sender, attributes, message.type, message.metadata, timestamp, message.group
-    // var recipient = req.body.attributes.request_id;
-    // console.log("recipient",recipient);
-    // var sender = req.user.id;
-    // console.log("sender",sender);
-
-    // let message = {
-    //   recipient: recipient,
-    //   recipient_fullname: "pluto",
-    //   // sender:"bb0d809b-b093-419b-8b48-11a192cc3619",
-    //   sender: sender,
-    //   senderFullname: "Tiledesk",
-    //   text:"welcome",
-    //   group: {
-    //     members: {
-    //       // "bb0d809b-b093-419b-8b48-11a192cc3619": 1,
-    //       // sender: 1
-          
-    //     }
-    //   }
-    // };
-    // message.group.members[sender]= 1;
-    // console.log("message", message)
-
-    // messageEvent.emit("message.test", message);
-    // res.json({"event":"1"});
-
-    // //fino qui
-
- 
     // // emit(name, attributes, id_project, project_user, createdBy, status, user) {
     eventService.emit(req.body.name, req.body.attributes, req.projectid, pu, req.user.id, undefined, req.user).then(function(event) {
 
       res.json(event);
     }).catch(function(err) {
-      winston.error('Error saving the event '+ JSON.stringify(event), err)
-      return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
+      winston.error('Error saving the event', err);
+      return res.status(500).send({success: false, msg: 'Error saving the event', error: err.message });
     });
 
 });

package/routes/faq_kb.js

@@ -681,17 +681,29 @@ 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)
+  let savedChatbot
+  try {
+    savedChatbot = await cs.createBot(api_url, token, chatbot, landing_project_id);
+    winston.debug("savedChatbot: ", savedChatbot)
+  } catch(err) {
+    winston.error("Error creating new chatbot: ", err);
+    return res.status(500).send({ success: false, message: "An error occurred during chatbot creation"});
+  }
 
   if (!savedChatbot) {
     return res.status(500).send({ success: false, message: "Unable to create new chatbot" });
   }
+  
+  let import_result
+  try {
+    import_result = await cs.importFaqs(api_url, savedChatbot._id, token, chatbot, landing_project_id);
+    winston.debug("imported: ", import_result);
+  } catch(err) {
+    winston.error("Error importing intents on new chatbot: ", err);
+    return res.status(500).send({ success: false, message: "Error importing intents in the chatbot"});
+  }
 
-  let import_result = await cs.importFaqs(api_url, savedChatbot._id, token, chatbot, landing_project_id);
-  winston.debug("imported: ", import_result);
-
-  if (import_result.success == "false") {
+  if (import_result?.success == false) {
     return res.status(500).send({ success: false, message: "Unable to import intents in the new chatbot" });
   }
 

package/routes/kb.js

@@ -19,6 +19,7 @@ var parsecsv = require("fast-csv");
 
 const { MODELS_MULTIPLIER } = require('../utils/aiUtils');
 const { kbTypes } = require('../models/kbConstants');
+const integrationService = require('../services/integrationService');
 
 const AMQP_MANAGER_URL = process.env.AMQP_MANAGER_URL;
 const JOB_TOPIC_EXCHANGE = process.env.JOB_TOPIC_EXCHANGE_TRAIN || 'tiledesk-trainer';
@@ -269,6 +270,8 @@ router.post('/qa', async (req, res) => {
   let project_id = req.projectid;
   let publicKey = false;
   let data = req.body;
+  let ollama_integration;
+  let vllm_integration;
 
   let namespaces = await Namespace.find({ id_project: project_id }).catch((err) => {
     winston.error("find namespaces error: ", err)
@@ -288,16 +291,45 @@ router.post('/qa', async (req, res) => {
   
   winston.debug("/qa data: ", data);
 
-  if (!data.gptkey) {
-    let gptkey = await getKeyFromIntegrations(project_id);
-    if (!gptkey) {
-      gptkey = process.env.GPTKEY;
-      publicKey = true;
+  if (data.llm === 'ollama') {
+    data.gptkey = process.env.GPTKEY;
+    try {
+      ollama_integration = await integrationService.getIntegration(project_id, 'ollama');
+    } catch (err) {
+      let error_code = err.code || 500;
+      let error_message = err.error || `Unable to get integration for ${data.llm}`;
+      return res.status(error_code).send({ success: false, error: error_message });
     }
-    if (!gptkey) {
-      return res.status(403).send({ success: false, error: "GPT apikey undefined" })
+  }
+  else if (data.llm === 'vllm') {
+    data.gptkey = process.env.GPTKEY;
+    try {
+      vllm_integration = await integrationService.getIntegration(project_id, 'vllm')
+    } catch (err) {
+      let error_code = err.code || 500;
+      let error_message = err.error || `Unable to get integration for ${data.llm}`;
+      return res.status(error_code).send({ success: false, error: error_message });
+    }
+  } else {
+    try {
+      let key = await integrationService.getKeyFromIntegration(project_id, data.llm);
+
+      if (!key) {
+        if (data.llm === 'openai') {
+          data.gptkey = process.env.GPTKEY;
+          publicKey = true;
+        } else {
+          return res.status(404).send({ success: false, error: `Invalid or empty key provided for ${data.llm}` });
+        }
+      } else {
+        data.gptkey = key;
+      }
+
+    } catch (err) {
+      let error_code = err.code || 500;
+      let error_message = err.error || `Unable to get integration for ${data.llm}`;
+      return res.status(error_code).send({ success: false, error: error_message });
     }
-    data.gptkey = gptkey;
   }
 
   let obj = { createdAt: new Date() };
@@ -326,7 +358,30 @@ router.post('/qa', async (req, res) => {
     data.search_type = 'hybrid';
   }
 
-  
+  if (data.llm === 'ollama') {
+    if (!ollama_integration.value.url) {
+      return res.status(422).send({ success: false, error: "Server url for ollama is empty or invalid"})
+    }
+    data.model = {
+      name: data.model,
+      url: ollama_integration.value.url,
+      provider: 'ollama'
+    }
+    data.stream = false;
+  }
+
+  if (data.llm === 'vllm') {
+    if (!vllm_integration.value.url) {
+      return res.status(422).send({ success: false, error: "Server url for ollama is empty or invalid"})
+    }
+    data.model = {
+      name: data.model,
+      url: vllm_integration.value.url,
+      provider: 'ollama'
+    }
+    data.stream = false;
+  }
+
   delete data.advancedPrompt;
   winston.verbose("ask data: ", data);
   

package/routes/webhooks.js

@@ -80,8 +80,8 @@ router.post('/', async (req, res) => {
   webhook.save((err, savedWebhook) => {
     if (err) {
       if (err.code === 11000) {
-        winston.verbose("Webhook already exists for chatbot " + chatbot_id);
-        return res.status(403).send({ success: false, message: "Webhook already exists for chatbot " + chatbot_id });
+        winston.verbose("Webhook already exists for chatbot " + webhook.chatbot_id);
+        return res.status(403).send({ success: false, message: "Webhook already exists for chatbot " + webhook.chatbot_id });
       } 
       winston.error("Error saving new webhook ", err);
       return res.status(500).send({ success: false, error: err });

package/services/integrationService.js

@@ -0,0 +1,50 @@
+const winston = require('../config/winston');
+const integrations = require('../models/integrations');
+
+class IntegrationService {
+
+  
+
+    async getIntegration(id_project, integration_name) {
+        if (!id_project || !integration_name) {
+            throw({ code: 422, error: "Fields 'id_project', 'integration_name' are mandatory" });
+        }
+
+        try {
+            const integration = await integrations.findOne({ id_project: id_project, name: integration_name});
+            if (!integration && integration_name !== 'openai') {
+                throw({ code: 404, error: `Integration ${integration_name} not found for project ${id_project}` });
+            }
+
+            return integration;
+
+        } catch (err) {
+            winston.error("Erro getting integration: ", err);
+            throw({ code: err.code || 500, error: err.error || `Error getting integration for ${integration_name} for project ${id_project}` })
+        }
+    }
+
+    async getKeyFromIntegration(id_project, integration_name) {
+        if (!id_project || !integration_name) {
+            throw({ code: 422, error: "Fields 'id_project', 'integration_name' are mandatory" });
+        }
+
+        try {
+            const integration = await integrations.findOne({ id_project: id_project, name: integration_name});
+            if (!integration && integration_name !== 'openai') {
+                throw({ code: 404, error: `Integration ${integration_name} not found for project ${id_project}` });
+            }
+
+            return integration?.value?.apikey;
+
+        } catch (err) {
+            winston.error("Erro getting integration: ", err);
+            throw({ code: err.code || 500, error: err.error || `Error getting integration for ${integration_name} for project ${id_project}` })
+        }
+    }
+}
+
+const integrationService = new IntegrationService();
+
+module.exports = integrationService;
+