@tiledesk/tiledesk-tybot-connector 2.0.46 → 2.0.47

package/package.json

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

package/services/KbService.js

@@ -73,9 +73,7 @@ class KBService {
     })
   }
 
-  async addUnansweredQuestion(id_project, namespace, question, token) {
-    
-    const json = { namespace, question };
+  async addUnansweredQuestion(id_project, data, token) {
     
     return new Promise((resolve, reject) => {
       const http_request = {
@@ -85,7 +83,7 @@ class KBService {
           'Authorization': 'JWT ' + token
         },
         method: "POST",
-        json: json
+        json: data
       }
       winston.debug("Kb HttpRequest", http_request);
 
@@ -98,6 +96,28 @@ class KBService {
       });
     });
   }
+
+  async addAnsweredQuestion(id_project, data, token) {
+    return new Promise((resolve, reject) => {
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/kb/answered/",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        json: data,
+        method: "POST"
+      }
+      winston.debug("Kb HttpRequest", http_request);
+      httpUtils.request(http_request, (err, response) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(response);
+        }
+      });
+    });
+  }
 }
 
 const kbService = new KBService();

package/tiledeskChatbotPlugs/directives/DirAddTags.js

@@ -80,19 +80,14 @@ class DirAddTags {
     const filled_tags = filler.fill(action.tags, requestVariables);
     winston.debug("(DirAddTags) filled_tags: ", filled_tags);
 
-    console.log("action.tags: ", action.tags);
-    console.log("filled_tags: ", filled_tags);
-
     /** use case: CONVERSATION */
     if(target === 'request'){
       
       let newTags = filled_tags.split(',').filter(tag => tag !== '').map(el => el.trim())
       this.logger.native("[Add Tag] Adding following tags to conversation: ", newTags)
-      console.log("newTags: ", newTags);
 
       if(action.pushToList){
         newTags.forEach(async (tag) => {
-          console.log("add new tag: ", tag);
           let tags = await this.addNewTag(tag)
           if(!tags){
             callback();
@@ -102,7 +97,6 @@ class DirAddTags {
       }
 
       winston.debug('(DirAddTags) UPDATE request with newTags', newTags)
-      console.log("update request with newTags: ", newTags);
       let updatedRequest = await this.updateRequestWithTags(newTags)
       this.logger.native("[Add Tag] Tags added to conversation")
       if(!updatedRequest){
@@ -202,9 +196,7 @@ class DirAddTags {
     return new Promise((resolve) => {
       let json = []
       let filteredTags = tags.map((tag) => ({tag: tag, color: '#f0806f'}))
-      console.log("tags: ", tags);
       json.push(...filteredTags)
-      console.log("json: ", json);
       winston.debug('(httprequest) DirAddTags updateRequestWithTags tags: ', json)
       const HTTPREQUEST = {
         url: this.API_ENDPOINT + "/" + this.context.projectId + "/requests/" + this.requestId + '/tag',

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -19,6 +19,7 @@ const default_engine = require('../../config/kb/engine');
 const default_engine_hybrid = require('../../config/kb/engine.hybrid');
 const default_embedding = require("../../config/kb/embedding");
 const PromptManager = require('../../config/kb/prompt/rag/PromptManager');
+const { MODELS_MULTIPLIER } = require("../../utils/aiUtils");
 
 //const ragPromptManager = new PromptManager(path.join(__dirname, '../../config/kb/prompt/rag'));
 const ragPromptManager = new PromptManager(path.join(__dirname, '../../config/kb/prompt/rag'));
@@ -451,15 +452,31 @@ class DirAskGPTV2 {
 
           } else {
             await this.#assignAttributes(action, resbody.answer, resbody.source, resbody.content_chunks);
+            let tokens = resbody.prompt_token_size;
             if (publicKey === true && !chunks_only) {
+
               let tokens_usage = {
                 tokens: resbody.prompt_token_size,
                 model: json.model
               }
+
+              let multiplier = MODELS_MULTIPLIER[json.model.name] ?? 1;
+              tokens = tokens * multiplier;
               quotasService.updateQuote(this.projectId, this.token, tokens_usage).catch((err) => {
                 winston.error("Error updating quota: ", err);
               })
             }
+            
+            const data = {
+              namespace: json.namespace,
+              question: json.question,
+              answer: resbody.answer,
+              request_id: this.requestId,
+              tokens: tokens
+            }
+            kbService.addAnsweredQuestion(this.projectId, data, this.token).catch((err) => {
+              winston.error("Error adding answered question: ", err);
+            })
   
             if (trueIntent) {
               await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
@@ -473,7 +490,13 @@ class DirAskGPTV2 {
           winston.info("DirAskGPTV2 resbody else case: ", resbody);
           await this.#assignAttributes(action, answer, source);
           if (!skip_unanswered) {
-            kbService.addUnansweredQuestion(this.projectId, json.namespace, json.question, this.token).catch((err) => {
+            // console.log("this.context", JSON.stringify(this.context, null, 2));
+            const data = {
+              namespace: json.namespace,
+              question: json.question,
+              request_id: this.requestId
+            }
+            kbService.addUnansweredQuestion(this.projectId, data, this.token).catch((err) => {
               winston.error("DirAskGPTV2 - Error adding unanswered question: ", {
                 status: err.response?.status,
                 statusText: err.response?.statusText,

package/tiledeskChatbotPlugs/directives/DirIteration.js

@@ -22,7 +22,6 @@ class DirIteration {
 
   execute(directive, callback) {
     winston.verbose("Execute Iteration directive");
-    console.log("directive: ", directive);
     let action;
     if (directive.action) {
       action = directive.action;
@@ -83,7 +82,6 @@ class DirIteration {
    */
   async #initializeIteration(action, actionId, callback) {
     winston.debug("[Iteration] Initializing iteration state");
-    console.log("[Iteration] Initializing iteration state");
     
     const iterable = action.iterable;
     const goToIntent = action.goToIntent;
@@ -96,7 +94,6 @@ class DirIteration {
 
     if (!iterableValue) {
       winston.verbose("[Iteration] Iterable object is undefined");
-      console.log("[Iteration] Iterable object is undefined");
       this.logger.warn("[Iteration] Iterable object is undefined");
       callback(true);
       return;
@@ -107,7 +104,6 @@ class DirIteration {
     
     if (!iterableArray) {
       winston.verbose("[Iteration] Could not convert iterable to array");
-      console.log("[Iteration] Could not convert iterable to array");
       this.logger.error(`[Iteration] Could not convert iterable '${iterable}' to array | type: ${typeof iterableValue}`);
       callback(true);
       return;
@@ -115,7 +111,6 @@ class DirIteration {
 
     if (iterableArray.length === 0) {
       winston.verbose("[Iteration] Iterable array is empty. Exit...")
-      console.log("[Iteration] Iterable array is empty. Exit...")
       this.logger.warn("[Iteration] Iterable array is empty. Exit...")
       callback(true);
       return;
@@ -133,7 +128,6 @@ class DirIteration {
     
     await this.#saveIterationState(actionId, iterationState);
     this.logger.native(`[Iteration] Initialized iteration with ${iterableArray.length} items`);
-    console.log(`[Iteration] Initialized iteration with ${iterableArray.length} items`);
 
     // Process first item
     await this.#processCurrentItem(iterationState, actionId, goToIntent, output, callback);
@@ -141,7 +135,6 @@ class DirIteration {
 
   async #continueIteration(iterationState, actionId, callback) {
     winston.debug(`[Iteration] Continuing iteration from index ${iterationState.currentIndex}`);
-    console.log(`[Iteration] Continuing iteration from index ${iterationState.currentIndex}`);
     
     // Increment index
     iterationState.currentIndex += 1;
@@ -150,7 +143,6 @@ class DirIteration {
     if (iterationState.currentIndex >= iterationState.totalItems) {
       this.logger.native("[Iteration] Iteration completed");
       await this.#clearIterationState(actionId);
-      console.log("[Iteration] Iteration completed");
       callback(false);
       return;
     }

package/utils/aiUtils.js

@@ -0,0 +1,43 @@
+const winston = require('./winston');
+
+// MODELS_MULTIPLIER = {
+//     "gpt-3.5-turbo": 0.6,
+//     "gpt-4": 25,
+//     "gpt-4-turbo-preview": 12
+// }
+
+loadMultiplier();
+function loadMultiplier() {
+    
+
+    let models_string = process.env.AI_MODELS;
+    winston.debug("(loadMultiplier) models_string: ", models_string)
+    let models = {};
+
+    if (!models_string) {
+        winston.info("AI_MODELS not defined");
+        winston.info("AI Models: ", models)
+        return models;
+    }
+
+    let models_string_trimmed = models_string.replace(/ /g,'');
+    winston.debug("(loadMultiplier) models_string_trimmed: ", models_string_trimmed)
+
+    let splitted_string = models_string_trimmed.split(";");
+    winston.debug("splitted_string: ", splitted_string)
+
+    splitted_string.forEach(m => {
+        m_split = m.split(":");
+        if (!m_split[1]) {
+            multiplier = null;
+        } else {
+            multiplier = Number(m_split[1]);;
+        }
+        models[m_split[0]] = multiplier;
+    })
+
+    winston.info("AI Models: ", models)
+    return models;
+}
+
+module.exports = { MODELS_MULTIPLIER: loadMultiplier() }