@tiledesk/tiledesk-tybot-connector 2.0.23 → 2.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {

package/services/KbService.js

@@ -0,0 +1,105 @@
+const httpUtils = require('../utils/HttpUtils');
+const winston = require('../utils/winston');
+const API_ENDPOINT = process.env.API_ENDPOINT;
+
+class KBService {
+
+  constructor() { }
+
+  async getNamespace(id_project, token, name, id) {
+    return new Promise((resolve) => {
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/kb/namespace/all",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "GET"
+      }
+      winston.debug("Kb HttpRequest", http_request);
+      
+      httpUtils.request(
+        http_request, async (err, namespaces) => {
+          if (err) {
+            winston.error("Error getting namespaces:", err);
+            reject(err);
+          } else {
+            winston.debug("Get namespaces response:", namespaces);
+            if (!Array.isArray(namespaces)) {
+              reject(new Error('Invalid response format'));
+              return;
+            }
+            
+            let namespace;
+            if (name) {
+              namespace = namespaces.find(n => n.name === name);
+            } else {
+              namespace = namespaces.find(n => n.id === id);
+            }
+            resolve(namespace || null);
+          }
+        }
+      )
+    })
+  }
+
+  async getKeyFromKbSettings(id_project, token) {
+
+    return new Promise((resolve) => {
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/kbsettings",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "GET"
+      }
+      winston.debug("Kb HttpRequest", http_request);
+
+      httpUtils.request(
+        http_request, async (err, resbody) => {
+          if (err) {
+            winston.error("Error getting kb settings:", err?.response?.data);
+            resolve(null);
+          } else {
+            if (!resbody || !resbody.gptkey) {
+              resolve(null);
+            } else {
+              resolve(resbody.gptkey);
+            }
+          }
+        }
+      )
+    })
+  }
+
+  async addUnansweredQuestion(id_project, namespace, question, token) {
+    
+    const json = { namespace, question };
+    
+    return new Promise((resolve, reject) => {
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/kb/unanswered/",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "POST",
+        json: json
+      }
+      winston.debug("Kb HttpRequest", http_request);
+
+      httpUtils.request(http_request, (err, response) => {
+        if (err) {
+          winston.error("Error adding unanswered question:", err);
+          reject(err);
+        } else {
+          resolve(response);
+        }
+      });
+    });
+  }
+}
+
+const kbService = new KBService();
+module.exports = kbService;

package/services/QuotasService.js

@@ -0,0 +1,69 @@
+const httpUtils = require('../utils/HttpUtils');
+const winston = require('../utils/winston');
+const API_ENDPOINT = process.env.API_ENDPOINT;
+
+class QuotasService {
+
+  constructor() { }
+
+  async checkQuoteAvailability(id_project, token) {
+    return new Promise((resolve) => {
+
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/quotes/tokens",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "GET"
+      }
+      winston.debug("QuotasService HttpRequest", http_request);
+
+      httpUtils.request(
+        http_request, async (err, resbody) => {
+          if (err) {
+            winston.error("Check quote availability err: ", err);
+            resolve(true)
+          } else {
+            if (resbody.isAvailable === true) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          }
+        }
+      )
+    })
+  }
+
+  async updateQuote(id_project, token, tokens_usage) {
+    return new Promise((resolve, reject) => {
+
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/quotes/incr/tokens",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        json: tokens_usage,
+        method: "POST"
+      }
+      winston.debug("DirAskGPTV2 update quote HttpRequest ", http_request);
+
+      httpUtils.request(
+        http_request, async (err, resbody) => {
+          if (err) {
+            winston.error("Increment tokens quote err: ", err);
+            reject(false)
+          } else {
+            resolve(true);
+          }
+        }
+      )
+    })
+  }
+
+}
+
+const quotasService = new QuotasService();
+module.exports = quotasService;

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -11,6 +11,8 @@ const winston = require('../../utils/winston');
 const httpUtils = require("../../utils/HttpUtils");
 const integrationService = require("../../services/IntegrationService");
 const { Logger } = require("../../Logger");
