@tiledesk/tiledesk-tybot-connector 2.0.41 → 2.0.42

package/config/kb/embedding.js

@@ -0,0 +1,7 @@
+module.exports = {
+    provider: process.env.EMBEDDINGS_PROVIDER || "openai",
+    name: process.env.EMBEDDINGS_NAME || "text-embedding-ada-002",
+    api_key: "",
+    dimension: Number(process.env.EMBEDDINGS_DIMENSION) || 1536,
+    url: process.env.EMBEDDINGS_URL
+}

package/config/kb/engine.hybrid.js

@@ -0,0 +1,10 @@
+module.exports = {
+    name: process.env.VECTOR_STORE_NAME || 'pinecone',
+    type: process.env.INDEX_TYPE_HYBRID || process.env.PINECONE_TYPE_HYBRID || 'serverless',
+    apikey: process.env.VECTOR_STORE_APIKEY || '',
+    vector_size: Number(process.env.VECTOR_SIZE_HYBRID) || 1536,
+    index_name: process.env.INDEX_NAME_HYBRID || process.env.PINECONE_INDEX_HYBRID || 'llm-sample-hybrid-index',
+    host: process.env.VECTOR_STORE_HOST,
+    port: process.env.VECTOR_STORE_PORT ? Number(process.env.VECTOR_STORE_PORT) : undefined,
+    deployment: process.env.VECTOR_STORE_DEPLOYMENT
+  }

package/config/kb/engine.js

@@ -0,0 +1,10 @@
+module.exports = {
+    name: process.env.VECTOR_STORE_NAME || 'pinecone',
+    type: process.env.INDEX_TYPE || process.env.PINECONE_TYPE || 'serverless',
+    apikey: process.env.VECTOR_STORE_APIKEY || '',
+    vector_size: Number(process.env.VECTOR_SIZE) || 1536,
+    index_name: process.env.INDEX_NAME || process.env.PINECONE_INDEX || 'llm-sample-index',
+    host: process.env.VECTOR_STORE_HOST,
+    port: process.env.VECTOR_STORE_PORT ? Number(process.env.VECTOR_STORE_PORT) : undefined,
+    deployment: process.env.VECTOR_STORE_DEPLOYMENT
+  }

package/package.json

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

package/services/AIController.js

@@ -0,0 +1,44 @@
+const integrationService = require("./IntegrationService");
+
+class AIController {
+
+    constructor() {}
+
+    async resolveLLMConfig(id_project, provider = 'openai', model, token) {
+
+        if (provider === 'ollama' || provider === 'vllm') {
+            try {
+                const integration = await integrationService.getIntegration(id_project, provider, token);
+                if (!integration?.value?.url) {
+                    throw { code: 422, error: `Server url for ${provider} is empty or invalid`}
+                }
+
+                return {
+                    provider,
+                    name: model,
+                    url: integration.value.url,
+                    api_key: integration.value.api_key || ""
+                }
+
+            } catch (err) {
+                throw { code: err.code, error: err.error }
+            }
+        } 
+
+        try {
+            let key = await integrationService.getKeyFromIntegrations(id_project, provider, token);
+
+            return {
+                provider,
+                name: model,
+                api_key: key
+            }
+
+        } catch (err) {
+            throw { code: err.code, error: err.error }
+        }
+    }
+}
+
+const aiController = new AIController();
+module.exports = aiController;

package/tiledeskChatbotPlugs/directives/DirAddKbContent.js

