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

package/tiledeskChatbotPlugs/directives/DirAddTags.js

@@ -1,14 +1,16 @@
 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 req = require("express/lib/request");
 const { update } = require("../../models/faq");
 const { TiledeskClient } = require("@tiledesk/tiledesk-client");
 require('dotenv').config();
+const winston = require('../../utils/winston');
+const httpUtils = require("../../utils/HttpUtils");
 
 class DirAddTags {
 
@@ -33,13 +35,13 @@ class DirAddTags {
   }
 
   execute(directive, callback) {
-    if (this.log) { console.log("AddTags directive: ", directive); }
+    winston.verbose("Execute AddTags directive");
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive: ", JSON.stringify(directive));
+      winston.warn("Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -49,9 +51,9 @@ class DirAddTags {
   }
 
   async go(action, callback) {
-    if (this.log) { console.log("(DirAddTags) action:", JSON.stringify(action)); }
+    winston.debug("(DirAddTags) Action: ", action);
     if (!this.tdcache) {
-      console.error("Error: (DirAddTags) tdcache is mandatory");
+      winston.error("(DirAddTags) Error: tdcache is mandatory");
       callback();
       return;
     }
@@ -64,7 +66,7 @@ class DirAddTags {
     pushToList = action.pushToList
 
     if (!action.tags || action.tags === '') {
-      console.error("Error: (DirAddTags) tags attribute is mandatory")
+      winston.error("(DirAddTags) Error: tags attribute is mandatory")
       await this.chatbot.addParameter("flowError", "Add tags Error: tags attribute is mandatory");
       callback();
       return;
@@ -78,18 +80,7 @@ class DirAddTags {
 
     const filler = new Filler();
     const filled_tags = filler.fill(action.tags, requestVariables);
-  
-    if (this.log) {
-      console.log("(DirAddTags) tags: ", filled_tags);
-    }
-
-    // let request = await this.tdClient.getRequestById(this.requestId);
-    // if (this.log) { console.log('(DirAddTags) request detail: ', request) }
-    // if(!request){
-    //   if (this.log) { console.log("(DirAddTags) - request not found for request_id:", this.requestId); }
-    //   callback();
-    //   return;
-    // }
+    winston.debug("(DirAddTags) filled_tags: ", filled_tags);
 
     /** use case: CONVERSATION */
     if(target === 'request'){
@@ -106,7 +97,7 @@ class DirAddTags {
         })
       }
 
-      if (this.log) { console.log('(DirAddTags) UPDATE request with newTags', newTags) }
+      winston.debug('(DirAddTags) UPDATE request with newTags', newTags)
       let updatedRequest = await this.updateRequestWithTags(newTags)
       if(!updatedRequest){
         callback();
@@ -120,9 +111,9 @@ class DirAddTags {
       let newTags = filled_tags.split(',').filter(tag => tag !== '').map(el => el.trim())
 
       let request = await this.tdClient.getRequestById(this.requestId);
-      if (this.log) { console.log('(DirAddTags) request detail: ', request) }
+      winston.debug('(DirAddTags) request detail: ', request)
       if(!request){
-        if (this.log) { console.log("(DirAddTags) - request not found for request_id:", this.requestId); }
+        winston.debug("(DirAddTags) - request not found for request_id: " + this.requestId);
         callback();
         return;
       }
@@ -137,7 +128,7 @@ class DirAddTags {
         })
       }
 
-      if (this.log) {  console.log('(DirAddTags) UPDATE lead with newTags', newTags) }
+      winston.debug('(DirAddTags) UPDATE lead with newTags ', newTags)
       let updatedLead = await this.updateLeadWithTags(request.lead._id, newTags)
       if(!updatedLead){
         callback();
@@ -165,113 +156,6 @@ class DirAddTags {
 
   }
 
-  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) {
-      console.log("assignAttributes action:", action)
-      console.log("assignAttributes answer:", answer)
-    }
-    if (this.context.tdcache) {
-      if (action.assignReplyTo && answer) {
-        await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignReplyTo, answer);
-      }
-      // Debug log
-      if (this.log) {
-        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("(DirAddTags) request parameter:", key, "value:", value, "type:", typeof value) }
-        }
-      }
-    }
-  }
-
-  #myrequest(options, callback) {
-    if (this.log) {
-      console.log("API URL:", options.url);
-      console.log("** Options:", JSON.stringify(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 (this.log) {
-      console.log("axios_options:", JSON.stringify(axios_options));
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-      .then((res) => {
-        if (this.log) {
-          console.log("Response for url:", options.url);
-          console.log("Response headers:\n", JSON.stringify(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) => {
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
   async addNewTag(tag){
     return new Promise((resolve, reject)=> {
       const HTTPREQUEST = {
@@ -286,10 +170,11 @@ class DirAddTags {
           color: '#f0806f'
         }
       }
-      this.#myrequest(
+
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
-            console.error("(httprequest) DirAddTags add tags to list err: ", err);
+            winston.error("(httprequest) DirAddTags add tags to list err: ", err);
             resolve(true)
           } else {
             if (resbody) {
@@ -309,9 +194,7 @@ class DirAddTags {
       let json = []
       let filteredTags = tags.map((tag) => ({tag: tag, color: '#f0806f'}))
       json.push(...filteredTags)
-      if (this.log) {
-        console.log('(httprequest) DirAddTags updateRequestWithTags tags--> ', json)
-      }
+      winston.debug('(httprequest) DirAddTags updateRequestWithTags tags: ', json)
       const HTTPREQUEST = {
         url: this.API_ENDPOINT + "/" + this.context.projectId + "/requests/" + this.requestId + '/tag',
         headers: {
@@ -322,10 +205,10 @@ class DirAddTags {
         json: json
       }
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
-            console.error("(httprequest) DirAddTags patch request with new tags err: ", err);
+            winston.error("(httprequest) DirAddTags patch request with new tags err: ", err);
             resolve(true)
           } else {
             if (resbody) {
@@ -351,10 +234,10 @@ class DirAddTags {
         json: tags
       }
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
-            console.error("(httprequest) DirAddTags put lead with new tags err: ", err);
+            winston.error("(httprequest) DirAddTags put lead with new tags err: ", err);
             resolve(true)
           } else {
             if (resbody) {

package/tiledeskChatbotPlugs/directives/DirAiPrompt.js

@@ -1,11 +1,17 @@
 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");
 require('dotenv').config();
+const winston = require('../../utils/winston');
+const Utils = require("../../utils/HttpUtils");
+const utils = require("../../utils/HttpUtils");
+const httpUtils = require("../../utils/HttpUtils");
+const integrationService = require("../../services/IntegrationService");
+
 
 class DirAiPrompt {
 
@@ -17,19 +23,21 @@ class DirAiPrompt {
     this.chatbot = this.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;
   }
 
   execute(directive, callback) {
-    if (this.log) { console.log("AiPrompt directive: ", directive); }
+    winston.verbose("Execute AiPrompt directive");
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive: ", JSON.stringify(directive));
+      winston.debug("DirAiPrompt Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -39,9 +47,9 @@ class DirAiPrompt {
   }
 
   async go(action, callback) {
-    if (this.log) { console.log("DirAiPrompt action:", JSON.stringify(action)); }
+    winston.debug("DirAiPrompt action:", action);
     if (!this.tdcache) {
-      console.error("Error: DirAiPrompt tdcache is mandatory");
+      winston.error("Error: DirAiPrompt tdcache is mandatory");
       callback();
       return;
     }
@@ -53,10 +61,8 @@ class DirAiPrompt {
     let transcript;
     let answer = "No answer"
 
-    if (this.log) {
-      console.log("DirAiPrompt trueIntent", trueIntent)
-      console.log("DirAiPrompt falseIntent", falseIntent)
-    }
+    winston.debug("DirAskGPTV2 trueIntent", trueIntent)
+    winston.debug("DirAskGPTV2 falseIntent", falseIntent)
 
     await this.checkMandatoryParameters(action).catch( async (missing_param) => {
       await this.chatbot.addParameter("flowError", "AiPrompt Error: '" + missing_param + "' attribute is undefined");
@@ -84,23 +90,23 @@ class DirAiPrompt {
         this.context.tdcache,
         this.context.requestId,
         TiledeskChatbotConst.REQ_TRANSCRIPT_KEY);
-      if (this.log) { console.log("DirAiPrompt transcript string: ", transcript_string) }
+        winston.debug("DirAiPrompt transcript string: " + transcript_string)
 
       if (transcript_string) {
         transcript = await TiledeskChatbotUtil.transcriptJSON(transcript_string);
-        if (this.log) { console.log("DirAiPrompt transcript: ", transcript) }
+        winston.debug("DirAiPrompt transcript: ", transcript)
       } else {
-        if (this.log) { console.log("DirAiPrompt transcript_string is undefined. Skip JSON translation for chat history") }
+        winston.verbose("DirAiPrompt transcript_string is undefined. Skip JSON translation for chat history")
       }
     }
 
     const AI_endpoint = process.env.AI_ENDPOINT
-    if (this.log) { console.log("DirAiPrompt AI_endpoint ", AI_endpoint); }
+    winston.verbose("DirAiPrompt AI_endpoint " + AI_endpoint);
 
-    let key = await this.getKeyFromIntegrations(action.llm);
+    let key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
 
     if (!key) {
-      console.error("Error: DirAiPrompt llm key not found in integrations");
+      winston.error("Error: DirAiPrompt llm key not found in integrations");
       await this.chatbot.addParameter("flowError", "AiPrompt Error: missing key for llm " + action.llm);
       if (falseIntent) {
         await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
@@ -127,7 +133,7 @@ class DirAiPrompt {
       json.chat_history_dict = await this.transcriptToLLM(transcript);
     }
 
-    if (this.log) { console.log("DirAiPrompt json: ", json) }
+    winston.debug("DirAiPrompt json: ", json);
 
     const HTTPREQUEST = {
       url: AI_endpoint + '/ask',
@@ -137,14 +143,12 @@ class DirAiPrompt {
       json: json,
       method: 'POST'
     }
-    if (this.log) { console.log("DirAiPrompt HTTPREQUEST: ", HTTPREQUEST); }
+    winston.debug("DirAiPrompt HttpRequest: ", HTTPREQUEST);
 
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
         if (err) {
-          if (this.log) {
-            console.error("(httprequest) DirAiPrompt openai err:", err.response.data);
-          }
+          winston.error("DirAiPrompt openai err:", err.response.data);
           await this.#assignAttributes(action, answer);
           let error;
           if (err.response?.data?.detail[0]) {
@@ -164,7 +168,7 @@ class DirAiPrompt {
           return;
         } else {
 
-          if (this.log) { console.log("DirAiPrompt resbody: ", JSON.stringify(resbody)); }
+          winston.debug("DirAiPrompt resbody: ", resbody);
           answer = resbody.answer;
         
           await this.#assignAttributes(action, answer);
@@ -260,7 +264,7 @@ class DirAiPrompt {
         })
       }
       else {
-        if (this.log) { console.log("No trueIntentDirective specified"); }
+        winston.debug("DirAiPrompt No trueIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -275,7 +279,7 @@ class DirAiPrompt {
         });
       }
       else {
-        if (this.log) { console.log("No falseIntentDirective specified"); }
+        winston.debug("DirAiPrompt No falseIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -284,103 +288,16 @@ class DirAiPrompt {
   }
 
   async #assignAttributes(action, answer) {
-    if (this.log) {
-      console.log("assignAttributes action:", action)
-      console.log("assignAttributes answer:", answer)
-    }
+    winston.debug("DirAiPrompt assignAttributes action: ", action)
+    winston.debug("DirAiPrompt assignAttributes answer: " + answer)
+
     if (this.context.tdcache) {
       if (action.assignReplyTo && answer) {
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignReplyTo, answer);
       }
-      // Debug log
-      if (this.log) {
-        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("(gpttask) request parameter:", key, "value:", value, "type:", typeof value) }
-        }
-      }
     }
   }
 
-  #myrequest(options, callback) {
-    if (this.log) {
-      console.log("API URL:", options.url);
-      console.log("** Options:", JSON.stringify(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 (this.log) {
-      console.log("axios_options:", JSON.stringify(axios_options));
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-      .then((res) => {
-        if (this.log) {
-          console.log("Response for url:", options.url);
-          console.log("Response headers:\n", JSON.stringify(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) => {
-        console.error("(DirAiPrompt) Axios error: ", JSON.stringify(error));
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
-  async getKeyFromIntegrations(model) {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/" +  model,
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      if (this.log) { console.log("DirAiPrompt INTEGRATIONS_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)
-            }
-          }
-        })
-    })
-  }
-
   async getKeyFromKbSettings() {
     return new Promise((resolve) => {
 
@@ -392,15 +309,12 @@ class DirAiPrompt {
         },
         method: "GET"
       }
-      if (this.log) { console.log("DirAiPrompt KB_HTTPREQUEST", KB_HTTPREQUEST); }
+      winston.debug("DirAiPrompt KB HttpRequest", KB_HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         KB_HTTPREQUEST, async (err, resbody) => {
           if (err) {
-            console.error("(httprequest) DirAiPrompt Get KnowledgeBase err:", err.message);
-            if (this.log) {
-              console.error("(httprequest) DirAiPrompt Get KnowledgeBase full err", err);
-            }
+            winston.error("(httprequest) DirAiPrompt Get KnowledgeBase err: " + err.message);
             resolve(null);
           } else {
             if (!resbody.gptkey) {
@@ -425,9 +339,9 @@ class DirAiPrompt {
         },
         method: "GET"
       }
-      if (this.log) { console.log("DirAiPrompt check quote availability HTTPREQUEST", HTTPREQUEST); }
+      winston.debug("DirAiPrompt check quote availability HttpRequest", HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             resolve(true)
@@ -455,15 +369,15 @@ class DirAiPrompt {
         json: tokens_usage,
         method: "POST"
       }
-      if (this.log) { console.log("DirAiPrompt check quote availability HTTPREQUEST", HTTPREQUEST); }
+      winston.debug("DirAiPrompt update quote HttpRequest", HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
-            console.error("(httprequest) DirAiPrompt Increment tokens quote err: ", err);
+            winston.error("(httprequest) DirAiPrompt Increment tokens quote err: ", err);
             reject(false)
           } else {
-            if (this.log) { console.log("(httprequest) DirAiPrompt Increment token quote resbody: ", resbody); }
+            winston.debug("(httprequest) DirAiPrompt Increment token quote resbody: ", resbody);
             resolve(true);
           }
         }