@tiledesk/tiledesk-tybot-connector 2.0.5 → 2.0.7-rc1

package/package.json

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

package/services/IntegrationService.js

@@ -4,38 +4,63 @@ let API_ENDPOINT = process.env.API_ENDPOINT;
 
 class IntegrationService {
 
-    constructor() {}
-
-    async getKeyFromIntegrations(id_project, integration_name, token) {
-        return new Promise((resolve) => {
-    
-          const INTEGRATIONS_HTTPREQUEST = {
-            url: API_ENDPOINT + "/" + id_project + "/integration/name/" + integration_name,
-            headers: {
-              'Content-Type': 'application/json',
-              'Authorization': 'JWT ' + token
-            },
-            method: "GET"
+  constructor() { }
+
+  async getKeyFromIntegrations(id_project, integration_name, token) {
+    return new Promise((resolve) => {
+
+      const INTEGRATIONS_HTTPREQUEST = {
+        url: API_ENDPOINT + "/" + id_project + "/integration/name/" + integration_name,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "GET"
+      }
+      winston.debug("Integration HttpRequest ", INTEGRATIONS_HTTPREQUEST)
+
+      httpUtils.request(
+        INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
+          if (err) {
+            resolve(null);
+          } else {
+
+            if (integration &&
+              integration.value) {
+              resolve(integration.value.apikey)
+            }
+            else {
+              resolve(null)
+            }
           }
-          winston.debug("Integration HttpRequest ", INTEGRATIONS_HTTPREQUEST)
-    
-          httpUtils.request(
-            INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
-              if (err) {
-                resolve(null);
-              } else {
-    
-                if (integration &&
-                  integration.value) {
-                  resolve(integration.value.apikey)
-                }
-                else {
-                  resolve(null)
-                }
-              }
-            })
         })
+    })
+  }
+
+  async getIntegration(id_project, integration_name, token) {
+
+    return new Promise((resolve) => {
+
+      const INTEGRATIONS_HTTPREQUEST = {
+        url: API_ENDPOINT + "/" + id_project + "/integration/name/" + integration_name,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "GET"
       }
+      winston.debug("Integration HttpRequest ", INTEGRATIONS_HTTPREQUEST)
+
+      httpUtils.request(
+        INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
+          if (err) {
+            resolve(null);
+          } else {
+            resolve(integration)
+          }
+        })
+    })
+  }
 
 }
 

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -222,14 +222,13 @@ 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);
@@ -701,6 +700,19 @@ class DirectivesChatbotPlug {
         }
       });
     }
+    else if (directive_name === Directives.WEBHOOK) {
+      // console.log(".....DirIntent")
+      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);

package/tiledeskChatbotPlugs/directives/DirAiPrompt.js

@@ -100,21 +100,43 @@ class DirAiPrompt {
       }
     }
 
-    const AI_endpoint = process.env.AI_ENDPOINT
+    let AI_endpoint = process.env.AI_ENDPOINT;
     winston.verbose("DirAiPrompt AI_endpoint " + AI_endpoint);
 
-    let key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
-
-    if (!key) {
-      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);
-        callback(true);
+    let headers = {
+      'Content-Type': 'application/json'
+    }
+    
+    let key;
+    let ollama_integration;
+
+    if (action.llm === 'ollama') {
+      ollama_integration = await integrationService.getIntegration(this.projectId, action.llm, this.token).catch( async (err) => {
+        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);
+          callback(true);
+          return;
+        }
+        callback();
+        return;
+      });
+
+    } else {
+      key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
+  
+      if (!key) {
+        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);
+          callback(true);
+          return;
+        }
+        callback();
         return;
       }