@@ -85,7 +85,7 @@ class DirAddKbContent {
 
     let key = await integrationService.getKeyFromIntegrations(this.projectId, 'openai', this.token);
     if (!key) {
-      this.logger.native("[Add to KnwoledgeBase] OpenAI key not found in Integration. Using shared OpenAI key");
+      this.logger.native("[Add to KnwoledgeBase] Using shared OpenAI key");
       winston.verbose("[DirAddKbContent] - Key not found in Integrations. Searching in kb settings...");
       key = await this.getKeyFromKbSettings();
     }

package/tiledeskChatbotPlugs/directives/DirAiCondition.js

@@ -110,7 +110,7 @@ class DirAiCondition {
 
     // evaluate
 
-    let AI_endpoint = process.env.AI_ENDPOINT;
+    let AI_endpoint = process.env.KB_ENDPOINT_QA;
     winston.verbose("DirAiPrompt AI_endpoint " + AI_endpoint);
 
     let headers = {
@@ -140,7 +140,7 @@ class DirAiCondition {
       key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
   
       if (!key && action.llm === "openai") {
-        this.logger.native("[AI Condition] OpenAI key not found in Integration. Retrieve shared OpenAI key.")
+        this.logger.native("[AI Condition] Using shared OpenAI key.")
         key = process.env.GPTKEY;
         publicKey = true;
       }

package/tiledeskChatbotPlugs/directives/DirAiPrompt.js

@@ -112,7 +112,7 @@ class DirAiPrompt {
       }
     }
 
-    let AI_endpoint = process.env.AI_ENDPOINT;
+    let AI_endpoint = process.env.KB_ENDPOINT_QA;
     winston.verbose("DirAiPrompt AI_endpoint " + AI_endpoint);
 
     let headers = {
@@ -141,7 +141,7 @@ class DirAiPrompt {
       key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
       
       if (!key && action.llm === "openai") {
-        this.logger.native("[AI Prompt] OpenAI key not found in Integration. Retrieve shared OpenAI key.")
+        this.logger.native("[AI Prompt] Using shared OpenAI key.")
         key = process.env.GPTKEY;
         publicKey = true;
       }

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -13,6 +13,10 @@ const integrationService = require("../../services/IntegrationService");
 const { Logger } = require("../../Logger");
 const kbService = require("../../services/KbService");
 const quotasService = require("../../services/QuotasService");
+const aiController = require("../../services/AIController");
+const default_engine = require('../../config/kb/engine');
+const default_engine_hybrid = require('../../config/kb/engine.hybrid');
+const default_embedding = require("../../config/kb/embedding");
 
 class DirAskGPTV2 {
 
@@ -81,6 +85,7 @@ class DirAskGPTV2 {
     let citations = false;
     let chunks_only = false;
     let engine;
+    let embedding;
     let reranking;
     let skip_unanswered = false;
 
@@ -181,57 +186,36 @@ class DirAskGPTV2 {
 
     let key;
     let publicKey = false;
-    let ollama_integration;
-    let vllm_integration;
-
-    if (action.llm === 'ollama') {
-      key = process.env.GPTKEY;
-      ollama_integration = await integrationService.getIntegration(this.projectId, action.llm, this.token).catch( async (err) => {
-        this.logger.error("[Ask Knowledge Base] Error getting ollama integration.");
-        await this.chatbot.addParameter("flowError", "Ollama integration not found");
-        if (falseIntent) {
-          await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
-          callback(true);
-          return;
-        }
-        callback();
-        return;
-      })
-    }
-    else if (action.llm === 'vllm')  {
-      key = process.env.GPTKEY;
-      vllm_integration = await integrationService.getIntegration(this.projectId, action.llm, this.token).catch( async (err) => {
-        this.logger.error("[Ask Knowledge Base] Error getting vllm integration.");
-        await this.chatbot.addParameter("flowError", "vLLM integration not found");
-        if (falseIntent) {
-          await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
-          callback(true);
-          return;
-        }
-        callback();
+
+    try {
+      model = await aiController.resolveLLMConfig(this.projectId, llm, model, this.token);
+    } catch (err) {
+      this.logger.error(`[Ask Knowledge Base] Error getting ${llm} integration.`);
+      await this.chatbot.addParameter("flowError", `${llm} integration not found`);
+      if (falseIntent) {
+        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+        callback(true);
         return;
-      })
+      }
+      callback();
+      return;
     }
-    else {
-      key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
 
-      if (!key && action.llm === 'openai') {
-        this.logger.native("[Ask Knowledge Base] OpenAI key not found in Integration. Retrieve shared OpenAI key.");
-        key = process.env.GPTKEY;
-        publicKey = true;
-      }
+    if (!model.api_key && model.provider === 'openai') {
+      model.api_key = process.env.GPTKEY;
+      publicKey = true;
+    }
 
-      if (!key) {
-        this.logger.error(`[Ask Knowledge Base] llm key for ${action.llm} not found in integrations`);
-        await this.chatbot.addParameter("flowError", `AskKnowledgeBase Error: missing key for llm ${action.llm}`);
-        if (falseIntent) {
-          await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
-          callback(true);
-          return;
-        }
-        callback();
+    if (!model.api_key) {
+      this.logger.error(`[Ask Knowledge Base] llm key for ${llm} not found in integrations`);
+      await this.chatbot.addParameter("flowError", `AskKnowledgeBase Error: missing key for llm ${llm}`);
+      if (falseIntent) {
+        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+        callback(true);
         return;
       }
+      callback();
+      return;
     }
 
     if (publicKey === true && !chunks_only) {
@@ -305,15 +289,18 @@ class DirAskGPTV2 {
       engine = await this.setDefaultEngine(ns.hybrid);
     }
 
+    embedding = ns.embedding || default_embedding;
+    embedding.api_key = process.env.EMBEDDING_API_KEY || process.env.GPTKEY;
+
     let json = {
       question: filled_question,
-      gptkey: key,
       namespace: namespace,
-      llm: llm,
       model: model,
+      embedding: embedding,
       citations: citations,
       engine: engine,
-      debug: true
+      debug: true,
+      stream: false
     };
     if (top_k) {
       json.top_k = top_k;
@@ -328,17 +315,6 @@ class DirAskGPTV2 {
       json.chunks_only = chunks_only;
     }
 
-    if (llm === 'ollama') {
-      json.gptkey = "";
-      json.model = {
-        name: action.model,
-        url: ollama_integration.value.url,
-        token: ollama_integration.value.token
-      }
-      json.stream = false;
-    }
-
-
     if (ns.hybrid === true) {
       json.search_type = 'hybrid';
       json.alpha = alpha;
@@ -351,7 +327,7 @@ class DirAskGPTV2 {
     }
 
     if (!action.advancedPrompt) {
-      const contextTemplate = contexts[model] || contexts["general"];
+      const contextTemplate = contexts[model.name] || contexts["general"];
       if (filled_context) {
         json.system_context = filled_context + "\n" + contextTemplate;
       } else {
@@ -386,7 +362,7 @@ class DirAskGPTV2 {
 
     httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
-        
+        console.log("resbody: ", JSON.stringify(resbody));
         if (err) {
           winston.error("DirAskGPTV2 error: ", {
             status: err.response?.status,
@@ -407,6 +383,7 @@ class DirAskGPTV2 {
         }
         else if (resbody.success === true) {
           winston.debug("DirAskGPTV2 resbody: ", resbody);
+          console.log("Answer: ", resbody.answer);
           if (chunks_only) {
             await this.#assignAttributes(action, resbody.answer, resbody.source, resbody.chunks);
             if (trueIntent) {
@@ -418,6 +395,7 @@ class DirAskGPTV2 {
             return;
 
           } else {
+            console.log("assign answer to ", action.assignReplyTo)
             await this.#assignAttributes(action, resbody.answer, resbody.source, resbody.content_chunks);
             if (publicKey === true && !chunks_only) {
               let tokens_usage = {
@@ -430,6 +408,7 @@ class DirAskGPTV2 {
             }
   
             if (trueIntent) {
+              console.log("execute true intent");
               await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
               callback(true);
               return;
@@ -438,6 +417,7 @@ class DirAskGPTV2 {
             return;
           }
         } else {
+          console.log("else case. Assign answer: ", answer);
           await this.#assignAttributes(action, answer, source);
           if (!skip_unanswered) {
             kbService.addUnansweredQuestion(this.projectId, json.namespace, json.question, this.token).catch((err) => {
@@ -450,6 +430,7 @@ class DirAskGPTV2 {
             })
           }
           if (falseIntent) {
+            console.log("execute false intent");
             await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
             callback(true);
             return;
@@ -612,20 +593,10 @@ class DirAskGPTV2 {
   }
 
   async setDefaultEngine(hybrid = false) {
-    let isHybrid = hybrid === true;
-    return new Promise((resolve) => {
-      let engine = {
-        name: process.env.VECTOR_STORE_NAME || "pinecone",
-        type: isHybrid ? process.env.INDEX_TYPE_HYBRID || "serverless" : process.env.INDEX_TYPE || process.env.PINECONE_TYPE || 'serverless',
-        apikey: "",
-        vector_size: process.env.VECTOR_SIZE || 1536,
-        index_name: isHybrid ? process.env.INDEX_NAME_HYBRID || process.env.PINECONE_INDEX_HYBRID || "llm-sample-index-hybrid" : process.env.INDEX_NAME || process.env.PINECONE_INDEX || "llm-sample-index",
-        ...(process.env.VECTOR_STORE_HOST && { host: process.env.VECTOR_STORE_HOST }),
-        ...(process.env.VECTOR_STORE_PORT && { port: process.env.VECTOR_STORE_PORT }),
-        ...(process.env.VECTOR_STORE_DEPLOYMENT && { deployment: process.env.VECTOR_STORE_DEPLOYMENT })
-      }
-      resolve(engine);
-    })
+    if (hybrid) {
+      return default_engine_hybrid
+    }
+    return default_engine;
   }
 
 }

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -160,6 +160,7 @@ class DirReply {
       
     cleanMessage.senderFullname = this.context.chatbot.bot.name;
     winston.debug("DirReply reply with clean message: ", cleanMessage);
+    this.logger.native("[Reply] Reply with 2: " + cleanMessage.text);
 
     await TiledeskChatbotUtil.updateConversationTranscript(this.context.chatbot, cleanMessage);
     this.tdClient.sendSupportMessage(