@tiledesk/tiledesk-tybot-connector 2.0.20 → 2.0.21-rc2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "2.0.20",
+  "version": "2.0.21-rc2",
   "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/DirectivesChatbotPlug.js

@@ -54,13 +54,13 @@ const { DirMoveToUnassigned } = require('./directives/DirMoveToUnassigned');
 const { DirAddTags } = require('./directives/DirAddTags');
 const { DirSendWhatsapp } = require('./directives/DirSendWhatsapp');
 const { DirReplaceBotV3 } = require('./directives/DirReplaceBotV3');
-const { DirAiTask, DirAiPrompt } = require('./directives/DirAiPrompt');
+const { DirAiPrompt } = require('./directives/DirAiPrompt');
 const { DirWebResponse } = require('./directives/DirWebResponse');
 const { DirConnectBlock } = require('./directives/DirConnectBlock');
+const { DirAddKbContent } = require('./directives/DirAddKbContent');
+const { DirFlowLog } = require('./directives/DirFlowLog');
 
 const winston = require('../utils/winston');
-const { DirFlowLog } = require('./directives/DirFlowLog');
-const { DirAddKbContent } = require('./directives/DirAddKbContent');
 
 class DirectivesChatbotPlug {
 
@@ -219,14 +219,13 @@ class DirectivesChatbotPlug {
       directive_name = directive.name.toLowerCase();
     }
     if (directive && directive.action) {
-        const action_id = directive.action["_tdActionId"];
-        const locked_action_id = await this.chatbot.currentLockedAction(this.supportRequest.request_id);
-        if ( locked_action_id && (locked_action_id !== action_id) ) {
-          let next_dir = await this.nextDirective(this.directives);
-          this.process(next_dir);
-          return;
-        }
-      
+      const action_id = directive.action["_tdActionId"];
+      const locked_action_id = await this.chatbot.currentLockedAction(this.supportRequest.request_id);
+      if ( locked_action_id && (locked_action_id !== action_id) ) {
+        let next_dir = await this.nextDirective(this.directives);
+        this.process(next_dir);
+        return;
+      }      
     }
     if (directive == null || (directive !== null && directive["name"] === undefined)) {
       winston.debug("(DirectivesChatbotPlug) stop process(). directive is (null?): ", directive);
@@ -704,6 +703,19 @@ class DirectivesChatbotPlug {
         }
       });
     }
+    else if (directive_name === Directives.WEBHOOK) {
+      // console.log(".....DirIntent")
+      new DirIntent(context).execute(directive, async (stop) => {
+        if (stop) {
+          if (context.log) { console.log("Stopping Actions on:", JSON.stringify(directive));}
+          this.theend();
+        }
+        else {
+          let next_dir = await this.nextDirective(this.directives);
+          this.process(next_dir);
+        }
+      });
+    }
     else if (directive_name === Directives.WEB_RESPONSE) {
       new DirWebResponse(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
@@ -716,6 +728,12 @@ class DirectivesChatbotPlug {
         this.process(next_dir);
       })
     }
+    else if (directive_name === Directives.ADD_KB_CONTENT) {
+      new DirAddKbContent(context).execute(directive, async () => {
+        let next_dir = await this.nextDirective(this.directives);
+        this.process(next_dir);
+      });
+    }
     else {
       let next_dir = await this.nextDirective(this.directives);
       this.process(next_dir);

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 {
 
@@ -172,7 +174,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) {
@@ -196,7 +198,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")
@@ -340,7 +342,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) {
@@ -353,6 +357,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);
@@ -423,93 +431,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.

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -19,6 +19,8 @@ class DirReply {
     this.tdcache = context.tdcache;
     this.log = context.log;
     this.API_ENDPOINT = context.API_ENDPOINT;
+
+    console.log("context.supportRequest: ", context.supportRequest);
     
     this.logger = new Logger({ request_id: this.requestId, dev: this.context.supportRequest?.draft, intent_id: this.context.reply?.attributes?.intent_info?.intent_id });
     this.tdClient = new TiledeskClient({ projectId: this.context.projectId, token: this.context.token, APIURL: this.API_ENDPOINT, APIKEY: "___", log: this.log });

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

@@ -118,7 +118,7 @@ class DirWebRequestV2 {
         this.logger.native("[Web Request] resbody: ", resbody);
         
         if (err) {
-          this.logger.error("WebRequest error: ", err);
+          this.logger.error("[Web Request] error: ", err);
           winston.log("webRequest error: ", err);
           if (callback) {
             if (falseIntent) {

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -58,6 +58,7 @@ class Directives {
   static MOVE_TO_UNASSIGNED = "move_to_unassigned";
   static CONNECT_BLOCK = "connect_block";
   static ADD_TAGS = 'add_tags'
+  static WEBHOOK = 'webhook';
   static WEB_RESPONSE = "web_response";
   static FLOW_LOG = "flow_log";
   static ADD_KB_CONTENT = "add_kb_content";

package/utils/TiledeskChatbotUtil.js

@@ -333,27 +333,6 @@ class TiledeskChatbotUtil {
                                         }
                                     });
                                 }
-
-                                // "buttons": [
-                                //                 {
-                                //                     "type": "action",
-                                //                     "value": "Button1", // obbligatorio sempre
-                                //                     "action": "#bb347206-d639-4926-94c9-e94930623dce", // mandatory
-                                //                     "show_echo": true, // lo inserisco sempre
-                                //                     "alias": "button1 alias"
-                                //                 },
-                                //                 {
-                                //                     "type": "text",
-                                //                     "value": "Button2 text", // obbligatorio sempre
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 },
-                                //                 {
-                                //                     "type": "url",
-                                //                     "value": "Button3 link", // obbligatorio sempre
-                                //                     "link": "http://", // obbligatorio
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 }
-                                //             ]
                             }
                             catch(error) {
                                 winston.warn("Invalid json_buttons:", error)
@@ -604,8 +583,10 @@ class TiledeskChatbotUtil {
                 }
                 let currentLeadName = await chatbot.getParameter(TiledeskChatbotConst.REQ_LEAD_USERFULLNAME_KEY);
                 winston.debug("(TiledeskChatbotUtil) You lead email from attributes: " + currentLeadEmail);
+                console.log("currentLeadName: ", currentLeadName)
                 if (message.request.lead.fullname && !currentLeadName) {
                     // worth saving
+                    console.log("inside if")
                     winston.debug("(TiledeskChatbotUtil) worth saving email");
                     try {
                         await chatbot.addParameter(TiledeskChatbotConst.REQ_LEAD_USERFULLNAME_KEY, message.request.lead.fullname);