@tiledesk/tiledesk-tybot-connector 0.2.48 → 0.2.50-rc1

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+# 0.2.50-rc1
+- Added quotes for GPT actions
+
+# v0.2.49
+- resplacebotv2, added "/" + blockName (so the blockname will be implicitly executed), removing the need to specify the "/" in the body of the replacebot editor
+- Never add "guest#" as lead userFullname
+
 # v0.2.48
 - resplacebotv2
 - fixed jsoncondition expression. added ? in some "static OPERATORS" (i.e. contains) to correctly evaluate undefined operands

package/TiledeskExpression.js

@@ -282,11 +282,11 @@ class TiledeskExpression {
                 const applyPattern = operator.applyPattern;
                 let operand = operands[i + 1].isVariable ? TiledeskExpression.variableOperand(operands[i + 1].value) : TiledeskExpression.quotedString(operands[i + 1].value);
                 operand = operands[i + 1].function ? TiledeskExpression.applyFunctionToOperand(operand, operands[i + 1].function) : operand;
-                console.log("1. expression is:", expression)
-                console.log("operand is:", operand)
+                // console.log("1. expression is:", expression)
+                // console.log("operand is:", operand)
                 
                 expression = applyPattern.replace("#1", expression).replace("#2", operand);
-                console.log("2. expression is:", expression)
+                // console.log("2. expression is:", expression)
                 
             }
             return expression;

package/models/TiledeskChatbotUtil.js

