@tiledesk/tiledesk-tybot-connector 0.2.91-rc3 → 0.2.91

package/models/TiledeskChatbotUtil.js

@@ -435,14 +435,15 @@ class TiledeskChatbotUtil {
             let fullName = message.senderFullname;
             if (fullName.trim() === chatbot_name) {
                 fullName = "bot:" + fullName;
-            } else {
+            }
+            else {
                 fullName = "user:" + fullName;
             }
             return "<" + fullName + ">";
         }
     }
 
-    static async transcriptJSON(transcript) {
+    static transcriptJSON(transcript) {
         const regexp = /(<.*>)/gm;
         const parts = transcript.split(regexp);
         // console.log("parts:", parts);

package/package.json

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

package/tiledeskChatbotPlugs/directives/DirGptTask.js

@@ -3,8 +3,6 @@ const { TiledeskChatbot } = require("../../models/TiledeskChatbot");
 const { Filler } = require("../Filler");
 let https = require("https");
 const { DirIntent } = require("./DirIntent");
-const { TiledeskChatbotConst } = require("../../models/TiledeskChatbotConst");
-const { TiledeskChatbotUtil } = require("../../models/TiledeskChatbotUtil");
 require('dotenv').config();
 
 class DirGptTask {
@@ -14,7 +12,6 @@ class DirGptTask {
       throw new Error('context object is mandatory');
     }
     this.context = context;
-    this.chatbot = this.context.chatbot;
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
     this.intentDir = new DirIntent(context);
@@ -50,7 +47,6 @@ class DirGptTask {
     let falseIntent = action.falseIntent;
     let trueIntentAttributes = action.trueIntentAttributes;
     let falseIntentAttributes = action.falseIntentAttributes;
-    let transcript;
 
     if (this.log) {
       console.log("DirGptTask trueIntent", trueIntent)
@@ -66,7 +62,6 @@ class DirGptTask {
     if (!action.question || action.question === '') {
       console.error("Error: DirGptTask question attribute is mandatory. Executing condition false...")
       if (falseIntent) {
-        await this.chatbot.addParameter("flowError", "GPT Error: question attribute is undefined");
         await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
         callback(true);
         return;
@@ -97,18 +92,6 @@ class DirGptTask {
       console.log("DirGptTask temperature: ", temperature);
     }
 
-    if (action.history) {
-      let transcript_string = await TiledeskChatbot.getParameterStatic(
-        this.context.tdcache,
-        this.context.requestId,
-        TiledeskChatbotConst.REQ_TRANSCRIPT_KEY);
-      if (this.log) { console.log("DirGptTask transcript string: ", transcript_string) }
-
-      transcript = await TiledeskChatbotUtil.transcriptJSON(transcript_string);
-      if (this.log) { console.log("DirGptTask transcript: ", transcript) }
-    }
-
-
     const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const openai_url = process.env.OPENAI_ENDPOINT + "/chat/completions";
     if (this.log) {
@@ -132,7 +115,6 @@ class DirGptTask {
       console.error("DirGptTask gptkey is mandatory");
       await this.#assignAttributes(action, answer);
       if (falseIntent) {
-        await this.chatbot.addParameter("flowError", "GPT Error: gpt apikey is undefined");
         await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
         callback(true);
         return;
@@ -152,34 +134,22 @@ class DirGptTask {
 
     let json = {
       model: action.model,
-      messages: [],
-      // messages: [
-      //   {
-      //     role: "user",
-      //     content: filled_question
-      //   }
-      // ],
+      messages: [
+        {
+          role: "user",
+          content: filled_question
+        }
+      ],
       max_tokens: action.max_tokens,
-      temperature: action.temperature,
+      temperature: action.temperature
     }
 
+    let message = { role: "", content: "" };
     if (action.context) {
-      let message = { role: "system", content: filled_context }
-      json.messages.push(message);
+      message.role = "system";
+      message.content = filled_context;
+      json.messages.unshift(message);
     }
-
-    if (transcript) {
-      transcript.forEach(msg => {
-        if (!msg.content.startsWith('/')) {
-          let message = { role: msg.role, content: msg.content }
-          json.messages.push(message)
-        }
-      })
-    } else {
-      let message = { role: "user", content: filled_question };
-      json.messages.push(message);
-    } 
-
     if (this.log) { console.log("DirGptTask json: ", json) }
 
     const HTTPREQUEST = {
@@ -197,11 +167,10 @@ class DirGptTask {
         if (err) {
           if (this.log) {
             console.error("(httprequest) DirGptTask openai err:", err);
-            console.error("(httprequest) DirGptTask openai err:", err.response?.data?.error?.message);
+            console.error("(httprequest) DirGptTask openai err:", err.response.data);
           }
           await this.#assignAttributes(action, answer);
           if (falseIntent) {
-            await this.chatbot.addParameter("flowError", "GPT Error: " + err.response?.data?.error?.message);
             await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
             callback(true);
             return;