@tiledesk/tiledesk-server 2.9.6 → 2.9.8

package/CHANGELOG.md

@@ -5,6 +5,14 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.8
+- Added model contexts fro kb preview 
+- Update tybot-connector to 0.2.93
+
+# 2.9.7
+- Fix bug: draft conversation was shown in monitor
+- Update tybot-connector to 0.2.92
+
 # 2.9.6
 - Fix bug: wrong timzone in startTime and andTime in operating hours service
 

package/models/request.js

@@ -300,6 +300,11 @@ var RequestSchema = new Schema({
     type: String,
     required: true
   },
+  draft: {
+    type: Boolean,
+    required: false,
+    index: true
+  }
 
 }, {
   timestamps: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.6",
+  "version": "2.9.8",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -48,7 +48,7 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.11",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.86",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.93",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.72",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
     "@tiledesk/tiledesk-sms-connector": "^0.1.7",

package/routes/kb.js

@@ -42,7 +42,14 @@ let default_preview_settings = {
 }
 
 //let default_context = "Answer if and ONLY if the answer is contained in the context provided. If the answer is not contained in the context provided ALWAYS answer with <NOANS>\n{context}"
-let default_context = "You are an helpful assistant for question-answering tasks.\nUse ONLY the following pieces of retrieved context to answer the question.\nIf you don't know the answer, just say that you don't know.\nIf none of the retrieved context answer the question, add this word to the end <NOANS>\n\n{context}";
+//let default_context = "You are an helpful assistant for question-answering tasks.\nUse ONLY the following pieces of retrieved context to answer the question.\nIf you don't know the answer, just say that you don't know.\nIf none of the retrieved context answer the question, add this word to the end <NOANS>\n\n{context}";
+let contexts = {
+  "gpt-3.5-turbo":        "You are an helpful assistant for question-answering tasks.\nUse ONLY the pieces of retrieved context delimited by #### to answer the question.\nIf you don't know the answer, just say: \"I don't know<NOANS>\"\n\n####{context}####",
+  "gpt-4":                "You are an helpful assistant for question-answering tasks.\nUse ONLY the pieces of retrieved context delimited by #### to answer the question.\nIf you don't know the answer, just say that you don't know.\nIf and only if none of the retrieved context is useful for your task, add this word to the end <NOANS>\n\n####{context}####",
+  "gpt-4-turbo-preview":  "You are an helpful assistant for question-answering tasks.\nUse ONLY the pieces of retrieved context delimited by #### to answer the question.\nIf you don't know the answer, just say that you don't know.\nIf and only if none of the retrieved context is useful for your task, add this word to the end <NOANS>\n\n####{context}####",
+  "gpt-4o":               "You are an helpful assistant for question-answering tasks.\nUse ONLY the pieces of retrieved context delimited by #### to answer the question.\nIf you don't know the answer, just say that you don't know.\nIf the context does not contain sufficient information to generate an accurate and informative answer, return <NOANS>\n\n####{context}####",
+  "gpt-4o-mini":          "You are an helpful assistant for question-answering tasks.\nUse ONLY the pieces of retrieved context delimited by #### to answer the question.\nIf you don't know the answer, just say that you don't know.\nIf the context does not contain sufficient information to generate an accurate and informative answer, return <NOANS>\n\n####{context}####"
+}
 
 /**
 * ****************************************
@@ -219,9 +226,9 @@ router.post('/qa', async (req, res) => {
   // Check if "Advanced Mode" is active. In such case the default_context must be not appended
   if (!data.advanced_context) {
     if (data.system_context) {
-      data.system_context = data.system_context + " \n" + default_context;
+      data.system_context = data.system_context + " \n" + contexts[data.model];
     } else {
-      data.system_context = default_context;
+      data.system_context = contexts[data.model];
     }
   }
 

package/routes/request.js

@@ -902,7 +902,7 @@ router.get('/', function (req, res, next) {
   winston.debug('REQUEST ROUTE - SKIP PAGE ', skip);
 
 
-  var query = { "id_project": req.projectid, "status": { $lt: 1000 }, preflight: false };
+  var query = { "id_project": req.projectid, "status": { $lt: 1000 }, preflight: false, "draft": { $in: [false, null]} };
 
   var projectuser = req.projectuser;
 

package/services/requestService.js

@@ -707,6 +707,10 @@ class RequestService {
           createdAt: createdAt
         });
 
+        if (isTestConversation) {
+          newRequest.draft = true;
+        }
+
         winston.debug('newRequest.', newRequest);
 
 

package/test/requestRoute.js

@@ -22,6 +22,8 @@ var faqService = require('../services/faqService');
 
 // chai.config.includeStack = true;
 
+let log = false;
+
 var expect = chai.expect;
 var assert = chai.assert;
 
@@ -1160,6 +1162,70 @@ describe('RequestRoute', () => {
       });
     });
 
+    it('exludeDraftConversations', (done) => {
+
+      var email = "test-signup-" + Date.now() + "@email.com";
+      var pwd = "pwd";
+
+      userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+        projectService.createAndReturnProjectAndProjectUser("test-draft-conversation", savedUser._id).then((savedProjectAndPU) => {
+          let savedProject = savedProjectAndPU.project;
+          let savedPU = savedProjectAndPU.project_user;
+          leadService.createIfNotExists("Lead Fullname", "email@test.com", savedProject._id).then((createdLead) => {
+            let now = Date.now();
+            let request = {
+              request_id: "request_id-exludeDraftConversations-" + now, 
+              project_user_id: savedPU._id,
+              lead_id: createdLead._id,
+              id_project: savedProject._id,
+              first_text: "first_text",
+              lead: createdLead,
+              requester: savedPU,
+              attributes: { sourcePage: "https://widget-pre.tiledesk.com/v2/index.html?tiledesk_projectid=5ce3d1ceb25ad30017279999&td_draft=true" }
+            }
+
+            requestService.create(request).then(async (savedRequest) => {
+              
+              // Case 1 - request with source page that contains td_draft
+              expect(savedRequest.draft).to.equal(true);
+
+              // Case 2 - request without source page that contains td_draft
+              //expect(savedRequest.draft).to.be.undefined;
+
+              // get all requests -> should be 0
+
+              chai.request(server)
+                  .get('/' + savedProject._id + '/requests')
+                  .auth(email, pwd)
+                  .end((err, res) => {
+
+                    if (err) { console.error("err: ", err ) };
+                    if (log) { console.log("res.body: ", res.body) }
+
+                    res.should.have.status(200);
+                    res.body.should.be.a('object');
+                    res.body.requests.should.be.a('array');
+
+                    // Case 1 - request with source page that contains td_draft
+                    expect(res.body.requests.length).to.equal(0);
+
+                    // Case 2 - request without source page that contains td_draft
+                    //expect(res.body.requests.length).to.equal(1);
+
+                    done();
+                  })
+
+
+            }).catch((err) => {
+              console.error("error creating request: ", err)
+            })
+          })
+
+        })
+      })
+
+    })
+
     // it('assign', (done) => {