@tiledesk/tiledesk-tybot-connector 0.5.0-rc2 → 0.5.1-rc1

package/tiledeskChatbotPlugs/directives/DirAskGPT.js

@@ -1,10 +1,12 @@
 const axios = require("axios").default;
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { Filler } = require('../Filler');
 let https = require("https");
 const { DirIntent } = require("./DirIntent");
 require('dotenv').config();
-const winston = require('../../utils/winston')
+const winston = require('../../utils/winston');
+const httpUtils = require("../../utils/HttpUtils");
+const integrationService = require("../../services/IntegrationService");
 
 class DirAskGPT {
 
@@ -15,6 +17,8 @@ class DirAskGPT {
     this.context = context;
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
+    this.projectId = this.context.projectId;
+    this.token = this.context.token;
     this.intentDir = new DirIntent(context);
     this.API_ENDPOINT = this.context.API_ENDPOINT;
     this.log = context.log;
@@ -91,7 +95,7 @@ class DirAskGPT {
     const kb_endpoint = process.env.KB_ENDPOINT;
     winston.verbose("DirAskGPT KbEndpoint URL: ", kb_endpoint);
 
-    let key = await this.getKeyFromIntegrations();
+    let key = await integrationService.getKeyFromIntegrations(this.projectId, 'openai', this.token);
     if (!key) {
       winston.debug("(DirAskGPT) - Key not found in Integrations. Searching in kb settings...");
       key = await this.getKeyFromKbSettings();
@@ -138,7 +142,7 @@ class DirAskGPT {
     }
     winston.debug("(DirAskGPT) HttpRequest", HTTPREQUEST); 
     
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
 
         winston.debug("(DirAskGPT) resbody:", resbody); 
@@ -240,75 +244,6 @@ class DirAskGPT {
     }
   }
 
-  #myrequest(options, callback) {
-    let axios_options = {
-      url: options.url,
-      method: options.method,
-      params: options.params,
-      headers: options.headers
-    }
-    if (options.json !== null) {
-      axios_options.data = options.json
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-      .then((res) => {
-        if (res && res.status == 200 && res.data) {
-          if (callback) {
-            callback(null, res.data);
-          }
-        }
-        else {
-          if (callback) {
-            callback(new Error("Response status is not 200"), null);
-          }
-        }
-      })
-      .catch((error) => {
-        winston.error("(DirAskGPT) Axios error: ", error.response.data);
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
-  async getKeyFromIntegrations() {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("(DirAskGPT) Integrations HttpRequest ", INTEGRATIONS_HTTPREQUEST)
-
-      this.#myrequest(
-        INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
-          if (err) {
-            if (this.log) { winston.error("DirAskGPT Get integrations error ", err); }
-            resolve(null);
-          } else {
-
-            if (integration &&
-              integration.value) {
-              resolve(integration.value.apikey)
-            }
-            else {
-              resolve(null)
-            }
-          }
-        })
-    })
-  }
-
   async getKeyFromKbSettings() {
     return new Promise((resolve) => {
 
@@ -322,7 +257,7 @@ class DirAskGPT {
       }
       winston.debug("(DirAskGPT) KB HttpRequest ", KB_HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         KB_HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.error("DirAskGPT Get kb settings error ", err?.response?.data);

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -1,13 +1,15 @@
 const axios = require("axios").default;
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { Filler } = require('../Filler');
 let https = require("https");
 const { DirIntent } = require("./DirIntent");
-const { TiledeskChatbotConst } = require("../../models/TiledeskChatbotConst");
-const { TiledeskChatbotUtil } = require("../../models/TiledeskChatbotUtil");
+const { TiledeskChatbotConst } = require("../../engine/TiledeskChatbotConst");
+const { TiledeskChatbotUtil } = require("../../utils/TiledeskChatbotUtil");
 const assert = require("assert");
 require('dotenv').config();
 const winston = require('../../utils/winston');
+const httpUtils = require("../../utils/HttpUtils");
+const integrationService = require("../../services/IntegrationService");
 
 class DirAskGPTV2 {
 
@@ -19,6 +21,8 @@ class DirAskGPTV2 {
     this.chatbot = context.chatbot;
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
+    this.projectId = this.context.projectId;
+    this.token = this.context.token;
     this.intentDir = new DirIntent(context);
     this.API_ENDPOINT = this.context.API_ENDPOINT;
     this.log = context.log;
@@ -137,14 +141,14 @@ class DirAskGPTV2 {
         transcript = await TiledeskChatbotUtil.transcriptJSON(transcript_string);
         winston.debug("DirAskGPTV2 transcript ", transcript)
       } else {
-        winston.debug("DirAskGPT transcript_string is undefined. Skip JSON translation for chat history")
+        winston.verbose("DirAskGPT transcript_string is undefined. Skip JSON translation for chat history")
       }
     }
 
     const kb_endpoint = process.env.KB_ENDPOINT_QA
     winston.verbose("DirAskGPTV2  KbEndpoint URL: " + kb_endpoint);
 
-    let key = await this.getKeyFromIntegrations();
+    let key = await integrationService.getKeyFromIntegrations(this.projectId, 'openai', this.token);
     if (!key) {
       winston.verbose("DirAskGPTV2 - Key not found in Integrations. Searching in kb settings...");
       key = await this.getKeyFromKbSettings();
@@ -264,7 +268,7 @@ class DirAskGPTV2 {
     }
     winston.debug("DirAskGPTV2 HttpRequest: ", HTTPREQUEST);
 
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
         
         if (err) {
@@ -367,79 +371,6 @@ class DirAskGPTV2 {
     }
   }
 
-  #myrequest(options, callback) {
-    winston.debug("DirAskGPTV2 API URL:", options.url);
-    winston.debug("DirAskGPTV2 Options:", options);
-    let axios_options = {
-      url: options.url,
-      method: options.method,
-      params: options.params,
-      headers: options.headers
-    }
-    if (options.json !== null) {
-      axios_options.data = options.json
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-      .then((res) => {
-        winston.debug("DirAskGPTV2 Response for url: " + options.url);
-        winston.debug("DirAskGPTV2 Response headers: \n", res.headers);
-        if (res && res.status == 200 && res.data) {
-          if (callback) {
-            callback(null, res.data);
-          }
-        }
-        else {
-          if (callback) {
-            callback(new Error("Response status is not 200"), null);
-          }
-        }
-      })
-      .catch((error) => {
-        winston.error("DirAskGPTV2 Axios error: ", error.response.data);
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
-  async getKeyFromIntegrations() {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("DirAskGPTV2 Integration HttpRequest ", INTEGRATIONS_HTTPREQUEST)
-
-      this.#myrequest(
-        INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
-          if (err) {
-            winston.error("DirAskGPTV2 Get integrations error ", err); 
-            resolve(null);
-          } else {
-
-            if (integration &&
-              integration.value) {
-              resolve(integration.value.apikey)
-            }
-            else {
-              resolve(null)
-            }
-          }
-        })
-    })
-  }
-
   async getKeyFromKbSettings() {
     return new Promise((resolve) => {
 
@@ -453,7 +384,7 @@ class DirAskGPTV2 {
       }
       winston.debug("DirAskGPTV2 KB HttpRequest", KB_HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         KB_HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.error("DirAskGPTV2 Get kb settings error ", err?.response?.data);
@@ -483,7 +414,7 @@ class DirAskGPTV2 {
       }
       winston.debug("DirAskGPTV2 check quote availability HttpRequest", HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.error("DirAskGPTV2 Check quote availability err: ", err);
@@ -514,7 +445,7 @@ class DirAskGPTV2 {
       }
       winston.debug("DirAskGPTV2 update quote HttpRequest ", HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.error("DirAskGPTV2 Increment tokens quote err: ", err);
@@ -586,7 +517,7 @@ class DirAskGPTV2 {
         method: "GET"
       }
       winston.debug("DirAskGPTV2 get all namespaces HttpRequest", HTTPREQUEST);
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, namespaces) => {
           if (err) {
             winston.error("DirAskGPTV2 get all namespaces err: ", err);

package/tiledeskChatbotPlugs/directives/DirAssign.js

@@ -1,4 +1,4 @@
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskExpression } = require('../../TiledeskExpression');
 const ms = require('minimist-string');
 const { Filler } = require('../Filler');

package/tiledeskChatbotPlugs/directives/DirAssignFromFunction.js

@@ -1,6 +1,6 @@
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const ms = require('minimist-string');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot.js');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot.js');
 const winston = require('../../utils/winston')
 
 class DirAssignFromFunction {

package/tiledeskChatbotPlugs/directives/DirAssistant.js

@@ -1,9 +1,11 @@
 let axios = require('axios');
 let https = require("https");
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { DirIntent } = require('./DirIntent');
 const winston = require('../../utils/winston')
+const httpUtils = require('../../utils/HttpUtils');
+const integrationService = require('../../services/IntegrationService');
 
 class DirAssistant {
   constructor(context) {
@@ -13,6 +15,8 @@ class DirAssistant {
     this.context = context;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
+    this.projectId = this.context.projectId;
+    this.token = this.context.token;
     this.intentDir = new DirIntent(context);
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.log = context.log;
@@ -260,7 +264,7 @@ class DirAssistant {
       return process.env.TEST_OPENAI_APIKEY
     }
     else {
-      return await this.getKeyFromIntegrations();
+      return await integrationService.getKeyFromIntegrations(this.projectId, 'openai', this.token);
     }
   }
 
@@ -280,7 +284,7 @@ class DirAssistant {
         timeout: this.timeout
       };
       winston.debug("(DirAssistant) DirAssistant HttpRequest", HTTPREQUEST);
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, res) => {
           let status = res.status;
           if (err) {
@@ -340,7 +344,7 @@ class DirAssistant {
         timeout: this.timeout
       };
       winston.debug("(DirAssistant) HttpRequest: ", HTTPREQUEST);
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, res) => {
           let status = res.status;
           if (err) {
@@ -401,7 +405,7 @@ class DirAssistant {
         timeout: this.timeout
       };
       winston.debug("(DirAssistant) HttpRequest: ", HTTPREQUEST);
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, res) => {
           if (err) {
             winston.error("(DirAssistant) error: ", err);
@@ -409,6 +413,7 @@ class DirAssistant {
           }
           else if(res?.status >= 200 && res?.status <= 299) {
             winston.debug("(DirAddTags) got response data: ", res.data);
+            // let return_body = res.data;
             resolve(res.data);
           }
           else {
@@ -435,7 +440,7 @@ class DirAssistant {
         timeout: this.timeout
       };
       winston.debug("(DirAssistant) HttpRequest: ", HTTPREQUEST);
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, res) => {
           if (err) {
             winston.error("(DirAssistant) error: ", err);
@@ -443,6 +448,7 @@ class DirAssistant {
           }
           else if(res?.status >= 200 && res?.status <= 299) {
             winston.debug("(DirAddTags) got response data: ", res.data);
+            // let return_body = res.data;
             resolve(res.data);
           }
           else {
@@ -469,7 +475,7 @@ class DirAssistant {
         timeout: this.timeout
       };
       winston.debug("(DirAssistant) HttpRequest: ", HTTPREQUEST);
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, res) => {
           if (err) {
             winston.error("(DirAssistant) error: ", err);
@@ -488,105 +494,6 @@ class DirAssistant {
       );
     });
   }
-
-  async getKeyFromIntegrations() {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("(DirAssistant) Integrations HttpRequest ", INTEGRATIONS_HTTPREQUEST)
-
-      this.#myrequest(
-        INTEGRATIONS_HTTPREQUEST, async (err, res) => {
-          if (err) {
-            resolve(null);
-          } else {
-            let integration = res.data;
-            if (integration &&
-              integration.value) {
-              resolve(integration.value.apikey)
-            }
-            else {
-              resolve(null)
-            }
-          }
-        })
-    })
-  }
-
-  #myrequest(options, callback) {
-    try {
-      let axios_options = {
-        url: options.url,
-        method: options.method,
-        params: options.params,
-        headers: options.headers,
-        timeout: options.timeout
-      }
-    
-      if (options.json !== null) {
-        axios_options.data = options.json
-      }
-
-      if (options.url.startsWith("https:")) {
-        const httpsAgent = new https.Agent({
-          rejectUnauthorized: false,
-        });
-        axios_options.httpsAgent = httpsAgent;
-      }
-    
-      axios(axios_options)
-      .then((res) => {
-        if (callback) {
-          callback(null, res);
-        }
-      })
-      .catch( (err) => {
-        if (callback) {
-          let status = 1000;
-          let cache = [];
-          let str_error = JSON.stringify(err, function(key, value) { // try to use a separate function
-            if (typeof value === 'object' && value != null) {
-              if (cache.indexOf(value) !== -1) {
-                return;
-              }
-              cache.push(value);
-            }
-            return value;
-          });
-          let error = JSON.parse(str_error) // "status" disappears without this trick
-          let errorMessage = JSON.stringify(error);
-          if (error.status) {
-            status = error.status;
-          }
-          if (error.message) {
-            errorMessage = error.message;
-          }
-          let data = null;
-          if (err.response) {
-            data =  err.response.data;
-          }
-          callback(
-            {
-              status: status,
-              data: data,
-              error: errorMessage
-            }, data
-          );
-        }
-      });
-    }
-    catch(error) {
-      winston.error("(DirAssistant) Axios error: ", error);
-    }
-  }
-
 }
 
 

package/tiledeskChatbotPlugs/directives/DirBrevo.js

@@ -1,10 +1,11 @@
 const axios = require("axios").default;
-const { TiledeskChatbot } = require("../../models/TiledeskChatbot");
+const { TiledeskChatbot } = require("../../engine/TiledeskChatbot");
 const { Filler } = require("../Filler");
 const { DirIntent } = require("./DirIntent");
 let https = require("https");
 require('dotenv').config();
 const winston = require('../../utils/winston');
+const integrationService = require("../../services/IntegrationService");
 
 class DirBrevo {
 
@@ -15,6 +16,8 @@ class DirBrevo {
     this.context = context;
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
+    this.projectId = this.context.projectId;
+    this.token = this.context.token;
     this.intentDir = new DirIntent(context);
     this.API_ENDPOINT = this.context.API_ENDPOINT;
     this.log = context.log;
@@ -74,7 +77,7 @@ class DirBrevo {
     const brevo_base_url = process.env.BREVO_ENDPOINT || "https://api.brevo.com/v3"
     winston.debug("(DirBrevo) brevo_base_url: " + brevo_base_url);
 
-    let key = await this.getKeyFromIntegrations();
+    let key = await integrationService.getKeyFromIntegrations(this.projectId, 'Brevo', this.token);
     winston.debug("(DirBrevo) key: ", key)
     if (!key) {
       winston.debug("(DirBrevo)  - Key not found in Integrations.");
@@ -285,38 +288,6 @@ class DirBrevo {
       }
     }
   }
-
-  async getKeyFromIntegrations() {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/Brevo",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("(DirBrevo) Inteegration HttpRequest ", INTEGRATIONS_HTTPREQUEST) 
-
-      this.#myrequest(
-        INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
-          if (err) {
-            resolve(null);
-          } else {
-
-            if (integration &&
-              integration.value) {
-              resolve(integration.value.apikey)
-            }
-            else {
-              resolve(null)
-            }
-          }
-        })
-    })
-  }
-
 }
 
 module.exports = { DirBrevo }

package/tiledeskChatbotPlugs/directives/DirCaptureUserReply.js

@@ -1,5 +1,5 @@
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { DirIntent } = require('./DirIntent');
 const winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirClearTranscript.js

@@ -1,5 +1,5 @@
 
-const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
+const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
 
 class DirClearTranscript {
 

package/tiledeskChatbotPlugs/directives/DirClose.js

@@ -1,6 +1,6 @@
 
 const { TiledeskClient } = require("@tiledesk/tiledesk-client");
-const { TiledeskChatbotConst } = require("../../models/TiledeskChatbotConst");
+const { TiledeskChatbotConst } = require("../../engine/TiledeskChatbotConst");
 const winston = require('../../utils/winston');
 
 class DirClose {

package/tiledeskChatbotPlugs/directives/DirCode.js

@@ -1,4 +1,4 @@
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskExpression } = require('../../TiledeskExpression');
 const { TiledeskRequestVariables } = require('../TiledeskRequestVariables');
 const winston = require('../../utils/winston');

package/tiledeskChatbotPlugs/directives/DirCondition.js

@@ -1,5 +1,5 @@
 const { DirIntent } = require('./DirIntent');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskExpression } = require('../../TiledeskExpression');
 const ms = require('minimist-string');
 const winston = require('../../utils/winston');