@tiledesk/tiledesk-tybot-connector 2.0.29-rc5 → 2.0.29

package/CHANGELOG.md

@@ -5,9 +5,10 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
-# 2.0.28
+# 2.0.29
+- added: support for reranking in DirAskKBV2
 
-# 2.0.28-rc1
+# 2.0.28
 - bug-fixed: action-model not filled in dirAiPrompt
 
 # 2.0.27
@@ -15,9 +16,6 @@ available on:
 
 # 2.0.26
 
-# 2.0.26-rc1
-- added: check and skip private message from internal-notes
-
 # 2.0.9
 
 # 2.0.9-rc1
@@ -33,8 +31,6 @@ available on:
 
 # v0.5.0
 - added: AI_ENDPOINT env var
-
-# v0.5.0-rc1
 - added: ability to get 'none' as bodytype in webresponse
 
 # v0.4.2
@@ -49,19 +45,6 @@ available on:
 - changed: refactoring of DIrWebRequestv2
 - bug-fixed: erro while parsing webrequestv2 body
 
-# v0.3.5-rc4
-- added: webhook action (same as intent one)
-
-# v0.3.5-rc3
-- bug-fixed: jsonBody parse error in web-request-v2
-
-# v0.3.5-rc2
-- bug-fixed: cannot set status of undefined reading res.status in DirAssistant
-
-# v0.3.5-rc1
-- changed: refactoring web-request-v2
-- bug-fixed: jsonBody parse error in web-request-v2
-
 # v0.3.4
 -bug-fixed: slit is undefined in TiledeskChatbotUtils
 
@@ -71,18 +54,6 @@ available on:
 # v0.3.2
 - bug-fixed: minor improvement
 
-# v0.2.153-rc9
-- changed: updated tiledesk-multi-worker to 0.2.1-rc2   
-
-# v0.2.153-rc8
-- added: fixToken function in TiledeskService utils class
-
-# v0.2.153-rc4
-- log added
-
-# v0.2.153-rc3
-- added: specchToText function to transcript audio file
-
 # v0.2.153-rc1
 - changed: context for gpt-40 and gpt-40-mini
 

package/ExtApi.js

