@tiledesk/tiledesk-tybot-connector 2.0.21-rc4 → 2.0.21

package/package.json

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

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 { DirAiPrompt } = require('./directives/DirAiPrompt');
+const { DirAiTask, 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,13 +219,14 @@ 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);
@@ -703,19 +704,6 @@ 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);
@@ -728,12 +716,6 @@ 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/DirAddKbContent.js

@@ -116,6 +116,14 @@ class DirAddKbContent {
       }
     }
 
+    if (!namespace) {
+      this.logger.error("[Add to KnwoledgeBase] Namespace is undefined")
+      winston.verbose("[DirAddKbContent] - Error: namespace is undefined")
+      await this.chatbot.addParameter("flowError", "[DirAddKbContent] Error: namespace is undefined");
+      callback(true);
+      return;
+    }
+
     let ns;
 
     if (action.namespaceAsName) {
@@ -137,20 +145,12 @@ class DirAddKbContent {
       return;
     }
 
-    if (ns.engine) {
-      engine = ns.engine;
-    } else {
-      engine = await this.setDefaultEngine()
-    }
+    // if (ns.engine) {
+    //   engine = ns.engine;
+    // } else {
+    //   engine = await this.setDefaultEngine(ns.hybrid);
+    // }
     
-    if (!namespace) {
-      this.logger.error("[Add to KnwoledgeBase] Namespace is undefined")
-      winston.verbose("[DirAddKbContent] - Error: namespace is undefined")
-      await this.chatbot.addParameter("flowError", "[DirAddKbContent] Error: namespace is undefined");
-      callback(true);
-      return;
-    }
-
     let json = {
       content: filled_content,
       namespace: namespace,
@@ -314,18 +314,19 @@ class DirAddKbContent {
     })
   }
 
-  async setDefaultEngine() {
-    return new Promise((resolve) => {
-      let engine = {
-        name: "pinecone",
-        type: process.env.PINECONE_TYPE,
-        apikey: "",
-        vector_size: 1536,
-        index_name: process.env.PINECONE_INDEX
-      }
-      resolve(engine);
-    })
-  }
+  // async setDefaultEngine() {
+  //   let isHybrid = hybrid === true;
+  //   return new Promise((resolve) => {
+  //     let engine = {
+  //       name: "pinecone",
+  //       type: isHybrid ? "serverless" : "pod",
+  //       apikey: "",
+  //       vector_size: 1536,
+  //       index_name: isHybrid ? "hybrid_index" : "standard_index"
+  //     }
+  //     resolve(engine);
+  //   })
+  // }
 
 }
 

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -11,10 +11,6 @@ const winston = require('../../utils/winston');
 const httpUtils = require("../../utils/HttpUtils");
 const integrationService = require("../../services/IntegrationService");
 const { Logger } = require("../../Logger");
-const quotasService = require("../../services/QuotasService");
-const llmService = require("../../services/LLMService");
-
-
 
 class DirAskGPTV2 {
 
@@ -169,14 +165,11 @@ class DirAskGPTV2 {
       }
     }
 
-    const kb_endpoint = process.env.KB_ENDPOINT_QA
-    winston.verbose("DirAskGPTV2  KbEndpoint URL: " + kb_endpoint);
-
     let key = await integrationService.getKeyFromIntegrations(this.projectId, 'openai', this.token);
     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 llmService.getKeyFromKbSettings(this.projectId, this.token);
+      key = await this.getKeyFromKbSettings();
     }
 
     if (!key) {
@@ -200,7 +193,7 @@ class DirAskGPTV2 {
     }
 
     if (publicKey === true && !chunks_only) {
-      let keep_going = await quotasService.checkQuoteAvailability(this.projectId, this.token);
+      let keep_going = await this.checkQuoteAvailability();
       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")
@@ -211,6 +204,17 @@ class DirAskGPTV2 {
       }
     }
 
+    if (!namespace) {
+      this.logger.error("[Ask Knowledge Base] Namespace is undefined")
+      winston.verbose("DirAskGPTV2 - Error: namespace is undefined")
+      if (falseIntent) {
+        await this.chatbot.addParameter("flowError", "AskGPT Error: namespace is undefined");
+        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+        callback(true);
+        return;
+      }
+    }
+
     let ns;
 
     if (action.namespaceAsName) {
@@ -241,18 +245,7 @@ class DirAskGPTV2 {
     if (ns.engine) {
       engine = ns.engine;
     } else {
-      engine = await this.setDefaultEngine()
-    }
-    
-    if (!namespace) {
-      this.logger.error("[Ask Knowledge Base] Namespace is undefined")
-      winston.verbose("DirAskGPTV2 - Error: namespace is undefined")
-      if (falseIntent) {
-        await this.chatbot.addParameter("flowError", "AskGPT Error: namespace is undefined");
-        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
-        callback(true);
-        return;
-      }
+      engine = await this.setDefaultEngine(ns.hybrid);
     }
 
     let json = {
@@ -277,7 +270,8 @@ class DirAskGPTV2 {
       json.chunks_only = chunks_only;
     }
 
-    if (engine.type === 'serverless') {
+
+    if (ns.hybrid === true) {
       json.search_type = 'hybrid';
       json.alpha = alpha;
     }
@@ -298,6 +292,12 @@ class DirAskGPTV2 {
 
     winston.debug("DirAskGPTV2 json:", json);
 
+    let kb_endpoint = process.env.KB_ENDPOINT_QA;
+    if (ns.hybrid === true) {
+      kb_endpoint = process.env.KB_ENDPOINT_QA_GPU;
+    }
+    winston.verbose("DirAskGPTV2  KbEndpoint URL: " + kb_endpoint);
+
     const HTTPREQUEST = {
       url: kb_endpoint + "/qa",
       headers: {
@@ -344,9 +344,7 @@ class DirAskGPTV2 {
                 tokens: resbody.prompt_token_size,
                 model: json.model
               }
-              quotasService.updateQuote(this.projectId, this.token, tokens_usage).catch((err) => {
-                winston.error("Error updating quota: ", err);
-              })
+              this.updateQuote(tokens_usage);
             }
   
             if (trueIntent) {
@@ -359,10 +357,6 @@ class DirAskGPTV2 {
           }
         } else {
           await this.#assignAttributes(action, answer, source);
-          llmService.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);
@@ -433,6 +427,93 @@ 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.
@@ -513,14 +594,15 @@ class DirAskGPTV2 {
     })
   }
 
-  async setDefaultEngine() {
+  async setDefaultEngine(hybrid = false) {
+    let isHybrid = hybrid === true;
     return new Promise((resolve) => {
       let engine = {
         name: "pinecone",
-        type: process.env.PINECONE_TYPE,
+        type: isHybrid ? "serverless" : "pod",
         apikey: "",
         vector_size: 1536,
-        index_name: process.env.PINECONE_INDEX
+        index_name: isHybrid ? "hybrid_index" : "standard_index"
       }
       resolve(engine);
     })

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

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