@tiledesk/tiledesk-server 2.13.51 → 2.13.52

package/CHANGELOG.md

@@ -5,8 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
-# 2.13.51
+# 2.14.1
 - Refactoring of route() and create() method on RequestService in order to improve performance for firt message
+- Fix bug: missing embedding apikey on add single content
+
+# 2.13.51 - aborted
+- Refactoring of route() and create() method on RequestService in order to improve performance for first message
 - Updated tests
 
 # 2.13.50

package/event/requestEvent.js

@@ -43,6 +43,7 @@ requestEvent.on('request.create.simple', function(request) {
 
             winston.debug('emitting request.create', requestComplete.toObject());
 
+            requestEvent.emit("request.snapshot.update", { request: request, snapshot: snapshot });
             requestEvent.emit('request.create', requestComplete);
 
             //with request.create no messages are sent. So don't load messages

package/models/analyticResult.js

@@ -3,6 +3,15 @@ var Schema = mongoose.Schema;
 // mongoose.set('debug', true);
 var winston = require('../config/winston');
 
+
+var databaseUri = process.env.DATABASE_URI || process.env.MONGODB_URI || config.database;
+
+var readPreference = process.env.ANALYTICS_READ_PREFERENCE ||  "primary";
+winston.info("Annalytics readPreference: " + readPreference);
+
+var conn      = mongoose.createConnection(databaseUri, { "autoIndex": true, readPreference: readPreference});	
+
+
 var AnalyticResultSchema = new Schema({
   // _id: {
   //   type: String,
@@ -14,7 +23,7 @@ var AnalyticResultSchema = new Schema({
   }}, { collection: 'requests' }
 );
 
-var analyticResult= mongoose.model('analyticResult', AnalyticResultSchema);
+var analyticResult= conn.model('analyticResult', AnalyticResultSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   analyticResult.syncIndexes();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.13.51",
+  "version": "2.13.52",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/emailNotification/requestNotification.js

@@ -229,7 +229,9 @@ listen() {
                 if (project_users && project_users.length>0) {
                   project_users.forEach(project_user => {
                     if (project_user.id_user && project_user.id_user.email) {
-                      return that.sendTranscriptByEmail(project_user.id_user.email, request_id, id_project, project);                              
+                      return that.sendTranscriptByEmail(project_user.id_user.email, request_id, id_project, project).catch((err) => {
+                        winston.error("(RequestNotification) sendTranscriptByEmail error for admin", err);
+                      });                              
                     } else {
                     }
                   });  
@@ -242,7 +244,9 @@ listen() {
               return Lead.findById(request.requester_id, function(err, lead){
                 //if (lead && lead.email) {
                   if (lead && lead.email) {
-                    return that.sendTranscriptByEmail(lead.email, request_id, id_project, project);
+                    return that.sendTranscriptByEmail(lead.email, request_id, id_project, project).catch((err) => {
+                      winston.error("(RequestNotification) sendTranscriptByEmail error for lead", err);
+                    });
                   }
                   
               });

package/pubmodules/messageActions/messageActionsInterceptor.js

@@ -156,7 +156,9 @@ class MessageActionsInterceptor {
                     
                     // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
                     const closed_by = message.sender;
-                    requestService.closeRequestByRequestId(request.request_id, request.id_project, false, true, closed_by );
+                    requestService.closeRequestByRequestId(request.request_id, request.id_project, false, true, closed_by ).catch((err) => {
+                      winston.error("(MessageActionsInterceptor) closeRequestByRequestId error", err);
+                    });
                 //   }, 1500);
 
                

package/pubmodules/queue/reconnect.js

@@ -413,7 +413,6 @@ function listen() {
     requestEvent.on('request.snapshot.update', function(data) {
       setImmediate(() => {
         winston.debug("reconnect request.snapshot.update")
-        console.log("reconnect request.snapshot.update")
         publish(exchange, "request_snapshot_update", Buffer.from(JSON.stringify(data)));
       });
     });

package/pubmodules/rules/conciergeBot.js

@@ -25,7 +25,9 @@ class ConciergeBot {
             winston.info(" ConciergeBot request create", request);
             if (request.status < 100 && request.department.id_bot) {
                 // addParticipantByRequestId(request_id, id_project, member) {
-                    requestService.addParticipantByRequestId(request.request_id, request.id_project, "bot_"+request.department.id_bot);
+                    requestService.addParticipantByRequestId(request.request_id, request.id_project, "bot_"+request.department.id_bot).catch((err) => {
+                      winston.error("(ConciergeBot) addParticipantByRequestId error", err);
+                    });
 devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente al primo messaggio non riceve il welcome iniziale
             }
         });

package/pubmodules/trigger/rulesTrigger.js

@@ -598,7 +598,9 @@ class RulesTrigger {
       
                   // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
                   const closed_by = "_trigger";
-                  requestService.closeRequestByRequestId(request_id, id_project, false, true, closed_by);
+                  requestService.closeRequestByRequestId(request_id, id_project, false, true, closed_by).catch((err) => {
+                    winston.error("(RulesTrigger) closeRequestByRequestId error", err);
+                  });
                                       
                 } catch(e) {
                   winston.error("Error runAction", e);
@@ -634,7 +636,9 @@ class RulesTrigger {
                     winston.debug('runAction action id_project: ' + id_project);
         
                     //   reopenRequestByRequestId(request_id, id_project) {
-                    requestService.reopenRequestByRequestId(request_id, id_project);                    
+                    requestService.reopenRequestByRequestId(request_id, id_project).catch((err) => {
+                      winston.error("(RulesTrigger) reopenRequestByRequestId error", err);
+                    });                    
           
                   } catch(e) {
                     winston.error("Error runAction", e);
@@ -674,7 +678,9 @@ class RulesTrigger {
                 winston.debug('runAction action id_project: ' + id_project);
     
                 //     addParticipantByRequestId(request_id, id_project, member) {
-                requestService.addParticipantByRequestId(request_id, id_project, member);
+                requestService.addParticipantByRequestId(request_id, id_project, member).catch((err) => {
+                  winston.error("(RulesTrigger) addParticipantByRequestId error", err);
+                });
         
                        
               } catch(e) {
@@ -845,7 +851,9 @@ class RulesTrigger {
                 winston.debug('runAction action id_project: ' + id_project);
     
                 // addTagByRequestId(request_id, id_project, tag) {
-                requestService.addTagByRequestId(request_id, id_project, {tag:tag});
+                requestService.addTagByRequestId(request_id, id_project, {tag:tag}).catch((err) => {
+                  winston.error("(RulesTrigger) addTagByRequestId error", err);
+                });
         
                        
               } catch(e) {

package/routes/kb.js

@@ -1387,7 +1387,7 @@ router.post('/', async (req, res) => {
     new_kb.refresh_rate = body.refresh_rate;
     if (!body.scrape_type || body.scrape_type === 2) {
       new_kb.scrape_type = 2;
-      new_kb.scrape_options = await aiManager.setDefaultScrapeOptions();
+      new_kb.scrape_options = aiManager.setDefaultScrapeOptions();
     } else {
       new_kb.scrape_type = body.scrape_type;
       new_kb.scrape_options = body.scrape_options;
@@ -1430,8 +1430,11 @@ router.post('/', async (req, res) => {
         json.parameters_scrape_type_4 = saved_kb.scrape_options;
       }
       json.engine = namespace.engine || default_engine;
-      json.embedding = namespace.embedding || default_embedding;
       json.hybrid = namespace.hybrid;
+      
+      let embedding = namespace.embedding || default_embedding;
+      embedding.api_key = process.env.EMBEDDING_API_KEY || process.env.GPTKEY;
+      json.embedding = embedding;
 
       let resources = [];
 
@@ -1441,7 +1444,7 @@ router.post('/', async (req, res) => {
         return res.status(200).send({ success: true, message: "Schedule scrape skipped in test environment", data: raw_content, schedule_json: json });
       }
         
-      aiManager.scheduleScrape(resources, ns.hybrid);
+      aiManager.scheduleScrape(resources, namespace.hybrid);
       return res.status(200).send(raw_content);
 
     }

package/routes/request.js

@@ -363,6 +363,9 @@ router.put('/:requestid/close', async function (req, res) {
   return requestService.closeRequestByRequestId(req.params.requestid, req.projectid, false, true, closed_by, req.body.force).then(function (closedRequest) {
     winston.verbose("request closed", closedRequest);
     return res.json(closedRequest);
+  }).catch(function(err) {
+    winston.error("Error closing request", err);
+    return res.status(500).send({ success: false, error: "Error closing request" });
   });
 
 });
@@ -376,6 +379,9 @@ router.put('/:requestid/reopen', function (req, res) {
     winston.verbose("request reopen", reopenRequest);
 
     return res.json(reopenRequest);
+  }).catch(function(err) {
+    winston.error("Error reopening request", err);
+    return res.status(500).send({ success: false, error: "Error reopening request" });
   });
 
 
@@ -407,6 +413,9 @@ router.post('/:requestid/participants',
       winston.verbose("participant added", updatedRequest);
 
       return res.json(updatedRequest);
+    }).catch(function(err) {
+      winston.error("Error adding participant", err);
+      return res.status(500).send({ success: false, error: "Error adding participant" });
     });
 
   });
@@ -433,6 +442,9 @@ router.put('/:requestid/participants', function (req, res) {
     winston.debug("participant set", updatedRequest);
 
     return res.json(updatedRequest);
+  }).catch(function(err) {
+    winston.error("Error setting participants", err);
+    return res.status(500).send({ success: false, error: "Error setting participants" });
   });
 
 });
@@ -907,6 +919,9 @@ router.post('/:requestid/followers',
       winston.verbose("participant added", updatedRequest);
 
       return res.json(updatedRequest);
+    }).catch(function(err) {
+      winston.error("Error adding follower", err);
+      return res.status(500).send({ success: false, error: "Error adding follower" });
     });
 
   });
@@ -927,6 +942,9 @@ router.put('/:requestid/followers', function (req, res) {
     winston.debug("followers set", updatedRequest);
 
     return res.json(updatedRequest);
+  }).catch(function(err) {
+    winston.error("Error setting followers", err);
+    return res.status(500).send({ success: false, error: "Error setting followers" });
   });
 
 });
@@ -1010,6 +1028,9 @@ router.delete('/:requestid/followers/:followerid', function (req, res) {
     winston.verbose("follower removed", updatedRequest);
 
     return res.json(updatedRequest);
+  }).catch(function(err) {
+    winston.error("Error removing follower", err);
+    return res.status(500).send({ success: false, error: "Error removing follower" });
   });
 
 

package/routes/user-request.js

@@ -70,6 +70,9 @@ router.put('/:requestid/closeg', function (req, res) {
 
         return res.json(closedRequest);
       
+  }).catch(function(err) {
+    winston.error("Error closing request", err);
+    return res.status(500).send({ success: false, error: "Error closing request" });
   });
 
 

package/services/requestService.js

@@ -669,19 +669,19 @@ class RequestService {
       }
       await q.exec();
 
-      requestEvent.emit("request.create.simple", savedRequest);
+      requestEvent.emit("request.create.simple", savedRequest, snapshot);
 
       if (isStandardConversation) {
         requestEvent.emit("request.create.quote", payload);
       }
 
       // Emit event to update snapshot in queue
-      if (Object.keys(snapshot).length > 0) {
-        requestEvent.emit("request.snapshot.update", {
-          request: savedRequest,
-          snapshot: snapshot
-        });
-      }
+      // if (Object.keys(snapshot).length > 0) {
+      //   requestEvent.emit("request.snapshot.update", {
+      //     request: savedRequest,
+      //     snapshot: snapshot
+      //   });
+      // }
 
       return savedRequest;