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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "2.0.29-rc5",
+  "version": "2.0.30",
   "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,14 @@ 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 +211,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 +221,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 +453,6 @@ class DirectivesChatbotPlug {
     else if (directive_name === Directives.WAIT) {
       new DirWait(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
-
         this.process(next_dir);
       });
     }
@@ -718,18 +718,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 +730,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/DirAiCondition.js

@@ -67,14 +67,14 @@ class DirAiCondition {
     //     "conditionIntentId": "#9b1c29c1671847dba6db561f771a142e"
     //   }
     // ]
-    let falllbackIntent = action.falllbackIntent; // non condition met block
-    let falseIntent = action.falllbackIntent; // On error block
+    let fallbackIntent = action.fallbackIntent; // non condition met block
+    let errorIntent = action.errorIntent; // On error block
     await this.checkMandatoryParameters(action).catch( async (missing_param) => {
       const error = "AiPrompt Error: '" + missing_param + "' attribute is undefined"
       this.logger.error(error);
       await this.chatbot.addParameter("flowError", error);
-      if (falseIntent) {
-        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+      if (errorIntent) {
+        await this.#executeIntent(errorIntent);
         callback(true);
         return Promise.reject();
       }
@@ -97,6 +97,7 @@ class DirAiCondition {
     });
 
     let instructions = filler.fill(action.instructions, requestVariables);
+    let prompt_header = "Reply with the label satisfying the corresponding condition or with “fallback” if all conditions are false.\nIf more than one condition is true, answer with the first label corresponding to the true condition, following the order from top to bottom."
     let condition_prompt = TiledeskChatbotUtil.AiConditionPromptBuilder(prompt_header, intents, instructions)
 
     // let raw_condition_prompt = `Reply with the label satisfying the corresponding condition or with “fallback” if all conditions are false.
@@ -116,7 +117,9 @@ class DirAiCondition {
       'Content-Type': 'application/json'
     }
     
+    let answer = "";
     let key;
+    let publicKey = false;
     let ollama_integration;
 
     if (action.llm === 'ollama') {
@@ -124,8 +127,8 @@ class DirAiCondition {
         this.logger.error("[AI Condition] Error getting ollama integration.")
         winston.error("DirAiPrompt Error getting ollama integration: ", err);
         await this.chatbot.addParameter("flowError", "Ollama integration not found");
-        if (falseIntent) {
-          await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+        if (errorIntent) {
+          await this.#executeIntent(errorIntent);
           callback(true);
           return;
         }
@@ -136,12 +139,18 @@ class DirAiCondition {
     } else {
       key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
   
+      if (!key && action.llm === "openai") {
+        this.logger.native("[AI Condition] OpenAI key not found in Integration. Retrieve shared OpenAI key.")
+        key = process.env.GPTKEY;
+        publicKey = true;
+      }
+
       if (!key) {
-        this.logger.error("[AI Condition] llm key not found in integrations");
-        winston.error("Error: DirAiPrompt llm key not found in integrations");
+        this.logger.error("[AI Condition] llm key not found");
+        winston.error("Error: DirAiPrompt llm key not found");
         await this.chatbot.addParameter("flowError", "AiPrompt Error: missing key for llm " + action.llm);
-        if (falseIntent) {
-          await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+        if (errorIntent) {
+          await this.#executeIntent(errorIntent);
           callback(true);
           return;
         }
@@ -150,6 +159,33 @@ class DirAiCondition {
       }
     }
 
+    if (publicKey === true) {
+      try {
+        let keep_going = await this.checkQuoteAvailability(this.projectId, this.token)
+        if (keep_going === false) {
+          this.logger.warn("[AI Condition] OpenAI tokens quota exceeded");
+          await this.chatbot.addParameter("flowError", "GPT Error: tokens quota exceeded");
+          if (errorIntent) {
+            await this.#executeIntent(errorIntent);
+            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 (errorIntent) {
+          await this.#executeIntent(errorIntent);
+          callback();
+          return;
+        }
+        callback();
+        return;
+      }
+    }
+
     let json = {
       question: condition_prompt,
       llm: action.llm,
@@ -201,9 +237,9 @@ class DirAiCondition {
             error = JSON.stringify(err.response.data);
           }
           this.logger.error("[AI Condition] error executing action: ", error);
-          if (falseIntent) {
-            await this.chatbot.addParameter("flowError", "AiPrompt Error: " + error);
-            await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+          if (errorIntent) {
+            await this.chatbot.addParameter("flowError", "[AI Condition] error executing action: condition label not found in intents list");
+            await this.#executeIntent(errorIntent);
             callback(true);
             return;
           }
@@ -214,38 +250,54 @@ class DirAiCondition {
           winston.debug("DirAiPrompt resbody: ", resbody);
           answer = resbody.answer;
           this.logger.native("[AI Condition] 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);
 
           if (answer === "fallback") {
-            if (falllbackIntent) {
-              this.#executeIntent(falllbackIntent, () => {
-                if (callback) {
-                    callback(true);
-                    return;
-                  }
-              });
+            if (fallbackIntent) {
+              await this.#executeIntent(fallbackIntent) 
+              if (callback) {
+                callback(true);
+                return;
+              }
             }
           }
           else {
+            let answer_found = null;
             intents.forEach( i => {
               if (i.label === answer) {
-                this.#executeIntent(i.conditionIntentId, () => {
-                if (callback) {
-                    callback(true);
-                    return;
-                  }
-              });
+                answer_found = i;
               }
             });
+            if (answer_found) {
+              await this.#executeIntent(answer_found.conditionIntentId) 
+              if (callback) {
+                callback(true);
+                return;
+              }
+            }
+            else { // if (answer === "fallback") {
+              if (fallbackIntent) {
+                await this.#executeIntent(fallbackIntent) 
+                if (callback) {
+                  callback(true);
+                  return;
+                }
+              }
+              else {
+                this.logger.error("[AI Condition] Fallback connector not found");
+              }
+            }
           }
           this.logger.error("[AI Condition] error executing action: condition label not found in intents list");
-          if (falseIntent) {
-            await this.chatbot.addParameter("flowError", "[AI Condition] error executing action: condition label not found in intents list");
-            await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
-            callback(true);
-            return;
-          }
           callback();
           return;
         }
@@ -255,7 +307,7 @@ class DirAiCondition {
 
   async checkMandatoryParameters(action) {
     return new Promise((resolve, reject) => {
-      let params = ['question', 'llm', 'model']; // mandatory params
+      let params = ['llm', 'model']; // mandatory params
       params.forEach((p) => {
         if (!action[p]) {
           reject(p)

package/tiledeskChatbotPlugs/directives/DirAiPrompt.js

@@ -250,13 +250,13 @@ class DirAiPrompt {
           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);
-          // }
+          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 {
 
@@ -99,7 +97,10 @@ class DirAskGPTV2 {
       "gpt-4o-mini":          "You are an helpful assistant for question-answering tasks. Follow these steps carefully:\n1. Answer in the same language of the user question, regardless of the retrieved context language\n2. Use ONLY the pieces of the retrieved context to answer the question.\n3. If the retrieved context does not contain sufficient information to generate an accurate and informative answer, return <NOANS>\n\n==Retrieved context start==\n{context}\n==Retrieved context end==",
       "gpt-4.1":              "You are an helpful assistant for question-answering tasks. Follow these steps carefully:\n1. Answer in the same language of the user question, regardless of the retrieved context language\n2. Use ONLY the pieces of the retrieved context to answer the question.\n3. If the retrieved context does not contain sufficient information to generate an accurate and informative answer, append <NOANS> at the end of the answer\n\n==Retrieved context start==\n{context}\n==Retrieved context end==",
       "gpt-4.1-mini":         "You are an helpful assistant for question-answering tasks. Follow these steps carefully:\n1. Answer in the same language of the user question, regardless of the retrieved context language\n2. Use ONLY the pieces of the retrieved context to answer the question.\n3. If the retrieved context does not contain sufficient information to generate an accurate and informative answer, append <NOANS> at the end of the answer\n\n==Retrieved context start==\n{context}\n==Retrieved context end==",
-      "gpt-4.1-nano":         "You are an helpful assistant for question-answering tasks. Follow these steps carefully:\n1. Answer in the same language of the user question, regardless of the retrieved context language\n2. Use ONLY the pieces of the retrieved context to answer the question.\n3. If the retrieved context does not contain sufficient information to generate an accurate and informative answer, append <NOANS> at the end of the answer\n\n==Retrieved context start==\n{context}\n==Retrieved context end=="
+      "gpt-4.1-nano":         "You are an helpful assistant for question-answering tasks. Follow these steps carefully:\n1. Answer in the same language of the user question, regardless of the retrieved context language\n2. Use ONLY the pieces of the retrieved context to answer the question.\n3. If the retrieved context does not contain sufficient information to generate an accurate and informative answer, append <NOANS> at the end of the answer\n\n==Retrieved context start==\n{context}\n==Retrieved context end==",
+      "gpt-5":                "You are an helpful assistant for question-answering tasks. Follow these steps carefully:\n1. Answer in the same language of the user question, regardless of the retrieved context language\n2. Use ONLY the pieces of the retrieved context to answer the question.\n3. If the retrieved context does not contain sufficient information to generate an accurate and informative answer, append <NOANS> at the end of the answer\n\n==Retrieved context start==\n{context}\n==Retrieved context end==",
+      "gpt-5-mini":           "You are an helpful assistant for question-answering tasks. Follow these steps carefully:\n1. Answer in the same language of the user question, regardless of the retrieved context language\n2. Use ONLY the pieces of the retrieved context to answer the question.\n3. If the retrieved context does not contain sufficient information to generate an accurate and informative answer, append <NOANS> at the end of the answer\n\n==Retrieved context start==\n{context}\n==Retrieved context end==",
+      "gpt-5-nano":           "You are an helpful assistant for question-answering tasks. Follow these steps carefully:\n1. Answer in the same language of the user question, regardless of the retrieved context language\n2. Use ONLY the pieces of the retrieved context to answer the question.\n3. If the retrieved context does not contain sufficient information to generate an accurate and informative answer, append <NOANS> at the end of the answer\n\n==Retrieved context start==\n{context}\n==Retrieved context end=="
     }
 
     let source = null;
@@ -178,7 +179,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 +376,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) {