@tiledesk/tiledesk-server 2.17.3 → 2.17.4

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.17.5
+- Refactor error handling and code structure in webhook.js
+
+# 2.17.4
+- Added support for Pinecone Reranking for Standard knowledge bases
+
 # 2.17.3
 - Added missing import path on kb route
 

package/archive.sh

@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# ================================
+# Script interattivo per archiviare branch
+# ================================
+# Usage: ./archive-branch.sh [mode]
+# mode: tag (default) | rename
+# ================================
+
+REMOTE="tiledesk-server"
+MODE="${1:-tag}"   # default mode = tag
+
+PROTECTED_BRANCHES=("master" "master-PRE" "master-COLLAUDO" "master-STAGE")
+
+# Funzione per scegliere un branch valido
+get_branch_to_archive() {
+  local branch="$1"
+
+  while true; do
+    # Se branch protetto, avvisa
+    if [[ " ${PROTECTED_BRANCHES[@]} " =~ " ${branch} " ]]; then
+      echo "❌ Il branch '$branch' è protetto e non può essere archiviato."
+    fi
+
+    # Controlla che il branch locale esista
+    if git show-ref --verify --quiet refs/heads/"$branch"; then
+      break  # branch valido trovato
+    fi
+
+    # Richiedi input all’utente
+    read -p "Inserisci un branch locale valido da archiviare (oppure 'quit' per annullare): " branch
+    if [[ "$branch" == "quit" || "$branch" == "q" ]]; then
+      echo "Operazione annullata."
+      exit 0
+    fi
+  done
+
+  echo "$branch"
+}
+
+# Branch corrente
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+# Se branch corrente non è protetto, chiedi conferma
+if [[ ! " ${PROTECTED_BRANCHES[@]} " =~ " ${CURRENT_BRANCH} " ]]; then
+  echo "⚡ Branch corrente: $CURRENT_BRANCH"
+  read -p "Vuoi archiviare questo branch? (y/n): " CONFIRM
+  if [[ "$CONFIRM" != "y" ]]; then
+    read -p "Inserisci il branch da archiviare (oppure 'quit' per annullare): " USER_BRANCH
+    if [[ "$USER_BRANCH" == "quit" || "$USER_BRANCH" == "q" ]]; then
+      echo "Operazione annullata."
+      exit 0
+    fi
+    CURRENT_BRANCH=$(get_branch_to_archive "$USER_BRANCH")
+  fi
+else
+  # Branch corrente è protetto, chiedi un branch alternativo
+  CURRENT_BRANCH=$(get_branch_to_archive "$CURRENT_BRANCH")
+fi
+
+# Operazione di archiviazione
+if [ "$MODE" == "tag" ]; then
+  ARCHIVE_TAG="archive/$(echo $CURRENT_BRANCH | tr '/' '-')"
+  echo "Creando tag di archivio: $ARCHIVE_TAG"
+  git tag "$ARCHIVE_TAG" "$CURRENT_BRANCH"
+  git push "$REMOTE" "$ARCHIVE_TAG"
+
+  echo "Eliminando branch remoto $CURRENT_BRANCH"
+  git push "$REMOTE" --delete "$CURRENT_BRANCH"
+
+  echo "Eliminando branch locale $CURRENT_BRANCH"
+  git branch -d "$CURRENT_BRANCH"
+
+  echo "✅ Branch '$CURRENT_BRANCH' archiviato con tag '$ARCHIVE_TAG'"
+
+elif [ "$MODE" == "rename" ]; then
+  ARCHIVE_BRANCH="archive/$CURRENT_BRANCH"
+  echo "Rinomino branch locale in: $ARCHIVE_BRANCH"
+  git branch -m "$CURRENT_BRANCH" "$ARCHIVE_BRANCH"
+
+  echo "Pusho nuovo branch su remote $REMOTE"
+  git push "$REMOTE" "$ARCHIVE_BRANCH"
+
+  echo "Eliminando branch remoto vecchio $CURRENT_BRANCH"
+  git push "$REMOTE" --delete "$CURRENT_BRANCH"
+
+  echo "✅ Branch '$CURRENT_BRANCH' archiviato come '$ARCHIVE_BRANCH'"
+
+else
+  echo "❌ Modalità non valida. Usa 'tag' o 'rename'."
+  exit 1
+fi

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.17.3",
+  "version": "2.17.4",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/kb.js

