@tiledesk/tiledesk-server 2.10.101 → 2.10.103

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.103
+- Update: standard/hybrid namespace management
+
+# 2.10.102
+- Update: substituted encode with DOMPurify.sanitize for direct email
+
 # 2.10.101
 - Update: messenger-connector to 0.1.27
 - Update: multi-worker to 0.3.3

package/models/kb_setting.js

@@ -49,6 +49,10 @@ var NamespaceSchema = new Schema({
     type: Boolean,
     default: false
   },
+  hybrid: {
+    type: Boolean,
+    default: false
+  },
   engine: {
     type: EngineSchema,
     required: false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.101",
+  "version": "2.10.103",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -45,16 +45,15 @@
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-messenger-connector": "^0.1.27",
+    "@tiledesk/tiledesk-multi-worker": "^0.3.3",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
+    "@tiledesk/tiledesk-sms-connector": "^0.1.11",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
     "@tiledesk/tiledesk-tybot-connector": "^2.0.19",
+    "@tiledesk/tiledesk-voice-twilio-connector": "^0.1.22",
+    "@tiledesk/tiledesk-vxml-connector": "^0.1.76",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.84",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.12",
-    "@tiledesk/tiledesk-sms-connector": "^0.1.11",
-    "@tiledesk/tiledesk-vxml-connector": "^0.1.76",
-    "@tiledesk/tiledesk-voice-twilio-connector": "^0.1.22",
-    "@tiledesk/tiledesk-multi-worker": "^0.3.3",
-    "passport-oauth2": "^1.8.0",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
@@ -65,6 +64,7 @@
     "cors": "^2.8.5",
     "csv-express": "^1.2.2",
     "debug": "^4.3.4",
+    "dompurify": "^3.2.6",
     "dotenv": "^8.6.0",
     "email-templates": "^8.1.0",
     "eventemitter2": "^6.4.4",
@@ -82,6 +82,7 @@
     "immutable": "^4.1.0",
     "jade": "~1.11.0",
     "jobs-worker-queued": "^0.0.5",
+    "jsdom": "^26.1.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "marked": "^3.0.4",
@@ -104,6 +105,7 @@
     "passport-google-oidc": "^0.1.0",
     "passport-http": "^0.3.0",
     "passport-jwt": "^4.0.0",
+    "passport-oauth2": "^1.8.0",
     "pdfmake": "^0.2.5",
     "promise-events": "^0.2.4",
     "request": "^2.88.2",

package/routes/kb.js

@@ -22,6 +22,7 @@ const { kbTypes } = require('../models/kbConstants');
 
 const AMQP_MANAGER_URL = process.env.AMQP_MANAGER_URL;
 const JOB_TOPIC_EXCHANGE = process.env.JOB_TOPIC_EXCHANGE_TRAIN || 'tiledesk-trainer';
+const JOB_TOPIC_EXCHANGE_HYBRID = process.env.JOB_TOPIC_EXCHANGE_TRAIN_HYBRID || 'tiledesk-trainer-hybrid';
 const KB_WEBHOOK_TOKEN = process.env.KB_WEBHOOK_TOKEN || 'kbcustomtoken';
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
@@ -52,6 +53,21 @@ jobManager.connectAndStartPublisher((status, error) => {
   }
 })
 
+let jobManagerHybrid = new JobManager(AMQP_MANAGER_URL, {
+  debug: false,
+  topic: JOB_TOPIC_EXCHANGE_HYBRID,
+  exchange: JOB_TOPIC_EXCHANGE_HYBRID
+})
+
+jobManagerHybrid.connectAndStartPublisher((status, error) => {
+  if (error) {
+    winston.error("connectAndStartPublisher error: ", error);
+  } else {
+    winston.info("KbRoute - ConnectPublisher done with status: ", status);
+  }
+})
+
+
 let default_preview_settings = {
   model: 'gpt-4o',
   max_tokens: 256,
@@ -63,11 +79,18 @@ let default_preview_settings = {
 }
 let default_engine = {
   name: "pinecone",
-  type: process.env.PINECONE_TYPE,
+  type: process.env.PINECONE_TYPE || "pod",
   apikey: "",
   vector_size: 1536,
   index_name: process.env.PINECONE_INDEX
 }
+let default_engine_hybrid = {
+  name: "pinecone",
+  type: process.env.PINECONE_TYPE_HYBRID || "serverless",
+  apikey: "",
+  vector_size: 1536,
+  index_name: process.env.PINECONE_INDEX_HYBRID
+}
 
 //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}";
@@ -149,7 +172,7 @@ router.post('/scrape/single', async (req, res) => {
       let ns = namespaces.find(n => n.id === kb.namespace);
       json.engine = ns.engine || default_engine;
 
-      if (json.engine.type === 'serverless') {
+      if (ns.hybrid === true) {
         json.hybrid = true;
       }
 
@@ -298,6 +321,7 @@ router.post('/qa', async (req, res) => {
 
   let ns = namespaces.find(n => n.id === data.namespace);
   data.engine = ns.engine || default_engine;
+  data.hybrid = ns.hybrid;
 
   if (data.engine.type === 'serverless') {
     data.search_type = 'hybrid';
@@ -638,13 +662,32 @@ router.post('/namespace', async (req, res) => {
   let body = req.body;
   winston.debug("add namespace body: ", body);
 
+  let engine = default_engine;
+
+  let hybrid = false;
+  if ('hybrid' in req.body) {
+    if (typeof req.body.hybrid !== 'boolean') {
+      return res.status(400).send({ success: false, error: "Value not accepted for 'hybrid' field. Expected boolean." });
+    }
+    hybrid = req.body.hybrid;
+  }
+
+  if (hybrid) {
+    if (req.project?.profile?.customization?.hybrid) {
+      engine = default_engine_hybrid;
+    } else {
+      return res.status(403).send({ success: false, error: "Hybrid mode is not allowed for the current project" });
+    }
+  }
+
   var namespace_id = mongoose.Types.ObjectId();
   let new_namespace = new Namespace({
     id_project: project_id,
     id: namespace_id,
     name: body.name,
+    hybrid: hybrid,
     preview_settings: default_preview_settings,
-    engine: default_engine
+    engine: engine
   })
 
   let namespaces = await Namespace.find({ id_project: project_id }).catch((err) => {
@@ -779,6 +822,7 @@ router.post('/namespace/import/:id', upload.single('uploadFile'), async (req, re
   //          import operation the content's limit is respected
   let ns = namespaces.find(n => n.id === namespace_id);
   let engine = ns.engine || default_engine;
+  let hybrid = ns.hybrid;
 
   if (process.env.NODE_ENV !== "test") {
     await aiService.deleteNamespace({
@@ -818,7 +862,7 @@ router.post('/namespace/import/:id', upload.single('uploadFile'), async (req, re
   winston.verbose("resources to be sent to worker: ", resources);
 
   if (process.env.NODE_ENV !== "test") {
-    scheduleScrape(resources);
+    scheduleScrape(resources, hybrid);
   }
 
   res.status(200).send({ success: true, message: "Contents imported successfully" });
@@ -1217,16 +1261,14 @@ router.post('/', async (req, res) => {
       }
       let ns = namespaces.find(n => n.id === body.namespace);
       json.engine = ns.engine || default_engine;
-
-      if (json.engine.type === 'serverless') {
-        json.hybrid = true;
-      }
-
+      json.hybrid = ns.hybrid;
+      
       let resources = [];
 
       resources.push(json);
+      
       if (process.env.NODE_ENV !== 'test') {
-        scheduleScrape(resources);
+        scheduleScrape(resources, ns.hybrid);
       }
 
     }
@@ -1345,11 +1387,7 @@ router.post('/multi', upload.single('uploadFile'), async (req, res) => {
 
     let ns = namespaces.find(n => n.id === namespace_id);
     let engine = ns.engine || default_engine;
-
-    let hybrid;
-    if (engine.type === 'serverless') {
-      hybrid = true;
-    }
+    let hybrid = ns.hybrid;
 
     let resources = result.map(({ name, status, __v, createdAt, updatedAt, id_project, ...keepAttrs }) => keepAttrs)
     resources = resources.map(({ _id, scrape_options, ...rest }) => {
@@ -1358,7 +1396,7 @@ router.post('/multi', upload.single('uploadFile'), async (req, res) => {
     winston.verbose("resources to be sent to worker: ", resources);
 
     if (process.env.NODE_ENV !== 'test') {
-      scheduleScrape(resources);
+      scheduleScrape(resources, hybrid);
     }
     res.status(200).send(result);
 
@@ -1460,6 +1498,7 @@ router.post('/csv', upload.single('uploadFile'), async (req, res) => {
 
         let ns = namespaces.find(n => n.id === namespace_id);
         let engine = ns.engine || default_engine;
+        let hybrid = ns.hybrid;
 
         let resources = result.map(({ name, status, __v, createdAt, updatedAt, id_project,  ...keepAttrs }) => keepAttrs)
         resources = resources.map(({ _id, ...rest}) => {
@@ -1467,7 +1506,7 @@ router.post('/csv', upload.single('uploadFile'), async (req, res) => {
         })
         winston.verbose("resources to be sent to worker: ", resources);
         if (process.env.NODE_ENV !== 'test') {
-          scheduleScrape(resources);
+          scheduleScrape(resources, hybrid);
         }
         res.status(200).send(result);
       }).catch((err) => {
@@ -1685,9 +1724,19 @@ async function updateStatus(id, status) {
   })
 }
 
-async function scheduleScrape(resources) {
+async function scheduleScrape(resources, hybrid) {
 
-  let scheduler = new Scheduler({ jobManager: jobManager });
+  let scheduler;
+  if (hybrid) {
+    scheduler = new Scheduler({ jobManager: jobManagerHybrid });
+  } else {
+    scheduler = new Scheduler({ jobManager: jobManager });
+  }
+
+  if (!scheduler) {
+    winston.error("ScheduleScrape JobManager is not defined");
+    return false;
+  }
 
   resources.forEach(r => {
     winston.debug("Schedule job with following data: ", r);

package/routes/unanswered.js

@@ -244,7 +244,7 @@ async function validateNamespace(id_project, namespace_id) {
     try {
         const namespace = await Namespace.findOne({ 
             id_project: id_project,
-            namespace: namespace_id 
+            id: namespace_id 
         });
         return !!namespace; // return true if namespace exists, false otherwise
     } catch (err) {

package/services/aiService.js

@@ -5,9 +5,10 @@ const jwt = require("jsonwebtoken")
 const FormData = require('form-data');
 
 let openai_endpoint = process.env.OPENAI_ENDPOINT;
-let kb_endpoint = process.env.KB_ENDPOINT;
 let kb_endpoint_train = process.env.KB_ENDPOINT_TRAIN;
 let kb_endpoint_qa = process.env.KB_ENDPOINT_QA;
+let kb_endpoint_train_gpu = process.env.KB_ENDPOINT_TRAIN_GPU;
+let kb_endpoint_qa_gpu = process.env.KB_ENDPOINT_QA_GPU;
 let secret = process.env.JWT_SECRET_KEY;
 
 class AiService {
@@ -85,79 +86,83 @@ class AiService {
     })
   }
 
+  // KB - Deprecated?
+  // checkStatus(data) {
+  //   winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
+
+  //   return new Promise((resolve, reject) => {
+
+  //     axios({
+  //       url: kb_endpoint + "/scrape/status",
+  //       headers: {
+  //         'Content-Type': 'application/json'
+  //       },
+  //       data: data,
+  //       method: 'POST'
+  //     }).then((resbody) => {
+  //       resolve(resbody);
+  //     }).catch((err) => {
+  //       reject(err);
+  //     })
+
+  //   })
+  // }
+
+  // Deprecated? 
+  // startScrape(data) {
+  //   winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
+
+  //   return new Promise((resolve, reject) => {
+
+  //     axios({
+  //       url: kb_endpoint + "/scrape",
+  //       headers: {
+  //         'Content-Type': 'application/json'
+  //       },
+  //       data: data,
+  //       method: 'POST'
+  //     }).then((resbody) => {
+  //       resolve(resbody);
+  //     }).catch((err) => {
+  //       reject(err);
+  //     })
+
+  //   })
+  // }
+
+  // Deprecated?  
+  // ask(data) {
+  //   winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
+
+  //   return new Promise((resolve, reject) => {
+
+  //     axios({
+  //       url: kb_endpoint + "/qa",
+  //       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);
-
-    return new Promise((resolve, reject) => {
-
-      axios({
-        url: kb_endpoint + "/scrape/status",
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        data: data,
-        method: 'POST'
-      }).then((resbody) => {
-        resolve(resbody);
-      }).catch((err) => {
-        reject(err);
-      })
-
-    })
-  }
-
-  startScrape(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
-
-    return new Promise((resolve, reject) => {
-
-      axios({
-        url: kb_endpoint + "/scrape",
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        data: data,
-        method: 'POST'
-      }).then((resbody) => {
-        resolve(resbody);
-      }).catch((err) => {
-        reject(err);
-      })
-
-    })
-  }
-
-  ask(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
-
-    return new Promise((resolve, reject) => {
-
-      axios({
-        url: kb_endpoint + "/qa",
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        data: data,
-        method: 'POST'
-      }).then((resbody) => {
-        resolve(resbody);
-      }).catch((err) => {
-        reject(err);
-      })
-
-    })
-  }
-
-  // PUGLIA AI V2
   singleScrape(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
+    let base_url = kb_endpoint_train;
+    if (data.hybrid) {
+      base_url = kb_endpoint_train_gpu;
+    }
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + base_url);
 
     return new Promise((resolve, reject) => {
 
       axios({
-        url: kb_endpoint_train + "/scrape/single",
+        url: base_url + "/scrape/single",
         headers: {
           'Content-Type': 'application/json'
         },
@@ -173,12 +178,13 @@ class AiService {
   }
 
   scrapeStatus(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
+    let base_url = kb_endpoint_train;
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + base_url);
 
     return new Promise((resolve, reject) => {
 
       axios({
-        url: kb_endpoint_train + "/scrape/status",
+        url: base_url + "/scrape/status",
         headers: {
           'Content-Type': 'application/json'
         },
@@ -193,12 +199,16 @@ class AiService {
   }
 
   askNamespace(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_qa);
+    let base_url = kb_endpoint_qa;
+    if (data.hybrid) {
+      base_url = kb_endpoint_qa_gpu;
+    }
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + base_url);
 
     return new Promise((resolve, reject) => {
 
       axios({
-        url: kb_endpoint_qa + "/qa",
+        url: base_url + "/qa",
         headers: {
           'Content-Type': 'application/json'
         },
@@ -213,15 +223,16 @@ class AiService {
     })
   }
 
-  getContentChunks(namespace_id, content_id, engine) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
+  getContentChunks(namespace_id, content_id, engine, hybrid) {
+    let base_url = kb_endpoint_train;
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + base_url);
 
     return new Promise((resolve, reject) => {
 
       let payload = { engine: engine };
       let token = jwt.sign(payload, secret);
       axios({
-        url: kb_endpoint_train + "/id/" + content_id + "/namespace/" + namespace_id + "/" + token,
+        url: base_url + "/id/" + content_id + "/namespace/" + namespace_id + "/" + token,
         headers: {
           'Content-Type': 'application/json'
         },
@@ -235,12 +246,13 @@ class AiService {
   }
 
   deleteIndex(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
+    let base_url = kb_endpoint_train;
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + base_url);
 
     return new Promise((resolve, reject) => {
 
       axios({
-        url: kb_endpoint_train + "/delete/id",
+        url: base_url + "/delete/id",
         headers: {
           'Content-Type': 'application/json'
         },
@@ -255,12 +267,13 @@ class AiService {
   }
 
   deleteNamespace(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
+    let base_url = kb_endpoint_train;
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + base_url);
 
     return new Promise((resolve, reject) => {
 
       axios({
-        url: kb_endpoint_train + "/delete/namespace",
+        url: base_url + "/delete/namespace",
         headers: {
           'Content-Type': 'application/json'
         },

package/services/emailService.js

@@ -9,6 +9,11 @@ var handlebars = require('handlebars');
 var encode = require('html-entities').encode;
 const emailEvent = require('../event/emailEvent');
 
+const createDOMPurify = require('dompurify');
+const { JSDOM } = require('jsdom');
+const window = new JSDOM('').window;
+const DOMPurify = createDOMPurify(window);
+
 handlebars.registerHelper('ifEquals', function (arg1, arg2, options) {
   return (arg1 == arg2) ? options.fn(this) : options.inverse(this);
 });
@@ -1476,13 +1481,15 @@ class EmailService {
     var baseScope = JSON.parse(JSON.stringify(that));
     delete baseScope.pass;
 
-
     let msgText = text;
-    msgText = encode(msgText);
     if (this.markdown) {
       msgText = marked(msgText);
+      msgText = DOMPurify.sanitize(msgText);
+    } else {
+      msgText = encode(msgText);
     }
 
+
     winston.debug("msgText: " + msgText);
     winston.debug("baseScope: " + JSON.stringify(baseScope));
 

package/test/emailService.js

@@ -0,0 +1,43 @@
+//During the test the env variable is set to test
+process.env.NODE_ENV = 'test';
+
+var expect = require('chai').expect;
+
+var assert = require('chai').assert;
+var config = require('../config/database');
+var mongoose = require('mongoose');
+var winston = require('../config/winston');
+
+mongoose.connect(config.databasetest);
+
+var projectService = require("../services/projectService");
+const emailService = require('../services/emailService');
+
+let log = false;
+
+describe('EmailService', function () {
+
+
+  it('direct', function (done) {
+    var userid = "5badfe5d553d1844ad654072";
+    projectService.create("test1", userid).then(function (savedProject) {
+      // create(fullname, email, id_project, createdBy)
+
+      let request_id = "support-group-" + savedProject._id + "-123456";
+
+      //let text = "this is\n<b>the</b>\ntext";
+      //let text = 'this is <script>alert("XSS")</script>';
+      let text = 'Go to [Google](https://google.com)';
+      emailService.sendEmailDirect("my@email.com", text, savedProject._id, request_id, "Suubject").then((response) => {
+        console.log("response: ", response);
+        done();
+      }).catch((err) => {
+        console.error("err: ", err)
+        done();
+      })
+
+      
+    });
+  });
+
+});

package/test/kbRoute.js

@@ -3,13 +3,11 @@ process.env.NODE_ENV = 'test';
 process.env.GPTKEY = "fakegptkey";
 process.env.LOG_LEVEL = 'critical'
 process.env.KB_WEBHOOK_TOKEN = "testtoken"
-// Similarity
-// process.env.PINECONE_INDEX = "test_index"
-// process.env.PINECONE_TYPE = "pod"
-// Hybrid
-process.env.PINECONE_INDEX = "test_hybrid_index"
-process.env.PINECONE_TYPE = "serverless"
-
+process.env.PINECONE_INDEX = "test_index";
+process.env.PINECONE_TYPE = "pod";
+process.env.PINECONE_INDEX_HYBRID = "test_index_hybrid";
+process.env.PINECONE_TYPE_HYBRID = "serverless";
+process.env.ADMIN_EMAIL = "admin@tiledesk.com";
 
 var userService = require('../services/userService');
 var projectService = require('../services/projectService');
@@ -36,6 +34,14 @@ const faq = require('../models/faq');
 var expect = chai.expect;
 var assert = chai.assert;
 
+let custom_profile_sample = { 
+    name: "Custom",
+    type: "payment",
+    subStart: new Date(),
+    subEnd: new Date(new Date().setFullYear(new Date().getFullYear() + 1)),
+    customization: { hybrid: true } 
+}
+
 mongoose.connect(config.databasetest);
 
 chai.use(chaiHttp);
@@ -63,7 +69,7 @@ describe('KbRoute', () => {
 
                             res.should.have.status(200);
                             expect(res.body.length).to.equal(1);
-                            expect(res.body[0].engine.index_name).to.equal('test_hybrid_index')
+                            expect(res.body[0].engine.index_name).to.equal('test_index')
 
                             let namespace_id = res.body[0].id;
 
@@ -1119,7 +1125,7 @@ describe('KbRoute', () => {
         //     });
         // })
 
-        it('create-namespaces-with-engine', (done) => {
+        it('create-namespaces-with-engine-similarity', (done) => {
 
             var email = "test-signup-" + Date.now() + "@email.com";
             var pwd = "pwd";
@@ -1143,7 +1149,7 @@ describe('KbRoute', () => {
                         expect(res.body.name).to.equal('MyCustomNamespace');
                         should.exist(res.body.engine)
                         expect(res.body.engine.name).to.equal('pinecone');
-                        expect(res.body.engine.type).to.equal('serverless');
+                        expect(res.body.engine.type).to.equal('pod');
 
                         // Get again all namespace. A new default namespace should not be created.
                         chai.request(server)
@@ -1167,6 +1173,99 @@ describe('KbRoute', () => {
             });
         })
 
+        it('create-namespaces-with-engine-hybrid-rejected', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+                projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+
+                    chai.request(server)
+                    .post('/' + savedProject._id + '/kb/namespace')
+                    .auth(email, pwd)
+                    .send({ name: "MyCustomNamespace", hybrid: true })
+                    .end((err, res) => {
+
+                        if (err) { console.error("err: ", err) }
+                        if (log) { console.log("create new namespace res.body: ", res.body) }
+
+                        res.should.have.status(403);
+                        res.body.should.be.a('object');
+                        expect(res.body.success).to.equal(false);
+                        expect(res.body.error).to.equal('Hybrid mode is not allowed for the current project');
+                        
+                        done();
+                    })
+                });
+            });
+        })
+        
+        it('create-namespaces-with-engine-hybrid-accepted', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+                projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+
+                    chai.request(server)
+                        .post('/auth/signin')
+                        .send({ email: "admin@tiledesk.com", password: "adminadmin" })
+                        .end((err, res) => {
+
+                            if (err) { console.error("err: ", err) }
+                            if (log) { console.log("login with superadmin res.body: ", res.body) };
+
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.success).to.equal(true);
+                            expect(res.body.token).not.equal(null);
+
+                            let superadmin_token = res.body.token;
+
+
+                            chai.request(server)
+                                .put('/projects/' + savedProject._id)
+                                .set('Authorization', superadmin_token)
+                                .send({ profile: custom_profile_sample })
+                                .end((err, res) => {
+
+                                    if (err) { console.error("err: ", err) }
+                                    if (log) { console.log("update project res.body: ", res.body) }
+
+                                    res.should.have.status(200);
+                                    res.body.should.be.a('object');
+                                    expect(res.body.profile.customization.hybrid).to.equal(true);
+
+                                    chai.request(server)
+                                        .post('/' + savedProject._id + '/kb/namespace')
+                                        .auth(email, pwd)
+                                        .send({ name: "MyCustomNamespace", hybrid: true })
+                                        .end((err, res) => {
+                
+                                            if (err) { console.error("err: ", err) }
+                                            if (log) { console.log("create new namespace res.body: ", res.body) }
+                
+                                            res.should.have.status(200);
+                                            res.body.should.be.a('object');
+                                            should.not.exist(res.body._id)
+                                            should.exist(res.body.id)
+                                            expect(res.body.name).to.equal('MyCustomNamespace');
+                                            should.exist(res.body.engine)
+                                            expect(res.body.engine.name).to.equal('pinecone');
+                                            expect(res.body.engine.type).to.equal('serverless');
+                
+                                            done();
+                                        })
+                                })
+                            
+                        })
+                    
+                })
+            });
+        })
+
         it('import-namespace', (done) => {
             
             var email = "test-signup-" + Date.now() + "@email.com";
@@ -1488,23 +1587,28 @@ describe('KbRoute', () => {
     })
 
     describe('Unanswered Questions', () => {
+        
         it('add-unanswered-question', (done) => {
             var email = "test-signup-" + Date.now() + "@email.com";
             var pwd = "pwd";
 
             userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
                 projectService.create("test-unanswered-create", savedUser._id).then(function (savedProject) {
+
                     chai.request(server)
                         .get('/' + savedProject._id + '/kb/namespace/all')
                         .auth(email, pwd)
                         .end((err, res) => {
+                            
                             if (err) { console.error("err: ", err); }
+                            if (log) { console.log("get namespaces res.body: ", res.body); }
+
                             res.should.have.status(200);
                             expect(res.body.length).to.equal(1);
 
                             let namespace_id = res.body[0].id;
 
-                            let question = {
+                            let data = {
                                 namespace: namespace_id,
                                 question: "Come funziona il prodotto?"
                             }
@@ -1512,9 +1616,12 @@ describe('KbRoute', () => {
                             chai.request(server)
                                 .post('/' + savedProject._id + '/kb/unanswered')
                                 .auth(email, pwd)
-                                .send(question)
+                                .send(data)
                                 .end((err, res) => {
+                                    
                                     if (err) { console.error("err: ", err); }
+                                    if (log) { console.log("create unanswered question res.body: ", res.body); }
+
                                     res.should.have.status(200);
                                     res.body.should.be.a('object');
                                     expect(res.body.namespace).to.equal(namespace_id);
@@ -1538,13 +1645,15 @@ describe('KbRoute', () => {
                         .auth(email, pwd)
                         .end((err, res) => {
                             if (err) { console.error("err: ", err); }
+                            if (log) { console.log("get namespaces res.body: ", res.body); }
+
                             res.should.have.status(200);
                             expect(res.body.length).to.equal(1);
 
                             let namespace_id = res.body[0].id;
 
                             // First add a question
-                            let question = {
+                            let data = {
                                 namespace: namespace_id,
                                 question: "Come funziona il prodotto?"
                             }
@@ -1552,14 +1661,16 @@ describe('KbRoute', () => {
                             chai.request(server)
                                 .post('/' + savedProject._id + '/kb/unanswered')
                                 .auth(email, pwd)
-                                .send(question)
+                                .send(data)
                                 .end((err, res) => {
                                     if (err) { console.error("err: ", err); }
+                                    if (log) { console.log("add unanswered question res.body: ", res.body); }
+
                                     res.should.have.status(200);
 
                                     // Then get all questions
                                     chai.request(server)
-                                        .get('/' + savedProject._id + '/kb/unanswered?namespace=' + namespace_id)
+                                        .get('/' + savedProject._id + '/kb/unanswered/' + namespace_id)
                                         .auth(email, pwd)
                                         .end((err, res) => {
                                             if (err) { console.error("err: ", err); }
@@ -1623,7 +1734,7 @@ describe('KbRoute', () => {
 
                                             // Verify it's deleted
                                             chai.request(server)
-                                                .get('/' + savedProject._id + '/kb/unanswered?namespace=' + namespace_id)
+                                                .get('/' + savedProject._id + '/kb/unanswered/' + namespace_id)
                                                 .auth(email, pwd)
                                                 .end((err, res) => {
                                                     if (err) { console.error("err: ", err); }
@@ -1687,7 +1798,7 @@ describe('KbRoute', () => {
 
                                         // Verify they're deleted
                                         chai.request(server)
-                                            .get('/' + savedProject._id + '/kb/unanswered?namespace=' + namespace_id)
+                                            .get('/' + savedProject._id + '/kb/unanswered/' + namespace_id)
                                             .auth(email, pwd)
                                             .end((err, res) => {
                                                 if (err) { console.error("err: ", err); }
@@ -1789,7 +1900,7 @@ describe('KbRoute', () => {
                             )).then(() => {
                                 // Then count them
                                 chai.request(server)
-                                    .get('/' + savedProject._id + '/kb/unanswered/count?namespace=' + namespace_id)
+                                    .get('/' + savedProject._id + '/kb/unanswered/count/' + namespace_id)
                                     .auth(email, pwd)
                                     .end((err, res) => {
                                         if (err) { console.error("err: ", err); }