-      callback();
-      return;
     }
 
     let json = {
@@ -133,13 +155,22 @@ class DirAiPrompt {
       json.chat_history_dict = await this.transcriptToLLM(transcript);
     }
 
+    if (action.llm === 'ollama') {
+      json.llm_key = "";
+      json.model = {
+        name: action.model,
+        url: ollama_integration.value.url,
+        token: ollama_integration.value.token
+      }
+      json.stream = false
+
+    }
+
     winston.debug("DirAiPrompt json: ", json);
 
     const HTTPREQUEST = {
-      url: AI_endpoint + '/ask',
-      headers: {
-        'Content-Type': 'application/json'
-      },
+      url: AI_endpoint + "/ask",
+      headers: headers,
       json: json,
       method: 'POST'
     }
@@ -148,7 +179,7 @@ class DirAiPrompt {
     httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
         if (err) {
-          winston.error("DirAiPrompt openai err:", err.response.data);
+          winston.error("DirAiPrompt openai err: ", err);
           await this.#assignAttributes(action, answer);
           let error;
           if (err.response?.data?.detail[0]) {

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -62,10 +62,12 @@ class DirIntent {
         "recipient": requestId,
         "text": intent_command,
         "id_project": projectId,
-        "request": {
-          "request_id": requestId,
-          "id_project": projectId
-        }
+        "request": this.supportRequest,
+        // "request": {
+        //   "request_id": requestId,
+        //   "id_project": projectId
+        //   // "bot_id": botId
+        // }
       },
       "token": this.token
     }

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -18,6 +18,7 @@ class DirReply {
     this.token = context.token;
     this.tdcache = context.tdcache;
     this.log = context.log;
+    this.supportRequest = this.context.supportRequest;
     this.logger = new Logger({ request_id: this.requestId, dev: this.context.supportRequest.draft });
 
     this.API_ENDPOINT = context.API_ENDPOINT;
@@ -44,10 +45,10 @@ class DirReply {
       callback();
       return;
     }
-    this.logger.info("1 Execute action reply for " + directive.action.text)
+    this.logger.info("Executing Action Reply ", directive.action)
 
     this.go(action, () => {
-      this.logger.info("6 End of action reply " + directive.action.text + " -> callback")
+      this.logger.info("Action Reply terminated")
       callback();
     });
   }
@@ -68,15 +69,16 @@ class DirReply {
       const filler = new Filler();
       // fill text attribute
       message.text = filler.fill(message.text, requestAttributes);
-      this.logger.info("2 Sending reply " + message.text);
 
       if (message.metadata) {
         winston.debug("DirReply filling message 'metadata':", message.metadata);
         if (message.metadata.src) {
           message.metadata.src = filler.fill(message.metadata.src, requestAttributes);
+          this.logger.debug("Filled metadata.src with ", message.metadata.src);
         }
         if (message.metadata.name) {
           message.metadata.name = filler.fill(message.metadata.name, requestAttributes);
+          this.logger.debug("Filled metadata.name with ", message.metadata.name);
         }
       }
       winston.debug("DirReply filling commands'. Message:", message);
@@ -89,6 +91,7 @@ class DirReply {
             let command = commands[i];
             if (command.type === 'message' && command.message && command.message.text) {
               command.message.text = filler.fill(command.message.text, requestAttributes);
+              this.logger.debug("Filled message.text with ", command.message.text)
               TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
               winston.debug("DirReply command filled: " + command.message.text);
             }
@@ -143,15 +146,6 @@ class DirReply {
     }
 
     let cleanMessage = message;
-    this.logger.info("3 Sending reply (text) " + cleanMessage.text);
-    this.logger.info("4 Sending reply with clean message " + JSON.stringify(cleanMessage));
-    // cleanMessage = TiledeskChatbotUtil.removeEmptyReplyCommands(message);
-    // if (!TiledeskChatbotUtil.isValidReply(cleanMessage)) {
-    //   console.log("invalid message", cleanMessage);
-    //   callback(); // cancel reply operation
-    //   return;
-    // }
-    
     cleanMessage.senderFullname = this.context.chatbot.bot.name;
     winston.debug("DirReply reply with clean message: ", cleanMessage);
 
@@ -162,10 +156,8 @@ class DirReply {
       (err) => {
         if (err) {
           winston.error("DirReply Error sending reply: ", err);
-          this.logger.error("Error sending reply: " + err);
         }
         winston.verbose("DirReply reply message sent")
-        this.logger.info("5 Reply message sent");
         const delay = TiledeskChatbotUtil.totalMessageWait(cleanMessage);
         if (delay > 0 && delay <= 30000) { // prevent long delays
           setTimeout(() => {

package/tiledeskChatbotPlugs/directives/DirWebResponse.js

@@ -38,25 +38,24 @@ class DirWebResponse {
   async go(action, callback) {
     winston.debug("DirWebResponse action: ", action);
     
-    let requestAttributes = null;
-    let status = null;
-    if (this.tdcache) {
-      requestAttributes = 
-      await TiledeskChatbot.allParametersStatic(this.tdcache, this.requestId);
-      const filler = new Filler();
-
-      try {
-        status = filler.fill(action.status, requestAttributes);
-      }
-      catch(e) {
-        winston.error("DirWebResponse Error: ", e)
-      }
-      
+    if (!this.tdcache) {
+      winston.error("DirWebResponse Error: tdcache is mandatory");
+      callback();
+      return;
     }
-
+    
+    let requestAttributes = null;
+    requestAttributes = 
+      await TiledeskChatbot.allParametersStatic(
+        this.tdcache, this.requestId
+        );
+    
+    const filler = new Filler();
+    const filled_status = filler.fill(action.status, requestAttributes);
     const json = await this.getJsonFromAction(action, filler, requestAttributes)
+
     let webResponse = {
-      status: status,
+      status: filled_status,
       payload: json
     }
 
@@ -97,42 +96,4 @@ class DirWebResponse {
 
 }
 
-
-
-/**
- * A stub to send message to the "ext/botId" endpoint, hosted by tilebot on:
- * /${TILEBOT_ROUTE}/ext/${botId}
- *
- * @param {Object} webResponse. The webhook response to send back
- * @param {Object} projectId. The projectId
- * @param {string} botId. Tiledesk botId
- * @param {string} token. User token
- */
-// function sendResponse(webResponse, projectId, botId, callback) {
-//   const url = `${WEBHOOK_URL}/${projectId}/${botId}`;
-//   const HTTPREQUEST = {
-//     url: url,
-//     headers: {
-//       'Content-Type': 'application/json'
-//     },
-//     json: webResponse,
-//     method: 'POST'
-//   };
-//   myrequest(
-//     HTTPREQUEST,
-//     function (err, resbody) {
-//       if (err) {
-//         if (callback) {
-//           callback(err);
-//         }
-//       }
-//       else {
-//         if (callback) {
-//           callback(null, resbody);
-//         }
-//       }
-//     }, false
-//   );
-// }
-
 module.exports = { DirWebResponse };

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -58,6 +58,7 @@ class Directives {
   static MOVE_TO_UNASSIGNED = "move_to_unassigned";
   static CONNECT_BLOCK = "connect_block";
   static ADD_TAGS = 'add_tags'
+  static WEBHOOK = 'webhook';
   static WEB_RESPONSE = "web_response";
 
   // static WHEN_ONLINE_MOVE_TO_AGENT = "whenonlinemovetoagent"; // DEPRECATED?

package/utils/TiledeskChatbotUtil.js

@@ -319,55 +319,31 @@ class TiledeskChatbotUtil {
                                     json_buttons.forEach(button => {
                                         if (button.value && button.type === "action" && button.action) {
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else if (button.value && button.type === "text") {
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else if (button.value && button.type === "url" && button.link) {
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else {
-                                            console.log("Invalid button. Skipping:", JSON.stringify(button) );
+                                            winston.verbose("Invalid button. Skipping:", button);
                                         }
                                     });
                                 }
-
-                                // "buttons": [
-                                //                 {
-                                //                     "type": "action",
-                                //                     "value": "Button1", // obbligatorio sempre
-                                //                     "action": "#bb347206-d639-4926-94c9-e94930623dce", // mandatory
-                                //                     "show_echo": true, // lo inserisco sempre
-                                //                     "alias": "button1 alias"
-                                //                 },
-                                //                 {
-                                //                     "type": "text",
-                                //                     "value": "Button2 text", // obbligatorio sempre
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 },
-                                //                 {
-                                //                     "type": "url",
-                                //                     "value": "Button3 link", // obbligatorio sempre
-                                //                     "link": "http://", // obbligatorio
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 }
-                                //             ]
                             }
                             catch(error) {
-                                console.error("Invalid json_buttons:", error)
+                                winston.warn("Invalid json_buttons:", error)
                             }
                             if (final_buttons && final_buttons.length > 0) {
                                 command.message.attributes.attachment.buttons = final_buttons;
                                 delete command.message.attributes.attachment.json_buttons;
                             }
                             else {
-                                console.log("Invalid json_buttons. Skipping")
+                                winston.verbose("Invalid json_buttons. Skipping...")
                             }
                         }
                     }