@@ -26,6 +26,7 @@ const AMQP_MANAGER_URL = process.env.AMQP_MANAGER_URL;
 const JOB_TOPIC_EXCHANGE = process.env.JOB_TOPIC_EXCHANGE_TRAIN || 'tiledesk-trainer';
 const JOB_TOPIC_EXCHANGE_HYBRID = process.env.JOB_TOPIC_EXCHANGE_TRAIN_HYBRID || 'tiledesk-trainer-hybrid';
 const KB_WEBHOOK_TOKEN = process.env.KB_WEBHOOK_TOKEN || 'kbcustomtoken';
+const PINECONE_RERANKING = process.env.PINECONE_RERANKING === true || process.env.PINECONE_RERANKING === "true";
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
 
@@ -408,7 +409,7 @@ router.post('/qa', async (req, res) => {
     data.search_type = 'hybrid';
     
     if (data.reranking === true) {
-      data.reranker_model = "cross-encoder/ms-marco-MiniLM-L-6-v2";
+      data.reranker_model = process.env.RERANKING_MODEL || "cross-encoder/ms-marco-MiniLM-L-6-v2";
       
       if (!data.reranking_multiplier) {
         data.reranking_multiplier = 3;
@@ -422,6 +423,27 @@ router.post('/qa', async (req, res) => {
         data.reranking_multiplier = calculatedRerankingMultiplier;
       }
     }
+  } 
+
+  if (!namespace.hybrid && data.reranking === true && PINECONE_RERANKING) {
+    
+    data.reranking = {
+      "provider": "pinecone",
+      "api_key": process.env.PINECONE_API_KEY,
+      "model": process.env.PINECONE_RERANKING_MODEL || process.env.RERANKING_MODEL || "bge-reranker-v2-m3"
+    }
+
+    if (!data.reranking_multiplier) {
+      data.reranking_multiplier = 3;
+    }
+
+    if ((data.top_k * data.reranking_multiplier) > 100) {
+      let calculatedRerankingMultiplier = Math.floor(100 / data.top_k);
+      if (calculatedRerankingMultiplier < 1) {
+        calculatedRerankingMultiplier = 1;
+      }
+      data.reranking_multiplier = calculatedRerankingMultiplier;
+    }
   }
 
   data.stream = data.stream === true;
@@ -429,6 +451,8 @@ router.post('/qa', async (req, res) => {
   delete data.advancedPrompt;
   winston.verbose("ask data: ", data);
 
+  console.log("data: ", data);
+
   if (process.env.NODE_ENV === 'test') {
     return res.status(200).send({ success: true, message: "Question skipped in test environment", data: data });
   }

package/routes/webhook.js

@@ -12,7 +12,7 @@ var ObjectId = require('mongoose').Types.ObjectId;
 const default_embedding = require('../config/kb/embedding');
 
 const port = process.env.PORT || '3000';
-let TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/";;
+let TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/";
 if (process.env.TILEBOT_ENDPOINT) {
     TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT + "/"
 }
@@ -69,18 +69,12 @@ router.post('/kb/reindex', async (req, res) => {
   
   let content_id = req.body.content_id;
 
-  let kb = await KB.findById(content_id).catch( async (err) => {
-    winston.error("(webhook) Error getting kb content: ", err);
-    return res.status(500).send({ success: false, error: "Error getting content with id " + content_id });
-  })
-
-  const namespace_id = kb.namespace;
-  let namespace;
+  let kb;
   try {
-    namespace = await aiManager.checkNamespace(kb.id_project, namespace_id);
+    kb = await KB.findById(content_id);
   } catch (err) {
-    let errorCode = err?.errorCode ?? 500;
-    return res.status(errorCode).send({ success: false, error: err.error });
+    winston.error("(webhook) Error getting kb content: ", err);
+    return res.status(500).send({ success: false, error: "Error getting content with id " + content_id });
   }
 
   if (!kb) {
@@ -99,8 +93,19 @@ router.post('/kb/reindex', async (req, res) => {
       winston.verbose("(webhook) delete response: ", deleteResponse);
       return;
     }, 10000);
-    
-  } else if (kb.type === 'sitemap') {
+    return;
+  }
+
+  const namespace_id = kb.namespace;
+  let namespace;
+  try {
+    namespace = await aiManager.checkNamespace(kb.id_project, namespace_id);
+  } catch (err) {
+    let errorCode = err?.errorCode ?? 500;
+    return res.status(errorCode).send({ success: false, error: err.error });
+  }
+
+  if (kb.type === 'sitemap') {
 
     const urls = await aiManager.fetchSitemap(kb.source).catch((err) => {
       winston.error("(webhook) Error fetching sitemap: ", err);