Merge branch 'main' into features/self-deploy-PRE

Tiledesk · Dec 18, 2024 · 6c548b2 · 6c548b2
2 parents 9d6d9e4 + 6246f57
commit 6c548b2
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 147 deletions.
diff --git a/tybotRoute/TdCache.js b/tybotRoute/TdCache.js
@@ -21,10 +21,10 @@ class TdCache {
              * Connect redis client
              */
             this.client = redis.createClient(
-              {
-                  url: `redis://${this.redis_host}:${this.redis_port}`,
-                  password: this.redis_password
-              });
+                {
+                    url: `redis://${this.redis_host}:${this.redis_port}`,
+                    password: this.redis_password
+                });
             this.client.on('error', err => {
                 reject(err);
                 if (callback) {

diff --git a/tybotRoute/index.js b/tybotRoute/index.js
@@ -4,7 +4,7 @@ const bodyParser = require('body-parser');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { ExtApi } = require('./ExtApi.js');
 const { ExtUtil } = require('./ExtUtil.js');
-const { TdCache } = require('./TdCache.js');
+const { TdCache } = require('./TdCache_v3.js');
 const { TiledeskChatbot } = require('./models/TiledeskChatbot.js');
 const { MongodbBotsDataSource } = require('./models/MongodbBotsDataSource.js');
 // const { MongodbIntentsMachine } = require('./models/MongodbIntentsMachine.js');

diff --git a/tybotRoute/package-lock.json b/tybotRoute/package-lock.json
diff --git a/tybotRoute/package.json b/tybotRoute/package.json
@@ -29,7 +29,7 @@
     "mongoose": "^6.3.5",
     "multer": "^1.4.5-lts.1",
     "nanoid": "^3.1.25",
-    "redis": "^4.7.0",
+    "redis": "^3.1.2",
     "uuid": "^3.3.3",
     "vm2": "^3.9.13"
   },

diff --git a/tybotRoute/tiledeskChatbotPlugs/directives/DirAskGPTV2.js b/tybotRoute/tiledeskChatbotPlugs/directives/DirAskGPTV2.js
@@ -624,10 +624,10 @@ class DirAskGPTV2 {
     return new Promise((resolve) => {
       let engine = {
         name: "pinecone",
-        type: "pod",
+        type: process.env.PINECONE_TYPE,
         apikey: "",
         vector_size: 1536,
-        index_name: "pugliai-tiledesk"
+        index_name: process.env.PINECONE_INDEX
       }
       resolve(engine);
     })

diff --git a/tybotRoute/tiledeskChatbotPlugs/directives/DirMessage.js b/tybotRoute/tiledeskChatbotPlugs/directives/DirMessage.js
@@ -26,6 +26,7 @@ class DirMessage {
     this.token = context.token;
     this.log = this.context.log;
     this.supportRequest = this.context.supportRequest
+    this.hMessage = false
   }
 
   execute(directive, callback) {
@@ -70,6 +71,7 @@ class DirMessage {
       }
       if (directive.name === Directives.HMESSAGE) {
         action.attributes.subtype = "info";
+        this.hMessage = true;
       }
       // if (directive.name === Directives.HMESSAGE) {
       //   action.sender = "tiledesk";
@@ -95,7 +97,7 @@ class DirMessage {
     const message = action;
     if (this.log) {console.log("Message to extEndpoint:", JSON.stringify(message))};
 
-    if(this.supportRequest && !this.supportRequest.draft){
+    if(this.hMessage && this.supportRequest && !this.supportRequest.draft){
       callback();
       return;
     }