@tiledesk/tiledesk-server 2.8.5 → 2.8.6

package/CHANGELOG.md

@@ -5,6 +5,9 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.8.6
+- Bug fix: token count was incremented in action preview and kb preview even with a private key in integration
+
 # 2.8.5
 - Restored sandbox limits for free trial plan
 

package/package.json

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

package/routes/kb.js

@@ -13,6 +13,7 @@ const Sitemapper = require('sitemapper');
 var mongoose = require('mongoose');
 const faq = require('../models/faq');
 const faq_kb = require('../models/faq_kb');
+let Integration = require('../models/integrations');
 
 const { MODELS_MULTIPLIER } = require('../utils/aiUtils');
 
@@ -186,20 +187,22 @@ router.post('/qa', async (req, res) => {
   }
 
   let namespaceIds = namespaces.map(namespace => namespace.id);
-
   if (!namespaceIds.includes(data.namespace)) {
     return res.status(403).send({ success: false, error: "Not allowed. The namespace does not belong to the current project." })
   }
-
+  
   winston.debug("/qa data: ", data);
 
   if (!data.gptkey) {
-    let gptkey = process.env.GPTKEY;
+    let gptkey = await getKeyFromIntegrations(project_id);
+    if (!gptkey) {
+      gptkey = process.env.GPTKEY;
+      publicKey = true;
+    }
     if (!gptkey) {
       return res.status(403).send({ success: false, error: "GPT apikey undefined" })
     }
     data.gptkey = gptkey;
-    publicKey = true;
   }
 
   let obj = { createdAt: new Date() };
@@ -221,6 +224,10 @@ router.post('/qa', async (req, res) => {
     }
   }
 
+  // if (process.env.NODE_ENV === 'test') {
+  //   return res.status(200).send({ success: true, message: "Question skipped in test environment"});
+  // }
+
   openaiService.askNamespace(data).then((resp) => {
     winston.debug("qa resp: ", resp.data);
     let answer = resp.data;
@@ -233,16 +240,18 @@ router.post('/qa', async (req, res) => {
 
     KB.findById(id, (err, resource) => {
 
-      let multiplier = MODELS_MULTIPLIER[data.model];
-      if (!multiplier) {
-        multiplier = 1;
-        winston.info("No multiplier found for AI model")
+      if (publicKey === true) {
+        let multiplier = MODELS_MULTIPLIER[data.model];
+        if (!multiplier) {
+          multiplier = 1;
+          winston.info("No multiplier found for AI model")
+        }
+        obj.multiplier = multiplier;
+        obj.tokens = answer.prompt_token_size;
+  
+        let incremented_key = quoteManager.incrementTokenCount(req.project, obj);
+        winston.verbose("incremented_key: ", incremented_key);
       }
-      obj.multiplier = multiplier;
-      obj.tokens = answer.prompt_token_size;
-
-      let incremented_key = quoteManager.incrementTokenCount(req.project, obj);
-      winston.verbose("incremented_key: ", incremented_key);
 
       if (err) {
         winston.error("Unable to find resource with id " + id + " in namespace " + answer.namespace + ". The standard answer is returned.")
@@ -517,7 +526,7 @@ router.post('/namespace', async (req, res) => {
   let quoteManager = req.app.get('quote_manager');
   let limits = await quoteManager.getPlanLimits(req.project);
   let ns_limit = limits.namespace;
-  console.log("Limit of namespaces for current plan " + ns_limit);
+  //console.log("Limit of namespaces for current plan " + ns_limit);
 
   if (namespaces.length >= ns_limit) {
     return res.status(403).send({ success: false, error: "Maximum number of resources reached for the current plan", plan_limit: ns_limit });
@@ -1199,6 +1208,22 @@ async function startScrape(data) {
     })
   })
 }
+
+async function getKeyFromIntegrations(project_id) {
+
+  return new Promise( async (resolve) => {
+
+    let integration = await Integration.findOne({ id_project: project_id, name: 'openai' }).catch((err) => {
+      winston.error("Unable to find openai integration for the current project " + project_id);
+      resolve(null);
+    })
+    if (integration && integration.value && integration.value.apikey) {
+      resolve(integration.value.apikey);
+    } else {
+      resolve(null);
+    }
+  })
+}
 /**
 * ****************************************
 * Utils Methods Section - End

package/test/kbRoute.js

@@ -1003,6 +1003,93 @@ describe('KbRoute', () => {
 
         // }).timeout(10000)
 
+        // Ask KB
+        // it('askkb-key-from-integrations', (done) => {
+
+        //     var email = "test-signup-" + Date.now() + "@email.com";
+        //     var pwd = "pwd";
+
+        //     userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+        //         projectService.create("test-kb-qa", savedUser._id).then((savedProject) => {
+
+        //             chai.request(server)
+        //                 .post('/' + savedProject._id + "/integration/")
+        //                 .auth(email, pwd)
+        //                 .send({ name: "openai", value: { apikey: "sk-testkey", organization: "Testkey" } })
+        //                 .end((err, res) => {
+
+        //                     if (err) { console.error("err: ", err) };
+        //                     if (log) { console.log("res.body: ", res.body) };
+        //                     console.log("Integration created..")
+
+        //                     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 all namespaces res.body: ", res.body); }
+                                    
+        //                             console.log("namespace created..")
+
+        //                             chai.request(server)
+        //                                 .post('/' + savedProject._id + "/kb/qa")
+        //                                 .auth(email, pwd)
+        //                                 .send({ model: "gpt-4o", namespace: savedProject._id, question: "sample question" })
+        //                                 .end((err, res) => {
+
+        //                                     if (err) { console.error("err: ", err) };
+        //                                     if (log) { console.log("res.body: ", res.body) };
+        //                                     console.log("res.body: ", res.body)
+        //                                     done();
+        //                                 })
+
+
+        //                         })
+
+        //                 })
+        //         })
+        //     })
+        // }).timeout(10000)
+
+        // Ask KB
+        // it('askkb-key-from-env', (done) => {
+
+        //     var email = "test-signup-" + Date.now() + "@email.com";
+        //     var pwd = "pwd";
+
+        //     userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+        //         projectService.create("test-kb-qa", savedUser._id).then((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 all namespaces res.body: ", res.body); }
+                            
+        //                     console.log("namespace created..")
+
+        //                     chai.request(server)
+        //                         .post('/' + savedProject._id + "/kb/qa")
+        //                         .auth(email, pwd)
+        //                         .send({ model: "gpt-4o", namespace: savedProject._id, question: "sample question" })
+        //                         .end((err, res) => {
+
+        //                             if (err) { console.error("err: ", err) };
+        //                             if (log) { console.log("res.body: ", res.body) };
+        //                             console.log("res.body: ", res.body)
+        //                             done();
+        //                         })
+
+
+        //                 })
+        //         })
+        //     })
+        // }).timeout(10000)
+
+
         it('webhook', (done) => {
 
             var email = "test-signup-" + Date.now() + "@email.com";