@tiledesk/tiledesk-server 2.19.2 → 2.19.4

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.19.4
+- Added missing id_project in data sent for qa and single scrape
+
+# 2.19.3
+- Fixed bug on AiPrompt action with vllm models
+- Updated tybot-connector to 2.1.2
+
 # 2.19.2
 - Improved vLLM integration in order to support multiple servers
 - Added custom_regex option for .txt and .md file uploaded in a Knowledge Base

package/models/kb_setting.js

@@ -20,6 +20,67 @@ let expireAnsweredAfterSeconds = ttlSecondsFromEnv(
   DEFAULT_ANSWERED_TTL_SEC
 );
 
+const EMPTY_EMBEDDING_API_KEY = '';
+
+function logEmbeddingApiKeyWriteAttempt(source, attemptedValue, meta = {}) {
+  if (attemptedValue === EMPTY_EMBEDDING_API_KEY || attemptedValue == null) {
+    return;
+  }
+  winston.warn('[Namespace.embedding.api_key] non-empty value blocked on ' + source, {
+    ...meta,
+    attemptedValue,
+    stack: new Error().stack
+  });
+}
+
+function sanitizeEmbeddingApiKeyObject(embedding, source, meta = {}) {
+  if (!embedding || typeof embedding !== 'object') {
+    return false;
+  }
+  if (!Object.prototype.hasOwnProperty.call(embedding, 'api_key')) {
+    return false;
+  }
+  if (embedding.api_key === EMPTY_EMBEDDING_API_KEY || embedding.api_key == null) {
+    embedding.api_key = EMPTY_EMBEDDING_API_KEY;
+    return false;
+  }
+  logEmbeddingApiKeyWriteAttempt(source, embedding.api_key, meta);
+  embedding.api_key = EMPTY_EMBEDDING_API_KEY;
+  return true;
+}
+
+function sanitizeEmbeddingApiKeyUpdate(update, source, meta = {}) {
+  if (!update || typeof update !== 'object') {
+    return false;
+  }
+
+  let changed = false;
+
+  const sanitizeContainer = (container) => {
+    if (!container || typeof container !== 'object') {
+      return;
+    }
+    if (sanitizeEmbeddingApiKeyObject(container.embedding, source, meta)) {
+      changed = true;
+    }
+    if (Object.prototype.hasOwnProperty.call(container, 'embedding.api_key')
+      && container['embedding.api_key'] !== EMPTY_EMBEDDING_API_KEY) {
+      logEmbeddingApiKeyWriteAttempt(source, container['embedding.api_key'], meta);
+      container['embedding.api_key'] = EMPTY_EMBEDDING_API_KEY;
+      changed = true;
+    }
+  };
+
+  sanitizeContainer(update);
+  ['$set', '$setOnInsert'].forEach((key) => {
+    if (update[key]) {
+      sanitizeContainer(update[key]);
+    }
+  });
+
+  return changed;
+}
+
 
 const EngineSchema = new Schema({
   name: {
@@ -77,7 +138,12 @@ const EmbeddingSchema = new Schema({
   },
   api_key: {
     type: String,
-    required: false
+    required: false,
+    default: EMPTY_EMBEDDING_API_KEY,
+    set: function (value) {
+      logEmbeddingApiKeyWriteAttempt('embedding.api_key setter', value);
+      return EMPTY_EMBEDDING_API_KEY;
+    }
   }
 }, {
   _id: false  // This is schema is always used as an embedded object inside NamespaceSchema
@@ -120,6 +186,40 @@ const NamespaceSchema = new Schema({
   timestamps: true
 })
 
+NamespaceSchema.pre('save', function (next) {
+  if (this.isModified('embedding.api_key')) {
+    const attemptedValue = this.get('embedding.api_key');
+    logEmbeddingApiKeyWriteAttempt('save', attemptedValue, {
+      namespaceId: this.id,
+      id_project: this.id_project
+    });
+    this.set('embedding.api_key', EMPTY_EMBEDDING_API_KEY);
+  }
+  next();
+});
+
+['updateOne', 'updateMany', 'findOneAndUpdate'].forEach((hook) => {
+  NamespaceSchema.pre(hook, function (next) {
+    const update = this.getUpdate();
+    if (sanitizeEmbeddingApiKeyUpdate(update, hook, { query: this.getQuery() })) {
+      this.setUpdate(update);
+    }
+    next();
+  });
+});
+
+NamespaceSchema.pre('insertMany', function (next, docs) {
+  if (Array.isArray(docs)) {
+    docs.forEach((doc) => {
+      sanitizeEmbeddingApiKeyObject(doc.embedding, 'insertMany', {
+        namespaceId: doc.id,
+        id_project: doc.id_project
+      });
+    });
+  }
+  next();
+});
+
 var KBSchema = new Schema({
   id_project: {
     type: String,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.19.2",
+  "version": "2.19.4",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -49,7 +49,7 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-sms-connector": "^0.1.13",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
-    "@tiledesk/tiledesk-tybot-connector": "^2.1.1",
+    "@tiledesk/tiledesk-tybot-connector": "^2.1.2",
     "@tiledesk/tiledesk-voice-twilio-connector": "^0.3.2",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.91",
     "@tiledesk/tiledesk-whatsapp-connector": "1.0.26",

package/routes/kb.js

@@ -276,6 +276,8 @@ router.post('/scrape/single', async (req, res) => {
 
       winston.verbose("/scrape/single json: ", json);
 
+      json.id_project = project_id;
+
       if (process.env.NODE_ENV === "test") {
         res.status(200).send({ success: true, message: "Skip indexing in test environment", data: json })
       }
@@ -362,6 +364,7 @@ router.post('/qa', async (req, res) => {
   let id_project = req.projectid;
   let publicKey = false;
   let data = req.body;
+  data.id_project = id_project;
 
   let namespace;
   try {
@@ -601,10 +604,14 @@ router.post('/qa', async (req, res) => {
     return;
   }
 
+  let duration = Date.now();
+
   aiService.askNamespace(data).then((resp) => {
     winston.debug("qa resp: ", resp.data);
     let answer = resp.data;
 
+    answer.duration = (Date.now() - duration) / 1000;
+
     if (publicKey === true) {
       let modelKey;
       if (typeof data.model === 'string') {

package/routes/llm.js

@@ -106,6 +106,7 @@ router.post('/preview', async (req, res) => {
         json.model = {
             name: body.model,
             url: vllmConfig.url,
+            api_key: key || "",
             provider: 'vllm'
         };
         json.stream = false;

package/routes/webhook.js

@@ -199,7 +199,7 @@ router.post('/kb/reindex', async (req, res) => {
     json.engine = namespace.engine || (namespace.hybrid ? default_engine_hybrid : default_engine);
     json.hybrid = namespace.hybrid;
     
-    let embedding = namespace.embedding || default_embedding;
+    let embedding = namespace.embedding || Object.assign({}, default_embedding);
     embedding.api_key = process.env.EMBEDDING_API_KEY || process.env.GPTKEY;
     json.embedding = embedding;
 

package/services/aiManager.js

@@ -94,7 +94,7 @@ class AiManager {
       this.saveBulk(operations, kbs, namespace.id_project, namespace.id).then( async (result) => {
         let hybrid = namespace.hybrid;
         let engine = namespace.engine || default_engine;
-        let embedding = namespace.embedding || default_embedding;
+        let embedding = namespace.embedding || Object.assign({}, default_embedding);
         embedding.api_key = process.env.EMBEDDING_API_KEY || process.env.GPTKEY;
 
         let situated_context;