+const kbService = require("../../services/KBService");
+const quotasService = require("../../services/QuotasService");
 
 class DirAskGPTV2 {
 
@@ -169,7 +171,7 @@ class DirAskGPTV2 {
     if (!key) {
       this.logger.native("[Ask Knowledge Base] OpenAI key not found in Integration. Using shared OpenAI key");
       winston.verbose("DirAskGPTV2 - Key not found in Integrations. Searching in kb settings...");
-      key = await this.getKeyFromKbSettings();
+      key = await kbService.getKeyFromKbSettings(this.projectId, this.token);
     }
 
     if (!key) {
@@ -193,7 +195,7 @@ class DirAskGPTV2 {
     }
 
     if (publicKey === true && !chunks_only) {
-      let keep_going = await this.checkQuoteAvailability();
+      let keep_going = await quotasService.checkQuoteAvailability(this.projectId, this.token);
       if (keep_going === false) {
         this.logger.warn("[Ask Knowledge Base] Tokens quota exceeded. Skip the action")
         winston.verbose("DirAskGPTV2 - Quota exceeded for tokens. Skip the action")
@@ -344,7 +346,9 @@ class DirAskGPTV2 {
                 tokens: resbody.prompt_token_size,
                 model: json.model
               }
-              this.updateQuote(tokens_usage);
+              quotasService.updateQuote(this.projectId, this.token, tokens_usage).catch((err) => {
+                winston.error("Error updating quota: ", err);
+              })
             }
   
             if (trueIntent) {
@@ -357,6 +361,10 @@ class DirAskGPTV2 {
           }
         } else {
           await this.#assignAttributes(action, answer, source);
+          kbService.addUnansweredQuestion(this.projectId, json.namespace, json.question, this.token).catch((err) => {
+            winston.error("DirAskGPTV2 - Error adding unanswered question: ", err);
+            this.logger.warn("[Ask Knowledge Base] Unable to add unanswered question", json.question, "to namespacae", json.namespace);
+          })
           if (falseIntent) {
             await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
             callback(true);
@@ -427,93 +435,6 @@ class DirAskGPTV2 {
     }
   }
 
-  async getKeyFromKbSettings() {
-    return new Promise((resolve) => {
-
-      const KB_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/kbsettings",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("DirAskGPTV2 KB HttpRequest", KB_HTTPREQUEST);
-
-      httpUtils.request(
-        KB_HTTPREQUEST, async (err, resbody) => {
-          if (err) {
-            winston.error("DirAskGPTV2 Get kb settings error ", err?.response?.data);
-            resolve(null);
-          } else {
-            if (!resbody.gptkey) {
-              resolve(null);
-            } else {
-              resolve(resbody.gptkey);
-            }
-          }
-        }
-      )
-    })
-  }
-
-  async checkQuoteAvailability() {
-    return new Promise((resolve) => {
-
-      const HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/tokens",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("DirAskGPTV2 check quote availability HttpRequest", HTTPREQUEST);
-
-      httpUtils.request(
-        HTTPREQUEST, async (err, resbody) => {
-          if (err) {
-            winston.error("DirAskGPTV2 Check quote availability err: ", err);
-            resolve(true)
-          } else {
-            if (resbody.isAvailable === true) {
-              resolve(true)
-            } else {
-              resolve(false)
-            }
-          }
-        }
-      )
-    })
-  }
-
-  async updateQuote(tokens_usage) {
-    return new Promise((resolve, reject) => {
-
-      const HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/incr/tokens",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        json: tokens_usage,
-        method: "POST"
-      }
-      winston.debug("DirAskGPTV2 update quote HttpRequest ", HTTPREQUEST);
-
-      httpUtils.request(
-        HTTPREQUEST, async (err, resbody) => {
-          if (err) {
-            winston.error("DirAskGPTV2 Increment tokens quote err: ", err);
-            reject(false)
-          } else {
-            resolve(true);
-          }
-        }
-      )
-    })
-  }
-
   /**
    * Transforms the transcirpt array in a dictionary like '0': { "question": "xxx", "answer":"xxx"}
    * merging consecutive messages with the same role in a single question or answer.