@@ -458,22 +458,23 @@ class TiledeskChatbotUtil {
                     if (message.request.lead.email) {
                         await chatbot.addParameter("userEmail", message.request.lead.email);
                     }
-                    if (message.request.lead.fullname) {
+                    if (message.request.lead.fullname && !message.request.lead.fullname.startsWith("guest#")) {
+                        // worth saving
                         try {
-                            const current_userFullname = await chatbot.getParameter("userFullname");
-                            if (current_userFullname && current_userFullname.startsWith("guest#")) {
+                            // const current_userFullname = await chatbot.getParameter("userFullname");
+                            // if (current_userFullname && current_userFullname.startsWith("guest#")) { // replace if exists as guest#
+                            //     await chatbot.addParameter("userFullname", message.request.lead.fullname);
+                            // }
+                            // else if (!current_userFullname) {
                                 await chatbot.addParameter("userFullname", message.request.lead.fullname);
-                            }
-                            else if (!current_userFullname) {
-                                await chatbot.addParameter("userFullname", message.request.lead.fullname);
-                            }
+                            // }
                         }
                         catch(error) {
                             console.error("Error on setting userFullname:", error);
                         }
                     }
                     else {
-                        console.log("!lead.fullname");
+                        // console.log("!lead.fullname");
                     }
                     // console.log("Getting userPhone:", JSON.stringify(message.request));
                     if (message.request.lead.phone) {

package/package.json

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

package/tiledeskChatbotPlugs/directives/DirAskGPT.js

@@ -42,6 +42,7 @@ class DirAskGPT {
       return;
     }
 
+    let publicKey = false;
     let trueIntent = action.trueIntent;
     let falseIntent = action.falseIntent;
     let trueIntentAttributes = action.trueIntentAttributes;
@@ -103,6 +104,7 @@ class DirAskGPT {
     if (!key) {
       if (this.log) { console.log("DirGptTask - Retrieve public gptkey")}
       key = process.env.GPTKEY;
+      publicKey = true;
     }
 
     if (!key) {
@@ -117,6 +119,15 @@ class DirAskGPT {
       return;
     }
 
+    if (publicKey === true) {
+      let keep_going = await this.checkQuoteAvailability(server_base_url);
+      if (keep_going === false) {
+        if (this.log) { console.log("DirGptTask - Quota exceeded for tokens. Skip the action")}
+        callback();
+        return;
+      }
+    }
+
     let json = {
       question: filled_question,
       kbid: action.kbid,
@@ -153,6 +164,12 @@ class DirAskGPT {
           }
         }
         else if (resbody.success === true) {
+
+          // if (publicKey === true) {
+          //   let token_usage = resbody.usage.total_tokens;
+          //   this.updateQuote(server_base_url, token_usage);
+          // }
+          
           if (trueIntent) {
             await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
             callback(true);

package/tiledeskChatbotPlugs/directives/DirGptTask.js

@@ -42,6 +42,7 @@ class DirGptTask {
       return;
     }
 
+    let publicKey = false;
     let trueIntent = action.trueIntent;
     let falseIntent = action.falseIntent;
     let trueIntentAttributes = action.trueIntentAttributes;
@@ -93,7 +94,6 @@ class DirGptTask {
     }
 
     let key = await this.getKeyFromIntegrations(server_base_url);
-
     if (!key) {
       if (this.log) { console.log("DirGptTask - Key not found in Integrations. Searching in kb settings..."); }
       key = await this.getKeyFromKbSettings(server_base_url);
@@ -102,12 +102,12 @@ class DirGptTask {
     if (!key) {
       if (this.log) { console.log("DirGptTask - Retrieve public gptkey")}
       key = process.env.GPTKEY;
+      publicKey = true;
     }
 
     if (!key) {
       console.error("DirGptTask gptkey is mandatory");
       await this.#assignAttributes(action, answer);
-
       if (falseIntent) {
         await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
         callback(true);
@@ -117,6 +117,15 @@ class DirGptTask {
       return;
     }
 
+    if (publicKey === true) {
+      let keep_going = await this.checkQuoteAvailability(server_base_url);
+      if (keep_going === false) {
+        if (this.log) { console.log("DirGptTask - Quota exceeded for tokens. Skip the action")}
+        callback();
+        return;
+      }
+    }
+
     let json = {
       model: action.model,
       messages: [
@@ -168,6 +177,12 @@ class DirGptTask {
           // check if answer is a json
           let answer_json = await this.convertToJson(answer);
           await this.#assignAttributes(action, answer_json);
+
+          if (publicKey === true) {
+            let token_usage = resbody.usage.total_tokens;
+            this.updateQuote(server_base_url, token_usage);
+          }
+
           if (trueIntent) {
             await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
             callback(true);
@@ -245,9 +260,6 @@ class DirGptTask {
       if (action.assignReplyTo && answer) {
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignReplyTo, answer);
       }
-      // if (action.assignSourceTo && source) {
-      //   await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignSourceTo, source);
-      // }
       // Debug log
       if (this.log) {
         const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
@@ -366,6 +378,64 @@ class DirGptTask {
     })
   }
 
+  async checkQuoteAvailability(server_base_url) {
+    return new Promise((resolve) => {
+
+      const HTTPREQUEST = {
+        url: server_base_url + "/" + this.context.projectId + "/quotes/tokens",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + this.context.token
+        },
+        method: "GET"
+      }
+      if (this.log) { console.log("DirGptTask check quote availability HTTPREQUEST", HTTPREQUEST); }
+
+      this.#myrequest(
+        HTTPREQUEST, async (err, resbody) => {
+          if (err) {
+            console.error("(httprequest) DirGptTask Check quote availability err: ", err);
+            resolve(true)
+          } else {
+            if (resbody.isAvailable === true) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          }
+        }
+      )
+    })
+  }
+
+  async updateQuote(server_base_url, tokens) {
+    return new Promise((resolve) => {
+
+      const HTTPREQUEST = {
+        url: server_base_url + "/" + this.context.projectId + "/quotes/incr/tokens",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + this.context.token
+        },
+        json: { tokens: tokens },
+        method: "POST"
+      }
+      if (this.log) { console.log("DirGptTask check quote availability HTTPREQUEST", HTTPREQUEST); }
+
+      this.#myrequest(
+        HTTPREQUEST, async (err, resbody) => {
+          if (err) {
+            console.error("(httprequest) DirGptTask Increment tokens quote err: ", err);
+            rejects(false)
+          } else {
+            console.log("(httprequest) DirGptTask Increment token quote resbody: ", resbody);
+            resolve(true);
+          }
+        }
+      )
+    })
+  }
+
 }
 
 module.exports = { DirGptTask }

package/tiledeskChatbotPlugs/directives/DirReplaceBotV2.js

@@ -48,7 +48,7 @@ class DirReplaceBotV2 {
         if (this.log) {console.log("Sending hidden /start message to bot in dept");}
         const message = {
           type: "text",
-          text: blockName,
+          text: "/" + blockName,
           attributes : {
             subtype: "info"
           }