@tiledesk/tiledesk-tybot-connector 0.2.33 → 0.2.35

package/CHANGELOG.md

@@ -5,6 +5,16 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+# v0.2.35
+- added validation check for requests ids (support-group- && automation-request-)
+- refactorized GptTask, AskGPT and Qapla actions in order to support integrations
+- added integrated condition in GptTask 
+- added automatic JSON conversion in GptTask
+
+# v0.2.34
+- stopOnConditionMet is always true in DirJSONCondition
+- Fixes the WebRequestV2 branching
+
 # v0.2.33
 - Added lead attributes (userEmail, userPhone, userFullname, userLeadId, userCompany)
 

package/index.js

@@ -47,6 +47,7 @@ router.post('/ext/:botid', async (req, res) => {
   const requestId = message.request.request_id;
   const projectId = message.id_project;
   if (log) {console.log("message.id_project:", message.id_project);}
+
   // adding info for internal context workflow
   message.request.bot_id = botId;
   if (message.request.id_project === null || message.request.id_project === undefined) {
@@ -59,8 +60,19 @@ router.post('/ext/:botid', async (req, res) => {
   // } else {
   //   return res.status(400).send({ "success": false, "message": "Invalid request_id"})
   // }
-  res.status(200).send({"success":true});
-  
+  // res.status(200).send({"success":true});
+
+  // validate reuqestId
+  let isValid = TiledeskChatbotUtil.validateRequestId(requestId, projectId);
+  if (isValid) {
+    res.status(200).send({"success":true});
+  }
+  else {
+    res.status(400).send({"success": false, error: "Request id is invalid"});
+    // console.log("request id, projectId:", requestId, projectId)
+    // process.exit(0)
+  }
+
   const request_botId_key = "tilebot:botId_requests:" + requestId;
   await tdcache.set(
     request_botId_key,

package/models/TiledeskChatbotUtil.js

@@ -626,6 +626,34 @@ class TiledeskChatbotUtil {
         }
     }
 
+    static validateRequestId(requestId, projectId) {
+        // console.log("checking requestId:", requestId, projectId)
+        let isValid = false;
+        if (requestId.startsWith("support-group-")) {
+            const parts = requestId.split("-");
+            // console.log("parts support request:", parts);
+            if (parts.length === 4) {
+                isValid = (parts[0] === "support" && parts[1] === "group" && parts[2] === projectId && parts[3].length > 0);
+            }
+            else {
+                isValid = false;
+            }
+        } else if (requestId.startsWith("automation-request-")) {
+            const parts = requestId.split("-");
+            // console.log("parts automation request:", parts);
+            if (parts.length === 4) {
+                isValid = (parts[0] === "automation" && parts[1] === "request" && parts[2] === projectId && parts[3].length > 0);
+            }
+            else {
+                isValid = false;
+            }
+        }
+        else {
+            isValid = false;
+        }
+        return isValid;
+    }
+
 }
 
 module.exports = { TiledeskChatbotUtil };

package/package.json

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

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -587,15 +587,29 @@ class DirectivesChatbotPlug {
       });
     }
     else if (directive_name === Directives.ASK_GPT) {
-      new DirAskGPT(context).execute(directive, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
+      new DirAskGPT(context).execute(directive, async (stop) => {;
+        if (context.log) { console.log("AskGPT stop?", stop);}
+        if (stop == true) {
+          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.GPT_TASK) {
-      new DirGptTask(context).execute(directive, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
+      new DirGptTask(context).execute(directive, async (stop) => {
+        if (context.log) { console.log("AskGPT stop?", stop);}
+        if (stop == true) {
+          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.WHATSAPP_ATTRIBUTE) {

package/tiledeskChatbotPlugs/directives/DirAskGPT.js

@@ -29,28 +29,52 @@ class DirAskGPT {
       callback();
       return;
     }
-    this.go(action, () => {
-      callback();
+    this.go(action, (stop) => {
+      callback(stop);
     })
   }
 
   async go(action, callback) {
-    if (this.log) { console.log("AskGPT action:", JSON.stringify(action)); }
+    if (this.log) { console.log("DirAskGPT action:", JSON.stringify(action)); }
     if (!this.tdcache) {
       console.error("Error: DirAskGPT tdcache is mandatory");
       callback();
       return;
     }
 
-    if (!action.question) {
-      console.error("Error: DirAskGPT questionAttribute is mandatory");
-      callback();
+    let trueIntent = action.trueIntent;
+    let falseIntent = action.falseIntent;
+    let trueIntentAttributes = action.trueIntentAttributes;
+    let falseIntentAttributes = action.falseIntentAttributes;
+
+    if (this.log) {
+      console.log("DirAskGPT trueIntent", trueIntent)
+      console.log("DirAskGPT falseIntent", falseIntent)
+      console.log("DirAskGPT trueIntentAttributes", trueIntentAttributes)
+      console.log("DirAskGPT falseIntentAttributes", falseIntentAttributes)
+    }
+
+    // default values
+    let answer = "No answers";
+    let source = null;
+
+    if (!action.question || action.question === '') {
+      console.error("Error: DirAskGPT question attribute is mandatory. Executing condition false...");
+      await this.#assignAttributes(action, answer, source);
+      if (falseIntent) {
+        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+      }
+      callback(true);
       return;
     }
 
     if (!action.kbid) {
-      console.error("Error: DirAskGPT kbid is mandatory");
-      callback();
+      console.error("Error: DirAskGPT kbid attribute is mandatory. Executing condition false...");
+      await this.#assignAttributes(action, answer, source);
+      if (falseIntent) {
+        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes)
+      }
+      callback(true);
       return;
     }
 
@@ -63,106 +87,202 @@ class DirAskGPT {
     const filler = new Filler();
     const filled_question = filler.fill(action.question, requestVariables);
 
-    let trueIntent = action.trueIntent;
-    let falseIntent = action.falseIntent;
-    let trueIntentAttributes = action.trueIntentAttributes;
-    let falseIntentAttributes = action.falseIntentAttributes;
-
+    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
+    const pai_url = process.env.PAI_ENDPOINT || process.env.GPT_ENDPOINT;
     if (this.log) {
-      console.log("trueIntent",trueIntent )
-      console.log("falseIntent",falseIntent )
-      console.log("trueIntentAttributes",trueIntentAttributes )
-      console.log("falseIntentAttributes",falseIntentAttributes )
+      console.log("DirAskGPT ApiEndpoint URL: ", server_base_url);
+      console.log("DirAskGPT ApiEndpoint URL: ", pai_url);
     }
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
-    const kb_url = server_base_url + "/" + this.context.projectId + "/kbsettings";
-    if (this.log) { console.log("ApiEndpoint URL: ", kb_url); }
-    const KB_HTTPREQUEST = {
-      url: kb_url,
+    const INTEGRATIONS_HTTPREQUEST = {
+      url: server_base_url + "/" + this.context.projectId + "/integration/name/openai",
       headers: {
         'Content-Type': 'application/json',
         'Authorization': 'JWT ' + this.context.token
       },
       method: "GET"
     }
-    if (this.log) { console.log("AskGPT KB_HTTPREQUEST", KB_HTTPREQUEST); }
+    if (this.log) { console.log("DirGptTask INTEGRATIONS_HTTPREQUEST ", INTEGRATIONS_HTTPREQUEST) }
 
-    this.myrequest(
-      KB_HTTPREQUEST, async (err, resbody) => {
-        if (this.log) { console.log("AskGPT resbody:", resbody); }
+    this.#myrequest(
+      INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
         if (err) {
-          if (this.log) { console.error("AskGPT error:", err); }
           if (callback) {
-            let answer = "No answers";
-            let source = null;
-            await this.#assignAttributes(action, answer, source);
-            this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-              callback(false); // continue the flow
-            });
+            console.error("DirAskGPT get integrations error: ", err);
+            callback();
+            return;
           }
         } else if (callback) {
-          if (this.log) {
-            console.log("resbody", resbody);
-            console.log("gptkey", resbody.gptkey);
+          if (this.log) { console.log("DirAskGPT get integrations resbody: ", integration) };
+
+          let key;
+          if (integration &&
+            integration.value) {
+            key = integration.value.apikey;
           }
 
-          if (!resbody.gptkey) {
-            let answer = "No answers";
-            let source = null;
-            await this.#assignAttributes(action, answer, source);
-            this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-              callback(false); // continue the flow
-            });
+          // key not present in integrations - for retro compatibility search in kbsettings
+          if (!key) {
+
+            if (this.log) { console.log("DirAskGPT - Key not found in Integrations. Searching in kb settings..."); }
+
+            const KB_HTTPREQUEST = {
+              url: server_base_url + "/" + this.context.projectId + "/kbsettings",
+              headers: {
+                'Content-Type': 'application/json',
+                'Authorization': 'JWT ' + this.context.token
+              },
+              method: "GET"
+            }
+            if (this.log) { console.log("DirAskGPT KB_HTTPREQUEST", KB_HTTPREQUEST); }
+
+            this.#myrequest(
+              KB_HTTPREQUEST, async (err, resbody) => {
+                if (this.log) { console.log("DirAskGPT get kbs resbody:", resbody); }
+
+                if (err) {
+                  if (this.log) { console.error("DirAskGPT get kbs error:", err); }
+                  if (callback) {
+                    await this.#assignAttributes(action, answer, source);
+                    console.error("Error: DirAskGPT missing gptkey. Executing condition false...");
+                    if (falseIntent) {
+                      this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                    }
+                    callback(true);
+                    return;
+                  }
+
+                } else if (callback) {
+                  if (this.log) { console.log("DirAskGPT gptkey: " + resbody.gptkey); }
+
+                  if (!resbody.gptkey) {
+                    await this.#assignAttributes(action, answer, source);
+                    console.error("Error: DirAskGPT missing gptkey. Executing condition false...");
+                    if (falseIntent) {
+                      this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                    }
+                    callback(true);
+                    return;
+
+                  } else {
+
+                    if (this.log) { console.log("DirAskGpt - Key found in KbSettings") };
+                    
+                    key = resbody.gptkey;
+
+                    let json = {
+                      question: filled_question,
+                      kbid: action.kbid,
+                      gptkey: key
+                    };
+                    if (this.log) { console.log("DirAskGPT json:", json); }
+
+                    const HTTPREQUEST = {
+                      url: pai_url,
+                      json: json,
+                      method: "POST"
+                    }
+                    if (this.log) { console.log("DirAskGPT HTTPREQUEST", HTTPREQUEST); }
+
+                    this.#myrequest(
+                      HTTPREQUEST, async (err, resbody) => {
+                        if (this.log && err) {
+                          console.log("DirAskGPT error: ", err);
+                        }
+                        if (this.log) { console.log("DirAskGPT resbody:", resbody); }
+                        let answer = resbody.answer;
+                        let source = resbody.source_url;
+                        await this.#assignAttributes(action, answer, source);
+
+                        if (err) {
+                          if (callback) {
+                            if (falseIntent) {
+                              await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                            }
+                            callback(true);
+                            return;
+                          }
+                        }
+                        else if (resbody.success === true) {
+                          if (trueIntent) {
+                            await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                          }
+                          callback(); // se la condition è true si deve ritornare true nella callback ugualmente?
+                          return;
+                        } else {
+                          if (falseIntent) {
+                            await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                          }
+                          callback(true);
+                          return;
+                        }
+                      }
+                    )
+                  }
+                }
+              }
+            )
+
           } else {
+
+            if (this.log) { console.log("DirGptTask - Key found in Integrations") };
+
             let json = {
-              "question": filled_question,
-              "kbid": action.kbid,
-              "gptkey": resbody.gptkey
+              question: filled_question,
+              kbid: action.kbid,
+              gptkey: key
             };
-            if (this.log) {console.log("question_gpt:", json);}
+            if (this.log) { console.log("DirAskGPT json:", json); }
 
-            const url = process.env.GPT_ENDPOINT; //"https://tiledesk-playground.azurewebsites.net/api/qa"; // TODO INSERIRE IN ENV
-            if (this.log) {console.log("DirAskGPT URL", url);}
             const HTTPREQUEST = {
-              url: url,
+              url: pai_url,
               json: json,
               method: "POST"
             }
-            if (this.log) {console.log("AskGPT HTTPREQUEST", HTTPREQUEST);}
-            this.myrequest(
+            if (this.log) { console.log("DirAskGPT HTTPREQUEST", HTTPREQUEST); }
+
+            this.#myrequest(
               HTTPREQUEST, async (err, resbody) => {
                 if (this.log && err) {
-                  console.log("AskGPT error: ", err);
+                  console.log("DirAskGPT error: ", err);
                 }
-                if (this.log) {console.log("AskGPT resbody:", resbody);}
+                if (this.log) { console.log("DirAskGPT resbody:", resbody); }
                 let answer = resbody.answer;
                 let source = resbody.source_url;
                 await this.#assignAttributes(action, answer, source);
 
                 if (err) {
                   if (callback) {
-                    this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-                      callback(false); // continue the flow
-                    });
+                    if (falseIntent) {
+                      await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                    }
+                    callback(true);
+                    return;
                   }
-                } 
+                }
                 else if (resbody.success === true) {
-                  
-                  await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-                    callback(); // stop the flow
-                  })
-                } else { //resbody.success === false
-                  await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-                    callback(false); // stop the flow
-                  })
+                  if (trueIntent) {
+                    await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                  }
+                  callback(); // se la condition è true si deve ritornare true nella callback ugualmente?
+                  return;
+                } else {
+                  if (falseIntent) {
+                    await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                  }
+                  callback(true);
+                  return;
                 }
               }
             )
+
           }
+
         }
       }
     )
+
+
   }
 
   async #executeCondition(result, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, callback) {
@@ -177,23 +297,31 @@ class DirAskGPT {
     if (result === true) {
       if (trueIntentDirective) {
         this.intentDir.execute(trueIntentDirective, () => {
-          callback();
+          if (callback) {
+            callback();
+          }
         })
       }
       else {
         if (this.log) { console.log("No trueIntentDirective specified"); }
-        callback();
+        if (callback) {
+          callback();
+        }
       }
     }
     else {
       if (falseIntentDirective) {
         this.intentDir.execute(falseIntentDirective, () => {
-          callback();
+          if (callback) {
+            callback();
+          }
         });
       }
       else {
         if (this.log) { console.log("No falseIntentDirective specified"); }
-        callback();
+        if (callback) {
+          callback();
+        }
       }
     }
   }
@@ -224,7 +352,7 @@ class DirAskGPT {
     }
   }
 
-  myrequest(options, callback) {
+  #myrequest(options, callback) {
     if (this.log) {
       console.log("API URL:", options.url);
       console.log("** Options:", JSON.stringify(options));

package/tiledeskChatbotPlugs/directives/DirGptTask.js

@@ -2,6 +2,7 @@ const axios = require("axios").default;
 const { TiledeskChatbot } = require("../../models/TiledeskChatbot");
 const { Filler } = require("../Filler");
 let https = require("https");
+const { DirIntent } = require("./DirIntent");
 require('dotenv').config();
 
 class DirGptTask {
@@ -13,6 +14,7 @@ class DirGptTask {
     this.context = context;
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
+    this.intentDir = new DirIntent(context);
     this.log = context.log;
   }
 
@@ -21,30 +23,47 @@ class DirGptTask {
     let action;
     if (directive.action) {
       action = directive.action;
-      console.log("-----> GPT TASK ACTION: \n", action);
     }
     else {
       console.error("Incorrect directive: ", JSON.stringify(directive));
       callback();
       return;
     }
-    this.go(action, () => {
-      callback();
+    this.go(action, (stop) => {
+      callback(stop);
     })
   }
 
   async go(action, callback) {
-    if (this.log) { console.log("GptTask action:", JSON.stringify(action)); }
-    console.log("GptTask action:", JSON.stringify(action));
-    console.log("GptTask action model:", action.model);
+    if (this.log) { console.log("DirGptTask action:", JSON.stringify(action)); }
     if (!this.tdcache) {
       console.error("Error: DirGptTask tdcache is mandatory");
       callback();
       return;
     }
 
-    if (!action.question) {
-      console.error("Error: DirGptTask question attribute is mandatory");
+    let trueIntent = action.trueIntent;
+    let falseIntent = action.falseIntent;
+    let trueIntentAttributes = action.trueIntentAttributes;
+    let falseIntentAttributes = action.falseIntentAttributes;
+
+    if (this.log) {
+      console.log("DirAskGPT trueIntent", trueIntent)
+      console.log("DirAskGPT falseIntent", falseIntent)
+      console.log("DirAskGPT trueIntentAttributes", trueIntentAttributes)
+      console.log("DirAskGPT falseIntentAttributes", falseIntentAttributes)
+    }
+
+    // default value
+    let answer = "No answer.";
+
+    if (!action.question || action.question === '') {
+      console.error("Error: DirGptTask question attribute is mandatory. Executing condition false...")
+      if (falseIntent) {
+        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+        callback(true);
+        return;
+      }
       callback();
       return;
     }
@@ -55,15 +74,6 @@ class DirGptTask {
         this.tdcache, this.requestId
       )
 
-      if (this.log) {
-        console.log("*** GPT PARTITA ***")
-        const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-        for (const [key, value] of Object.entries(all_parameters)) {
-          if (this.log) { console.log("(askgpt) request parameter:", key, "value:", value, "type:", typeof value) }
-        }
-      }
-
-    // not necessary ?
     const filler = new Filler();
     const filled_question = filler.fill(action.question, requestVariables);
 
@@ -71,43 +81,161 @@ class DirGptTask {
     let temperature = action.temperature;
 
     if (this.log) {
-      console.log("max_tokens: ", max_tokens);
-      console.log("temperature: ", temperature);
+      console.log("DirGptTask max_tokens: ", max_tokens);
+      console.log("DirGptTask temperature: ", temperature);
     }
 
     const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
-    const kb_url = server_base_url + "/" + this.context.projectId + "/kbsettings";
-    if (this.log) { console.log("ApiEndpoint URL: ", kb_url); }
-    const KB_HTTPREQUEST = {
-      url: kb_url,
+    const openai_url = process.env.OPENAI_ENDPOINT + "/chat/completions";
+    if (this.log) {
+      console.log("DirGptTask server_base_url ", server_base_url);
+      console.log("DirGptTask openai_url ", openai_url);
+    }
+
+    const INTEGRATIONS_HTTPREQUEST = {
+      url: server_base_url + "/" + this.context.projectId + "/integration/name/openai",
       headers: {
         'Content-Type': 'application/json',
         'Authorization': 'JWT ' + this.context.token
       },
       method: "GET"
     }
-    if (this.log) { console.log("GptTask KB_HTTPREQUEST", KB_HTTPREQUEST); }
+    if (this.log) { console.log("DirGptTask INTEGRATIONS_HTTPREQUEST ", INTEGRATIONS_HTTPREQUEST) }
 
     this.#myrequest(
-      KB_HTTPREQUEST, async (err, resbody) => {
+      INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
         if (err) {
           if (callback) {
-            console.error("(httprequest) Get KnowledgeBase err:", err);
-            callback();
+            console.error("(httprequest) DirGptTask get integrations err:", err);
+            // Don't stop the flow here. Try aniway to retrieve the key from KBs
+            // callback();
+            // return;
           }
         } else if (callback) {
-          if (this.log) {
-            console.log("Get KnowledgeBase settings resbody:", resbody);
-            console.log("gptkey: ", resbody.gptkey);
+          if (this.log) { console.log("DirGptTask get integration resbody: ", integration); }
+
+          let key;
+          if (integration &&
+            integration.value) {
+            key = integration.value.apikey;
           }
 
-          let gptkey = resbody.gptkey;
+          // key not present in integrations - for retro compatibility search in kbsettings
+          if (!key) {
 
-          if (!gptkey) {
-            console.error("Error: DirGptTask gptkey attribute is mandatory");
-            callback();
+            // if (this.log) { console.log("DirGptTask - Key not found in Integrations. Searching in kb settings...")}
+            if (this.log) { console.log("DirGptTask - Key not found in Integrations. Searching in kb settings..."); }
+
+            const KB_HTTPREQUEST = {
+              url: server_base_url + "/" + this.context.projectId + "/kbsettings",
+              headers: {
+                'Content-Type': 'application/json',
+                'Authorization': 'JWT ' + this.context.token
+              },
+              method: "GET"
+            }
+            if (this.log) { console.log("DirGptTask KB_HTTPREQUEST", KB_HTTPREQUEST); }
+
+            this.#myrequest(
+              KB_HTTPREQUEST, async (err, resbody) => {
+                if (err) {
+                  if (callback) {
+                    console.error("(httprequest) DirGptTask Get KnowledgeBase err:", err);
+                    await this.#assignAttributes(action, answer);
+                    if (falseIntent) {
+                      await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                      callback(true);
+                      return;
+                    }
+                    callback();
+                    return;
+                  }
+                } else if (callback) {
+                  if (this.log) { console.log("DirGptTask Get KnowledgeBase settings resbody:", resbody); }
+
+                  if (!resbody.gptkey) {
+                    await this.#assignAttributes(action, answer);
+                    if (falseIntent) {
+                      await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                      callback(true);
+                      return;
+                    }
+                    callback();
+                    return;
+
+                  } else {
+
+                    if (this.log) { console.log("DirGptTask - Key found in KbSettings") };
+
+                    key = resbody.gptkey;
+
+                    let json = {
+                      "model": action.model,
+                      "messages": [
+                        {
+                          "role": "user",
+                          "content": filled_question
+                        }
+                      ],
+                      "max_tokens": action.max_tokens,
+                      "temperature": action.temperature
+                    }
+
+                    let message = { role: "", content: "" };
+                    if (action.context) {
+                      message.role = "system";
+                      message.content = action.context;
+                      json.messages.unshift(message);
+                    }
+                    if (this.log) { console.log("DirGptTask json: ", json) }
+
+                    const HTTPREQUEST = {
+                      url: openai_url,
+                      headers: {
+                        'Content-Type': 'application/json',
+                        'Authorization': 'Bearer ' + key
+                      },
+                      json: json,
+                      method: 'POST'
+                    }
+                    if (this.log) { console.log("DirGptTask HTTPREQUEST: ", HTTPREQUEST); }
+                    this.#myrequest(
+                      HTTPREQUEST, async (err, resbody) => {
+                        if (err) {
+                          if (this.log) {
+                            console.error("(httprequest) DirGptTask openai err:", err);
+                            console.error("(httprequest) DirGptTask openai err:", err.response.data);
+                          }
+                          await this.#assignAttributes(action, answer);
+                          if (falseIntent) {
+                            await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                            callback(true);
+                            return;
+                          }
+                          callback();
+                          return;
+                        } else {
+                          if (this.log) { console.log("DirGptTask resbody: ", JSON.stringify(resbody)); }
+                          answer = resbody.choices[0].message.content;
+                          await this.#assignAttributes(action, answer);
+                          if (trueIntent) {
+                            await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                            callback(true);
+                            return;
+                          }
+                          callback();
+                          return;
+                        }
+                      }
+                    )
+                  }
+                }
+              }
+            )
           } else {
 
+            if (this.log) { console.log("DirGptTask - Key found in Integrations") };
+
             let json = {
               "model": action.model,
               "messages": [
@@ -119,58 +247,117 @@ class DirGptTask {
               "max_tokens": action.max_tokens,
               "temperature": action.temperature
             }
-            
+
             let message = { role: "", content: "" };
             if (action.context) {
               message.role = "system";
               message.content = action.context;
               json.messages.unshift(message);
             }
+            if (this.log) { console.log("DirGptTask json: ", json) }
 
-            if (this.log) { console.log("json: ", json) }
-
-            const openai_url = process.env.OPENAI_ENDPOINT + "/chat/completions";
-            if (this.log) { console.log("OpenAi endpoint URL: ", openai_url); }
             const HTTPREQUEST = {
               url: openai_url,
               headers: {
                 'Content-Type': 'application/json',
-                'Authorization': 'Bearer ' + gptkey
+                'Authorization': 'Bearer ' + key
               },
               json: json,
               method: 'POST'
             }
-            if (this.log) { console.log(" ### GptTask HTTPREQUEST: ", HTTPREQUEST); }
+            if (this.log) { console.log("DirGptTask HTTPREQUEST: ", HTTPREQUEST); }
             this.#myrequest(
               HTTPREQUEST, async (err, resbody) => {
                 if (err) {
                   if (this.log) {
-                    console.error(" ###  (httprequest) GptTask openai err:", err);
-                    console.error(" ### (httprequest) GptTask openai err:", err.response.data); 
+                    console.error("(httprequest) DirGptTask openai err:", err);
+                    console.error("(httprequest) DirGptTask openai err:", err.response.data);
                   }
-                  let answer = "No answer.";
-                  if (this.log) { console.log("answer: ", answer);}
                   await this.#assignAttributes(action, answer);
+                  if (falseIntent) {
+                    await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                    callback(true);
+                    return;
+                  }
                   callback();
+                  return;
                 } else {
-                  if (this.log) { console.log(" ### GptTask resbody: ", JSON.stringify(resbody)); }
-                  let answer = resbody.choices[0].message.content;
-                  if (this.log) { console.log("answer: ", answer);}
-                  await this.#assignAttributes(action, answer);
+                  if (this.log) { console.log("DirGptTask resbody: ", JSON.stringify(resbody)); }
+                  answer = resbody.choices[0].message.content;
+                  // check if answer is a json
+                  let answer_json = await this.convertToJson(answer);
+                  await this.#assignAttributes(action, answer_json);
+                  if (trueIntent) {
+                    await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+                    callback(true);
+                    return;
+                  }
                   callback();
+                  return;
                 }
-
               }
             )
 
           }
-
         }
       }
     )
+  }
+
+  async convertToJson(data) {
+
+    return new Promise((resolve) => {
+      let json = null;
+      try {
+        json = JSON.parse(data);
+        resolve(json)
+      } catch(err) {
+        resolve(data)
+      }
+    })
 
   }
 
+  async #executeCondition(result, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, callback) {
+    let trueIntentDirective = null;
+    if (trueIntent) {
+      trueIntentDirective = DirIntent.intentDirectiveFor(trueIntent, trueIntentAttributes);
+    }
+    let falseIntentDirective = null;
+    if (falseIntent) {
+      falseIntentDirective = DirIntent.intentDirectiveFor(falseIntent, falseIntentAttributes);
+    }
+    if (result === true) {
+      if (trueIntentDirective) {
+        this.intentDir.execute(trueIntentDirective, () => {
+          if (callback) {
+            callback();
+          }
+        })
+      }
+      else {
+        if (this.log) { console.log("No trueIntentDirective specified"); }
+        if (callback) {
+          callback();
+        }
+      }
+    }
+    else {
+      if (falseIntentDirective) {
+        this.intentDir.execute(falseIntentDirective, () => {
+          if (callback) {
+            callback();
+          }
+        });
+      }
+      else {
+        if (this.log) { console.log("No falseIntentDirective specified"); }
+        if (callback) {
+          callback();
+        }
+      }
+    }
+  }
 
   async #assignAttributes(action, answer) {
     if (this.log) {

package/tiledeskChatbotPlugs/directives/DirJSONCondition.js

@@ -62,7 +62,7 @@ class DirJSONCondition {
     const falseIntent = action.falseIntent;
     const trueIntentAttributes = action.trueIntentAttributes;
     const falseIntentAttributes = action.falseIntentAttributes;
-    let stopOnConditionMet = action.stopOnConditionMet;
+    let stopOnConditionMet = true; //action.stopOnConditionMet;
     if (this.log) {console.log("groups:", JSON.stringify(groups));}
     if (trueIntent && trueIntent.trim() === "") {
       trueIntent = null;

package/tiledeskChatbotPlugs/directives/DirQapla.js

@@ -55,60 +55,99 @@ class DirQapla {
 
     const filler = new Filler();
     const tracking_number = filler.fill(action.trackingNumber, requestVariables);
-    // let tracking_number = await this.context.chatbot.getParameter(action.trackingNumber);
-    if (this.log) {console.log("DirQapla tracking number: ", tracking_number); }
+    if (this.log) { console.log("DirQapla tracking number: ", tracking_number); }
 
     if (!tracking_number || tracking_number === '') {
       console.error("DirQapla ERROR - tracking number is undefined or null or empty string");
       callback();
     }
 
+    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const qapla_base_url = process.env.QAPLA_ENDPOINT || "https://api.qapla.it/1.2"
-    if (this.log) { console.log("DirQapla QaplaEndpoint URL: ", qapla_base_url); }
-    const QAPLA_HTTPREQUEST = {
-      url: qapla_base_url + "/getShipment/",
+
+    const INTEGRATIONS_HTTPREQUEST = {
+      url: server_base_url + "/" + this.context.projectId + "/integration/name/qapla",
       headers: {
-        'Content-Type': 'application/json'
-      },
-      params: {
-        apiKey: action.apiKey,
-        trackingNumber: tracking_number
+        'Content-Type': 'application/json',
+        'Authorization': 'JWT ' + this.context.token
       },
       method: "GET"
     }
-    if (this.log) { console.log("DirQapla QAPLA_HTTPREQUEST", QAPLA_HTTPREQUEST); }
+    if (this.log) { console.log("DirQapla INTEGRATIONS_HTTPREQUEST ", INTEGRATIONS_HTTPREQUEST) }
 
     this.#myrequest(
-      QAPLA_HTTPREQUEST, async (err, resbody) => {
+      INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
         if (err) {
           if (callback) {
-            console.error("(httprequest) DirQapla getShipment err:", err);
+            console.error("(httprequest) DirQapla get integrations err:", err);
             callback();
           }
         } else if (callback) {
-          if (this.log) { console.log("DirQapla getShipment resbody: ", resbody); }
-
-          let status = null;;
-          let result;
-          let error;
-
-          if (resbody.getShipment &&
-              resbody.getShipment.shipments &&
-              resbody.getShipment.shipments[0] &&
-              resbody.getShipment.shipments[0].status &&
-              resbody.getShipment.shipments[0].status.qaplaStatus &&
-              resbody.getShipment.shipments[0].status.qaplaStatus.status) {
-                status = resbody.getShipment.shipments[0].status.qaplaStatus.status;
+          if (this.log) { console.log("DirQapla get integration resbody: ", integration); }
+
+          let key;
+          if (integration &&
+              integration.value) {
+                key = integration.value.apikey;
               }
-          
-          result = resbody.getShipment.result;
-          error = resbody.getShipment.error;
-          await this.#assignAttributes(action, status, result, error);
-          callback();
-        }
-      }
-    )
 
+          if (!key) {
+            if (action.apiKey) {
+              console.log("DirQapla key retrieved from the action (deprecated)");
+              key = action.apiKey;
+            } else {
+              console.log("DirQapla invalid or empty key");
+              callback();
+              return;
+            }
+          }
+
+          if (this.log) { console.log("DirQapla QaplaEndpoint URL: ", qapla_base_url); }
+          const QAPLA_HTTPREQUEST = {
+            url: qapla_base_url + "/getShipment/",
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            params: {
+              apiKey: key,
+              trackingNumber: tracking_number
+            },
+            method: "GET"
+          }
+          if (this.log) { console.log("DirQapla QAPLA_HTTPREQUEST", QAPLA_HTTPREQUEST); }
+
+          this.#myrequest(
+            QAPLA_HTTPREQUEST, async (err, resbody) => {
+              if (err) {
+                if (callback) {
+                  console.error("(httprequest) DirQapla getShipment err:", err);
+                  callback();
+                }
+              } else if (callback) {
+                if (this.log) { console.log("DirQapla getShipment resbody: ", resbody); }
+
+                let status = null;;
+                let result;
+                let error;
+
+                if (resbody.getShipment &&
+                  resbody.getShipment.shipments &&
+                  resbody.getShipment.shipments[0] &&
+                  resbody.getShipment.shipments[0].status &&
+                  resbody.getShipment.shipments[0].status.qaplaStatus &&
+                  resbody.getShipment.shipments[0].status.qaplaStatus.status) {
+                  status = resbody.getShipment.shipments[0].status.qaplaStatus.status;
+                }
+
+                result = resbody.getShipment.result;
+                error = resbody.getShipment.error;
+                await this.#assignAttributes(action, status, result, error);
+                callback();
+              }
+            }
+          )
+        }
+      })
   }
 
 

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

@@ -102,20 +102,35 @@ class DirWebRequestV2 {
         if (err) {
           if (this.log) {console.error("webRequest error:", err);}
           if (callback) {
-            this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
+            if (falseIntent) {
+              this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
+                callback(true); // stop the flow
+              });
+            }
+            else {
               callback(false); // continue the flow
-            });
+            }
           }
         }
         else if(res.status >= 200 && res.status <= 299) {
-          await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-            callback(stopOnConditionMet); // stop the flow
-          });
+          if (trueIntent) {
+            await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
+              callback(true); // stop the flow
+            });
+          }
+          else {
+            callback(false); // continue the flow
+          }
         }
         else {
-          await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
+          if (falseIntent) {
+            this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
+              callback(true); // stop the flow
+            });
+          }
+          else {
             callback(false); // continue the flow
-          });
+          }
         }
       }
     );