@tiledesk/tiledesk-tybot-connector 0.2.64 → 0.2.66-rc1

package/CHANGELOG.md

@@ -5,6 +5,11 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+# v0.2.66-rc1
+- fix missing model in updateQuote
+
+# v0.2.65
+- fix OPENAI_APIKEY: removed Bearer prefix
 
 # v0.2.64
 - removed system parameters from /reserved/parameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.2.64",
+  "version": "0.2.66-rc1",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -24,13 +24,14 @@
     "handlebars": "^4.7.7",
     "jsonschema": "^1.4.1",
     "jsonwebtoken": "^8.5.1",
+    "liquidjs": "^10.8.4",
     "minimist-string": "^1.0.2",
     "mongoose": "^6.3.5",
+    "multer": "^1.4.5-lts.1",
     "nanoid": "^3.1.25",
     "redis": "^3.1.2",
     "uuid": "^3.3.3",
-    "vm2": "^3.9.13",
-    "liquidjs": "^10.8.4"
+    "vm2": "^3.9.13"
   },
   "devDependencies": {
     "mocha": "^8.4.0"

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -196,7 +196,10 @@ class DirAskGPTV2 {
         else if (resbody.success === true) {
 
           if (publicKey === true) {
-            let token_usage = resbody.prompt_token_size;
+            let token_usage = {
+              tokens: resbody.prompt_token_size,
+              model: json.model
+            }
             this.updateQuote(server_base_url, token_usage);
           }
 

package/tiledeskChatbotPlugs/directives/DirAssistant.js

@@ -47,7 +47,7 @@ class DirAssistant {
     const url = filler.fill(action.url, requestAttributes);
     // prompt => Mandatory
     // assistantId => Mandatory
-    // threadIdAttributeName => Optional // default "firstThread"
+    // threadIdAttribute => Optional // default "firstThread"
     // assignResultTo => Optional // default "assistantReply"
     // assignErrorTo => Optional // default "assistantError"
     // action.settings.timeout => Optional
@@ -122,7 +122,7 @@ class DirAssistant {
 
     this.timeout = this.#webrequest_timeout(action, 20000, 1, 300000);
     
-    const apikey = await this.getGPT_APIKEY();
+    let apikey = await this.getGPT_APIKEY();
     if (this.log) {console.log("apikey:", apikey);}
     if (!apikey) {
       const reply = "DirAssistant gptkey is mandatory in Integrations";
@@ -134,6 +134,10 @@ class DirAssistant {
       }
       return;
     }
+    else {
+      apikey = "Bearer " + apikey;
+      console.log("APIKEY::", apikey);
+    }
     let threadId = null;
     try {
       threadId = requestAttributes[threadIdAttribute];
@@ -143,11 +147,15 @@ class DirAssistant {
         const thread = await this.createThread(apikey);
         if (this.log) {console.log("Thread crated.");}
         threadId = thread.id;
+        await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, threadIdAttribute, threadId);
         if (this.log) {
           console.log("thread:", thread);
           console.log("threadId:", threadId);
         }
       }
+      else {
+        if (this.log) { console.log("Reusing threadId (used flow attribute:" + threadIdAttribute + "):", threadId); }
+      }
       await this.addMessage(prompt, threadId, apikey);
       if (this.log) {console.log("Message added.");}
       await this.runThreadOnAssistant(assistantId, threadId, apikey);
@@ -502,11 +510,11 @@ class DirAssistant {
       if (this.log) { console.log("DirAssistant INTEGRATIONS_HTTPREQUEST ", INTEGRATIONS_HTTPREQUEST) }
 
       this.#myrequest(
-        INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
+        INTEGRATIONS_HTTPREQUEST, async (err, res) => {
           if (err) {
             resolve(null);
           } else {
-
+            let integration = res.data;
             if (integration &&
               integration.value) {
               resolve(integration.value.apikey)
@@ -563,7 +571,7 @@ class DirAssistant {
       axios(axios_options)
       .then((res) => {
         if (this.log) {
-          console.log("Success Response:", res);
+          // console.log("Success Response:", res);
           console.log("Response for url:", options.url);
           console.log("Response headers:\n", JSON.stringify(res.headers));
         }

package/tiledeskChatbotPlugs/directives/DirGptTask.js

@@ -57,6 +57,7 @@ class DirGptTask {
 
     // default value
     let answer = "No answer.";
+    let model = "gpt-3.5-turbo";
 
     if (!action.question || action.question === '') {
       console.error("Error: DirGptTask question attribute is mandatory. Executing condition false...")
@@ -81,6 +82,10 @@ class DirGptTask {
 
     let max_tokens = action.max_tokens;
     let temperature = action.temperature;
+    
+    if (action.model) {
+      model = action.model;
+    }
 
     if (this.log) {
       console.log("DirGptTask max_tokens: ", max_tokens);
@@ -180,7 +185,10 @@ class DirGptTask {
           await this.#assignAttributes(action, answer_json);
 
           if (publicKey === true) {
-            let token_usage = resbody.usage.total_tokens;
+            let token_usage = {
+              tokens: resbody.usage.total_tokens,
+              model: json.model
+            }
             this.updateQuote(server_base_url, token_usage);
           }