@@ -32,6 +32,7 @@ class ExtApi {
    * @param {string} token. User token
    */
   sendSupportMessageExt(message, projectId, requestId, token, callback) {
+    const t4 = Date.now();
     const jwt_token = this.fixToken(token);
     const url = `${this.TILEBOT_ENDPOINT}/ext/${projectId}/requests/${requestId}/messages`;
     winston.verbose("(ExtApi) sendSupportMessageExt URL" + url);
@@ -53,6 +54,8 @@ class ExtApi {
           }
         }
         else {
+          const t4e = Date.now();
+          console.log(`[TIMER] sendSupportMessageExt in ${t4e - t4}ms ------ ${requestId}`);
           if (callback) {
             callback(null, resbody);
           }

package/TdCache copy.js

@@ -0,0 +1,242 @@
+const redis = require('redis');
+
+class TdCache {
+
+    constructor(config) {
+        this.redis_host = config.host;
+        this.redis_port = config.port;
+        this.redis_password = config.password;
+        this.client = null;
+    }
+
+    async connect(callback) {
+        // client = redis.createClient();
+        return new Promise( async (resolve, reject) => {
+            this.client = redis.createClient(
+                {
+                    host: this.redis_host,
+                    port: this.redis_port,
+                    password: this.redis_password
+                });
+            this.client.on('error', err => {
+                reject(err);
+                if (callback) {
+                    callback(err);
+                }
+            });
+            // this.client.on('connect', function() {
+            //     console.log('Redis Connected!');
+            // });
+            this.client.on('ready',function() {
+              console.log("connected")
+                resolve();
+                if (callback) {
+                    callback();
+                }
+                //console.log("Redis is ready.");
+            });
+        });
+    }
+
+    async set(key, value, options) {
+      //console.log("setting key value", key, value)
+      if (!options) {
+        options = {EX: 86400}
+      }
+      return new Promise( async (resolve, reject) => {
+        if (options && options.EX) {
+          //console.log("expires:", options.EX)
+          try {
+            await this.client.set(
+              key,
+              value,
+              'EX', options.EX);
+          }
+          catch(error) {
+            reject(error)
+          }
+        }
+        else {
+          try {
+            //console.log("setting here...key", key, value)
+            await this.client.set(
+              key,
+              value);
+          }
+          catch(error) {
+            console.error("Error", error);
+            reject(error)
+          }
+        }
+        if (options && options.callback) {
+            options.callback();
+        }
+        //console.log("resolving...", key);
+        return resolve();
+      });
+    }
+
+    async incr(key) {
+      // console.log("incr key:", key)
+      return new Promise( async (resolve, reject) => {
+          try {
+            // console.log("incr here...key", key)
+            await this.client.incr(key);
+          }
+          catch(error) {
+            console.error("Error on incr:", error);
+            reject(error)
+          }
+        return resolve();
+      });
+    }
+
+    async hset(dict_key, key, value, options) {
+      //console.log("hsetting dict_key key value", dict_key, key, value)
+      return new Promise( async (resolve, reject) => {
+        if (options && options.EX) {
+          //console.log("expires:", options.EX)
+          try {
+            await this.client.hset(
+              dict_key,
+              key,
+              value,
+              'EX', options.EX);
+          }
+          catch(error) {
+            reject(error)
+          }
+        }
+        else {
+          try {
+            //console.log("setting here...key", key, value)
+            await this.client.hset(
+              dict_key,
+              key,
+              value);
+          }
+          catch(error) {
+            console.error("Error", error);
+            reject(error)
+          }
+        }
+        if (options && options.callback) {
+            options.callback();
+        }
+        return resolve();
+      });
+    }
+
+    async hdel(dict_key, key, options) {
+      //console.log("hsetting dict_key key value", dict_key, key, value)
+      return new Promise( async (resolve, reject) => {
+        if (options && options.EX) {
+          //console.log("expires:", options.EX)
+          try {
+            await this.client.hdel(
+              dict_key,
+              key,
+              'EX', options.EX);
+          }
+          catch(error) {
+            reject(error)
+          }
+        }
+        else {
+          try {
+            //console.log("setting here...key", key, value)
+            await this.client.hdel(
+              dict_key,
+              key);
+          }
+          catch(error) {
+            console.error("Error", error);
+            reject(error);
+          }
+        }
+        if (options && options.callback) {
+            options.callback();
+        }
+        return resolve();
+      });
+    }
+    
+    async setJSON(key, value, options) {
+      const _string = JSON.stringify(value);
+      return await this.set(key, _string, options);
+    }
+    
+    async get(key, callback) {
+      //console.log("getting key", key)
+      return new Promise( async (resolve, reject) => {
+        this.client.get(key, (err, value) => {
+          if (err) {
+            reject(err);
+          }
+          else {
+            if (callback) {
+              callback(value);
+          }
+          return resolve(value);
+          }
+        });
+      });
+    }
+
+    async hgetall(dict_key, callback) {
+      //console.log("hgetting dics", dict_key);
+      return new Promise( async (resolve, reject) => {
+        this.client.hgetall(dict_key, (err, value) => {
+          if (err) {
+            reject(err);
+            if (callback) {
+              callback(err, null);
+            }
+          }
+          else {
+            if (callback) {
+              callback(null, value);
+            }
+            resolve(value);
+          }
+        });
+      });
+    }
+
+    async hget(dict_key, key, callback) {
+      //console.log("hgetting dics", dict_key);
+      return new Promise( async (resolve, reject) => {
+        this.client.hget(dict_key, key, (err, value) => {
+          if (err) {
+            reject(err);
+            if (callback) {
+              callback(err, null);
+            }
+          }
+          else {
+            if (callback) {
+              callback(null, value);
+            }
+            resolve(value);
+          }
+        });
+      });
+    }
+    
+    async getJSON(key, callback) {
+      const value = await this.get(key);
+      return JSON.parse(value);
+    }
+    
+    async del(key, callback) {
+      return new Promise( async (resolve, reject) => {
+        await this.client.del(key);
+        if (callback) {
+            callback();
+        }
+        return resolve();
+      })
+    }
+}
+
+module.exports = { TdCache };

package/engine/TiledeskChatbotConst.js

@@ -42,14 +42,7 @@ class TiledeskChatbotConst {
     static REQ_LAST_USER_DOCUMENT_URL = 'lastUserDocumentURL';
     static REQ_LAST_USER_DOCUMENT_NAME = 'lastUserDocumentName';
     static REQ_LAST_USER_DOCUMENT_TYPE = 'lastUserDocumentType';
-    static REQ_EMAIL_SUBJECT = 'email_subject';
-    static REQ_EMAIL_TO = 'email_toEmail';
-    static REQ_EMAIL_FROM = 'email_fromEmail';
-    static REQ_EMAIL_MESSAGE_ID = 'email_messageId';
-    static REQ_EMAIL_REPLY_TO = 'email_replyTo';
-    static REQ_EMAIL_EML = 'email_eml';
-    static REQ_EMAIL_ATTACHMENTS_LINK = 'link';
-    static REQ_EMAIL_ATTACHMENTS_FILES = 'attachments'
+
 }
 
 module.exports = { TiledeskChatbotConst };

package/engine/mock/MockBotsDataSource.js

@@ -24,7 +24,8 @@ class MockBotsDataSource {
       }catch(err){
         reject(err);
       }
-    })
+      
+    }) 
   }
   
   async getBotByIdCache(botId, tdcache) {

package/index.js

@@ -42,6 +42,8 @@ let TILEBOT_ENDPOINT = null;
 let staticBots;
 
 router.post('/ext/:botid', async (req, res) => {
+  const ttotal = Date.now()
+  const t1 = Date.now();
   const botId = req.params.botid;
   winston.verbose("(tybotRoute) POST /ext/:botid called: " + botId)
   if(!botId || botId === "null" || botId === "undefined"){
@@ -104,9 +106,6 @@ router.post('/ext/:botid', async (req, res) => {
     Promise.reject(err);
     return;
   });
-
-  winston.debug("(tybotRoute) Bot found: ", bot)
-  
   
   let intentsMachine;
   let backupMachine;
@@ -173,10 +172,12 @@ router.post('/ext/:botid', async (req, res) => {
           cache: tdcache
         }
       );
-
-
+      const t1e = Date.now();
+      console.log(`[TIMER] Preparation phase in ${t1e - t1}ms ------ ${requestId}`);
+      const t2 = Date.now();
       directivesPlug.processDirectives( () => {
-
+        const t2e = Date.now();
+        console.log(`[TIMER] Directives executed in ${t2e - t2}ms ------ ${requestId}`);
         winston.verbose("(tybotRoute) Actions - Directives executed.");
       });
     }
@@ -199,7 +200,8 @@ router.post('/ext/:botid', async (req, res) => {
       TILEBOT_ENDPOINT: TILEBOT_ENDPOINT
     });
     apiext.sendSupportMessageExt(reply, projectId, requestId, token, () => {
-
+      const ttotale = Date.now()
+      console.log(`[TIMER] Directives executed in ${ttotal - ttotale}ms ------ ${requestId}`);
       winston.verbose("(tybotRoute) sendSupportMessageExt reply sent: ", reply)
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "2.0.29-rc5",
+  "version": "2.0.29",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,7 @@
     "@tiledesk/tiledesk-chatbot-client": "^0.5.30",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.39",
     "@tiledesk/tiledesk-client": "^0.10.13",
-    "@tiledesk/tiledesk-multi-worker": "^0.3.3",
+    "@tiledesk/tiledesk-multi-worker": "^0.3.2",
     "accept-language-parser": "^1.5.0",
     "app-root-path": "^3.1.0",
     "axios": "^1.7.7",

package/services/{LLMService.js → KbService.js}

@@ -2,7 +2,7 @@ const httpUtils = require('../utils/HttpUtils');
 const winston = require('../utils/winston');
 const API_ENDPOINT = process.env.API_ENDPOINT;
 
-class LLMService {
+class KBService {
 
   constructor() { }
 
@@ -101,5 +101,5 @@ class LLMService {
   }
 }
 
-const llmService = new LLMService();
-module.exports = llmService;
+const kbService = new KBService();
+module.exports = kbService;

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -54,14 +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 { DirAiCondition } = require('./directives/DirAiCondition');
-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 {
 
@@ -211,7 +210,7 @@ class DirectivesChatbotPlug {
   }
 
   async process(directive) {
-
+    const t3 = Date.now();
     let context = this.context;
     if (directive) {
       winston.verbose("(DirectivesChatbotPlug) directive['name']: " + directive["name"]);
@@ -221,13 +220,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);
@@ -452,7 +452,8 @@ class DirectivesChatbotPlug {
     else if (directive_name === Directives.WAIT) {
       new DirWait(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
-
+        const t3e = Date.now();
+        console.log(`[TIMER] Single wait executed in ${t3e - t3}ms`);
         this.process(next_dir);
       });
     }
@@ -594,18 +595,6 @@ class DirectivesChatbotPlug {
         }
       });
     }
-    else if (directive_name === Directives.AI_CONDITION) {
-      new DirAiCondition(context).execute(directive, async (stop) => {
-        if (stop == true) {
-          winston.debug("(DirectivesChatbotPlug) DirAskGPTV2 Stopping Actions on: ", directive);
-          this.theend();
-        }
-        else {
-          let next_dir = await this.nextDirective(this.directives);
-          this.process(next_dir);
-        }
-      });
-    }
     else if (directive_name === Directives.WHATSAPP_ATTRIBUTE) {
       new DirWhatsappByAttribute(context).execute(directive, async (stop) => {
         let next_dir = await this.nextDirective(this.directives);
@@ -718,18 +707,6 @@ class DirectivesChatbotPlug {
         }
       });
     }
-    else if (directive_name === Directives.WEBHOOK) {
-      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);
@@ -742,12 +719,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/DirAiPrompt.js

@@ -13,7 +13,6 @@ const httpUtils = require("../../utils/HttpUtils");
 const integrationService = require("../../services/IntegrationService");
 const { Logger } = require("../../Logger");
 const assert = require("assert");
-const quotasService = require("../../services/QuotasService");
 
 
 class DirAiPrompt {
@@ -118,7 +117,6 @@ class DirAiPrompt {
     }
     
     let key;
-    let publicKey = false;
     let ollama_integration;
 
     if (action.llm === 'ollama') {
@@ -137,13 +135,7 @@ class DirAiPrompt {
 
     } else {
       key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
-      
-      if (!key && action.llm === "openai") {
-        this.logger.native("[AI Prompt] OpenAI key not found in Integration. Retrieve shared OpenAI key.")
-        key = process.env.GPTKEY;
-        publicKey = true;
-      }
-
+  
       if (!key) {
         this.logger.error("[AI Prompt] llm key not found in integrations");
         winston.error("Error: DirAiPrompt llm key not found in integrations");
@@ -158,33 +150,6 @@ class DirAiPrompt {
       }
     }
 
-    if (publicKey === true) {
-      try {
-        let keep_going = await quotasService.checkQuoteAvailability(this.projectId, this.token)
-        if (keep_going === false) {
-          this.logger.warn("[AI Prompt] OpenAI tokens quota exceeded");
-          await this.chatbot.addParameter("flowError", "GPT Error: tokens quota exceeded");
-          if (falseIntent) {
-            await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
-            callback();
-            return;
-          }
-          callback();
-          return;
-        }
-      } catch (err) {
-        this.logger.error("An error occured on checking token quota availability");
-        await this.chatbot.addParameter("flowError", "An error occured on checking token quota availability");
-        if (falseIntent) {
-          await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
-          callback();
-          return;
-        }
-        callback();
-        return;
-      }
-    }
-
     let json = {
       question: filled_question,
       llm: action.llm,
@@ -249,14 +214,6 @@ class DirAiPrompt {
           winston.debug("DirAiPrompt resbody: ", resbody);
           answer = resbody.answer;
           this.logger.native("[AI Prompt] answer: ", answer);
-
-          // if (publicKey === true) {
-          //   let tokens_usage = {
-          //     tokens: resbody.usage.total_token,
-          //     model: json.model
-          //   }
-          //   quotasService.updateQuote(this.projectId, this.token, tokens_usage);
-          // }
         
           await this.#assignAttributes(action, answer);
 

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -11,10 +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");
-const llmService = require("../../services/LLMService");
-
-
 
 class DirAskGPTV2 {
 
@@ -178,7 +176,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 llmService.getKeyFromKbSettings(this.projectId, this.token);
+      key = await kbService.getKeyFromKbSettings(this.projectId, this.token);
     }
 
     if (!key) {
@@ -375,7 +373,7 @@ class DirAskGPTV2 {
           }
         } else {
           await this.#assignAttributes(action, answer, source);
-          llmService.addUnansweredQuestion(this.projectId, json.namespace, json.question, this.token).catch((err) => {
+          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);
           })

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) {