@retrivora-ai/rag-engine 0.2.3 → 0.2.5

package/dist/{chunk-K53N7SEE.mjs → chunk-7K4KXB6G.mjs}

@@ -1640,7 +1640,7 @@ var Pipeline = class {
     const scoreThreshold = (_d = (_c = this.config.rag) == null ? void 0 : _c.scoreThreshold) != null ? _d : 0;
     try {
       const queryVector = await this.embeddingProvider.embed(question, { taskType: "query" });
-      const rawMatches = await this.vectorDB.query(queryVector, topK, ns);
+      const rawMatches = await this.vectorDB.query(queryVector, topK, ns, { __queryText: question });
       const sources = rawMatches.filter((m) => m.score >= scoreThreshold);
       const context = sources.length ? sources.map((m, i) => `[Source ${i + 1}]
 ${m.content}`).join("\n\n---\n\n") : "No relevant context found.";

package/dist/handlers/index.js

@@ -2750,7 +2750,7 @@ var Pipeline = class {
     const scoreThreshold = (_d = (_c = this.config.rag) == null ? void 0 : _c.scoreThreshold) != null ? _d : 0;
     try {
       const queryVector = await this.embeddingProvider.embed(question, { taskType: "query" });
-      const rawMatches = await this.vectorDB.query(queryVector, topK, ns);
+      const rawMatches = await this.vectorDB.query(queryVector, topK, ns, { __queryText: question });
       const sources = rawMatches.filter((m) => m.score >= scoreThreshold);
       const context = sources.length ? sources.map((m, i) => `[Source ${i + 1}]
 ${m.content}`).join("\n\n---\n\n") : "No relevant context found.";

package/dist/handlers/index.mjs

@@ -3,7 +3,7 @@ import {
   createHealthHandler,
   createIngestHandler,
   createUploadHandler
-} from "../chunk-K53N7SEE.mjs";
+} from "../chunk-7K4KXB6G.mjs";
 import "../chunk-EDLTMSNY.mjs";
 import "../chunk-FWCSY2DS.mjs";
 export {

package/dist/server.d.mts

@@ -720,8 +720,7 @@ declare class MultiTablePostgresProvider extends BaseVectorProvider {
     /**
      * Query all configured tables and merge results, sorted by cosine similarity score.
      */
-    query(vector: number[], topK: number, _namespace?: string, // eslint-disable-line @typescript-eslint/no-unused-vars
-    _filter?: Record<string, unknown>): Promise<VectorMatch[]>;
+    query(vector: number[], topK: number, _namespace?: string, _filter?: Record<string, unknown>): Promise<VectorMatch[]>;
     delete(_id: string | number, _namespace?: string): Promise<void>;
     deleteNamespace(_namespace: string): Promise<void>;
     ping(): Promise<boolean>;

package/dist/server.d.ts

@@ -720,8 +720,7 @@ declare class MultiTablePostgresProvider extends BaseVectorProvider {
     /**
      * Query all configured tables and merge results, sorted by cosine similarity score.
      */
-    query(vector: number[], topK: number, _namespace?: string, // eslint-disable-line @typescript-eslint/no-unused-vars
-    _filter?: Record<string, unknown>): Promise<VectorMatch[]>;
+    query(vector: number[], topK: number, _namespace?: string, _filter?: Record<string, unknown>): Promise<VectorMatch[]>;
     delete(_id: string | number, _namespace?: string): Promise<void>;
     deleteNamespace(_namespace: string): Promise<void>;
     ping(): Promise<boolean>;

package/dist/server.js

@@ -2839,7 +2839,7 @@ var Pipeline = class {
     const scoreThreshold = (_d = (_c = this.config.rag) == null ? void 0 : _c.scoreThreshold) != null ? _d : 0;
     try {
       const queryVector = await this.embeddingProvider.embed(question, { taskType: "query" });
-      const rawMatches = await this.vectorDB.query(queryVector, topK, ns);
+      const rawMatches = await this.vectorDB.query(queryVector, topK, ns, { __queryText: question });
       const sources = rawMatches.filter((m) => m.score >= scoreThreshold);
       const context = sources.length ? sources.map((m, i) => `[Source ${i + 1}]
 ${m.content}`).join("\n\n---\n\n") : "No relevant context found.";
@@ -3763,50 +3763,76 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
    * Query all configured tables and merge results, sorted by cosine similarity score.
    */
   async query(vector, topK, _namespace, _filter) {
-    var _b, _c, _d;
+    var _a, _b, _c;
     if (!this.pool) {
       throw new Error("[MultiTablePostgresProvider] Provider not initialized. Call initialize() first.");
     }
     const vectorLiteral = `[${vector.join(",")}]`;
     const allResults = [];
     console.log(`[MultiTablePostgresProvider] --- Starting Multi-Table Search ---`);
-    for (const table of this.tables) {
+    const queryText = _filter == null ? void 0 : _filter.__queryText;
+    const queryPromises = this.tables.map(async (table) => {
       try {
-        const result = await this.pool.query(
-          `SELECT *, 
-           (1 - (embedding <=> $1::vector)) AS vector_score
-           FROM "${table}"
-           ORDER BY vector_score DESC
-           LIMIT 50`,
-          [vectorLiteral]
-        );
+        let sqlQuery = "";
+        let params = [];
+        if (queryText) {
+          sqlQuery = `
+            SELECT *, 
+             (1 - (embedding <=> $1::vector)) AS vector_score,
+             ts_rank(to_tsvector('english', t.*::text), plainto_tsquery('english', $2)) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (ts_rank(to_tsvector('english', t.*::text), plainto_tsquery('english', $2)) * 2.0)) AS hybrid_score
+            FROM "${table}" t
+            ORDER BY hybrid_score DESC
+            LIMIT 50
+          `;
+          params = [vectorLiteral, queryText];
+        } else {
+          sqlQuery = `
+            SELECT *, 
+             (1 - (embedding <=> $1::vector)) AS hybrid_score
+            FROM "${table}" t
+            ORDER BY hybrid_score DESC
+            LIMIT 50
+          `;
+          params = [vectorLiteral];
+        }
+        const result = await this.pool.query(sqlQuery, params);
         if (result.rowCount && result.rowCount > 0) {
-          console.log(`   \u2705 Table "${table}": Found ${result.rowCount} potential matches. Top score: ${result.rows[0].vector_score.toFixed(4)}`);
+          console.log(`   \u2705 Table "${table}": Found ${result.rowCount} potential matches. Top score: ${result.rows[0].hybrid_score.toFixed(4)}`);
         } else {
           console.log(`   \u26AA Table "${table}": No relevant matches found.`);
         }
+        const tableResults = [];
         for (const row of result.rows) {
-          const _a = row, { vector_score, id } = _a, rest = __objRest(_a, ["vector_score", "id"]);
+          const _a2 = row, { hybrid_score, id } = _a2, rest = __objRest(_a2, ["hybrid_score", "id"]);
           delete rest.embedding;
+          delete rest.vector_score;
+          delete rest.keyword_score;
           const content = `[TYPE: ${table.replace(/s$/, "").toUpperCase()}]
 ` + Object.entries(rest).filter(([k, v]) => v !== null && typeof v !== "object" && k !== "id").map(([k, v]) => `${k}: ${v}`).join("\n");
-          allResults.push({
+          tableResults.push({
             id: `${table}-${id}`,
-            score: parseFloat(String(vector_score)),
+            score: parseFloat(String(hybrid_score)),
             content,
             metadata: __spreadProps(__spreadValues({}, rest), { source_table: table })
           });
         }
+        return tableResults;
       } catch (err) {
         console.error(
           `[MultiTablePostgresProvider] Error querying table "${table}":`,
           err.message
         );
+        return [];
       }
+    });
+    const resultsArray = await Promise.all(queryPromises);
+    for (const tableResults of resultsArray) {
+      allResults.push(...tableResults);
     }
     const resultsByTable = {};
     for (const res of allResults) {
-      const table = (_b = res.metadata) == null ? void 0 : _b.source_table;
+      const table = (_a = res.metadata) == null ? void 0 : _a.source_table;
       if (!resultsByTable[table]) resultsByTable[table] = [];
       resultsByTable[table].push(res);
     }
@@ -3818,7 +3844,7 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
     const finalSorted = balancedResults.sort((a, b) => b.score - a.score);
     if (finalSorted.length > 0) {
       console.log(`[MultiTablePostgresProvider] --- Search Complete ---`);
-      console.log(`[MultiTablePostgresProvider] Final top match from "${(_d = (_c = finalSorted[0].metadata) == null ? void 0 : _c.source_table) != null ? _d : "unknown"}" with score ${finalSorted[0].score.toFixed(4)}`);
+      console.log(`[MultiTablePostgresProvider] Final top match from "${(_c = (_b = finalSorted[0].metadata) == null ? void 0 : _b.source_table) != null ? _c : "unknown"}" with score ${finalSorted[0].score.toFixed(4)}`);
     }
     return finalSorted.slice(0, Math.max(topK, 15));
   }

package/dist/server.mjs

@@ -34,7 +34,7 @@ import {
   createIngestHandler,
   createUploadHandler,
   getRagConfig
-} from "./chunk-K53N7SEE.mjs";
+} from "./chunk-7K4KXB6G.mjs";
 import "./chunk-EDLTMSNY.mjs";
 import {
   PineconeProvider
@@ -406,50 +406,76 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
    * Query all configured tables and merge results, sorted by cosine similarity score.
    */
   async query(vector, topK, _namespace, _filter) {
-    var _b, _c, _d;
+    var _a, _b, _c;
     if (!this.pool) {
       throw new Error("[MultiTablePostgresProvider] Provider not initialized. Call initialize() first.");
     }
     const vectorLiteral = `[${vector.join(",")}]`;
     const allResults = [];
     console.log(`[MultiTablePostgresProvider] --- Starting Multi-Table Search ---`);
-    for (const table of this.tables) {
+    const queryText = _filter == null ? void 0 : _filter.__queryText;
+    const queryPromises = this.tables.map(async (table) => {
       try {
-        const result = await this.pool.query(
-          `SELECT *, 
-           (1 - (embedding <=> $1::vector)) AS vector_score
-           FROM "${table}"
-           ORDER BY vector_score DESC
-           LIMIT 50`,
-          [vectorLiteral]
-        );
+        let sqlQuery = "";
+        let params = [];
+        if (queryText) {
+          sqlQuery = `
+            SELECT *, 
+             (1 - (embedding <=> $1::vector)) AS vector_score,
+             ts_rank(to_tsvector('english', t.*::text), plainto_tsquery('english', $2)) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (ts_rank(to_tsvector('english', t.*::text), plainto_tsquery('english', $2)) * 2.0)) AS hybrid_score
+            FROM "${table}" t
+            ORDER BY hybrid_score DESC
+            LIMIT 50
+          `;
+          params = [vectorLiteral, queryText];
+        } else {
+          sqlQuery = `
+            SELECT *, 
+             (1 - (embedding <=> $1::vector)) AS hybrid_score
+            FROM "${table}" t
+            ORDER BY hybrid_score DESC
+            LIMIT 50
+          `;
+          params = [vectorLiteral];
+        }
+        const result = await this.pool.query(sqlQuery, params);
         if (result.rowCount && result.rowCount > 0) {
-          console.log(`   \u2705 Table "${table}": Found ${result.rowCount} potential matches. Top score: ${result.rows[0].vector_score.toFixed(4)}`);
+          console.log(`   \u2705 Table "${table}": Found ${result.rowCount} potential matches. Top score: ${result.rows[0].hybrid_score.toFixed(4)}`);
         } else {
           console.log(`   \u26AA Table "${table}": No relevant matches found.`);
         }
+        const tableResults = [];
         for (const row of result.rows) {
-          const _a = row, { vector_score, id } = _a, rest = __objRest(_a, ["vector_score", "id"]);
+          const _a2 = row, { hybrid_score, id } = _a2, rest = __objRest(_a2, ["hybrid_score", "id"]);
           delete rest.embedding;
+          delete rest.vector_score;
+          delete rest.keyword_score;
           const content = `[TYPE: ${table.replace(/s$/, "").toUpperCase()}]
 ` + Object.entries(rest).filter(([k, v]) => v !== null && typeof v !== "object" && k !== "id").map(([k, v]) => `${k}: ${v}`).join("\n");
-          allResults.push({
+          tableResults.push({
             id: `${table}-${id}`,
-            score: parseFloat(String(vector_score)),
+            score: parseFloat(String(hybrid_score)),
             content,
             metadata: __spreadProps(__spreadValues({}, rest), { source_table: table })
           });
         }
+        return tableResults;
       } catch (err) {
         console.error(
           `[MultiTablePostgresProvider] Error querying table "${table}":`,
           err.message
         );
+        return [];
       }
+    });
+    const resultsArray = await Promise.all(queryPromises);
+    for (const tableResults of resultsArray) {
+      allResults.push(...tableResults);
     }
     const resultsByTable = {};
     for (const res of allResults) {
-      const table = (_b = res.metadata) == null ? void 0 : _b.source_table;
+      const table = (_a = res.metadata) == null ? void 0 : _a.source_table;
       if (!resultsByTable[table]) resultsByTable[table] = [];
       resultsByTable[table].push(res);
     }
@@ -461,7 +487,7 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
     const finalSorted = balancedResults.sort((a, b) => b.score - a.score);
     if (finalSorted.length > 0) {
       console.log(`[MultiTablePostgresProvider] --- Search Complete ---`);
-      console.log(`[MultiTablePostgresProvider] Final top match from "${(_d = (_c = finalSorted[0].metadata) == null ? void 0 : _c.source_table) != null ? _d : "unknown"}" with score ${finalSorted[0].score.toFixed(4)}`);
+      console.log(`[MultiTablePostgresProvider] Final top match from "${(_c = (_b = finalSorted[0].metadata) == null ? void 0 : _b.source_table) != null ? _c : "unknown"}" with score ${finalSorted[0].score.toFixed(4)}`);
     }
     return finalSorted.slice(0, Math.max(topK, 15));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrivora-ai/rag-engine",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Retrivora AI is a plug-and-play AI engine for RAG chat experiences — generic vector DB + LLM provider, embeddable or standalone.",
   "author": "Abhinav Alkuchi",
   "license": "MIT",

package/src/core/Pipeline.ts

@@ -135,7 +135,8 @@ export class Pipeline {
 
     try {
       const queryVector = await this.embeddingProvider.embed(question, { taskType: 'query' });
-      const rawMatches = await this.vectorDB.query(queryVector, topK, ns);
+      // Pass the original text to the vector DB so it can perform hybrid (keyword) search if supported
+      const rawMatches = await this.vectorDB.query(queryVector, topK, ns, { __queryText: question });
 
       const sources = rawMatches.filter((m) => m.score >= scoreThreshold);
       const context = sources.length

package/src/providers/vectordb/MultiTablePostgresProvider.ts

@@ -1,3 +1,6 @@
+
+
+
 import { Pool, PoolClient } from 'pg';
 import { BaseVectorProvider } from './BaseVectorProvider';
 import { VectorMatch, UpsertDocument } from '../../types';
@@ -46,7 +49,7 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
 
   async initialize(): Promise<void> {
     this.pool = new Pool({ connectionString: this.connectionString });
-    
+
     // Dynamically discover all tables that have an 'embedding' column
     const client: PoolClient = await this.pool.connect();
     try {
@@ -56,9 +59,9 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
         WHERE column_name = 'embedding' 
         AND table_schema = 'public'
       `);
-      
+
       const discoveredTables = res.rows.map(r => r.table_name);
-      
+
       if (this.tables.length === 0) {
         // No static tables configured, use everything discovered
         this.tables = discoveredTables;
@@ -66,7 +69,7 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
         // Filter configured tables to ensure they actually exist with embeddings
         const staticTables = [...this.tables];
         this.tables = staticTables.filter(t => discoveredTables.includes(t));
-        
+
         if (this.tables.length < staticTables.length) {
           const missing = staticTables.filter(t => !discoveredTables.includes(t));
           console.warn(`[MultiTablePostgresProvider] Some configured tables were skipped (missing 'embedding' column): ${missing.join(', ')}`);
@@ -111,8 +114,8 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
   async query(
     vector: number[],
     topK: number,
-    _namespace?: string, // eslint-disable-line @typescript-eslint/no-unused-vars
-    _filter?: Record<string, unknown> // eslint-disable-line @typescript-eslint/no-unused-vars
+    _namespace?: string,
+    _filter?: Record<string, unknown>
   ): Promise<VectorMatch[]> {
     if (!this.pool) {
       throw new Error('[MultiTablePostgresProvider] Provider not initialized. Call initialize() first.');
@@ -123,49 +126,78 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
 
     console.log(`[MultiTablePostgresProvider] --- Starting Multi-Table Search ---`);
 
-    for (const table of this.tables) {
+    const queryText = _filter?.__queryText as string | undefined;
+
+    const queryPromises = this.tables.map(async (table) => {
       try {
-        // We use a hybrid approach:
-        // 1. Vector similarity (Semantic)
-        // 2. Simple keyword matching (Exact) to boost relevance for specific names
-        const result = await this.pool.query(
-          `SELECT *, 
-           (1 - (embedding <=> $1::vector)) AS vector_score
-           FROM "${table}"
-           ORDER BY vector_score DESC
-           LIMIT 50`,
-          [vectorLiteral]
-        );
+        let sqlQuery = '';
+        let params: unknown[] = [];
+
+        if (queryText) {
+          // Actual Hybrid Search: Semantic Vector Score + Full-Text Keyword Rank
+          sqlQuery = `
+            SELECT *, 
+             (1 - (embedding <=> $1::vector)) AS vector_score,
+             ts_rank(to_tsvector('english', t.*::text), plainto_tsquery('english', $2)) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (ts_rank(to_tsvector('english', t.*::text), plainto_tsquery('english', $2)) * 2.0)) AS hybrid_score
+            FROM "${table}" t
+            ORDER BY hybrid_score DESC
+            LIMIT 50
+          `;
+          params = [vectorLiteral, queryText];
+        } else {
+          // Fallback to Vector-only Search
+          sqlQuery = `
+            SELECT *, 
+             (1 - (embedding <=> $1::vector)) AS hybrid_score
+            FROM "${table}" t
+            ORDER BY hybrid_score DESC
+            LIMIT 50
+          `;
+          params = [vectorLiteral];
+        }
+
+        const result = await this.pool.query(sqlQuery, params);
 
         if (result.rowCount && result.rowCount > 0) {
-          console.log(`   ✅ Table "${table}": Found ${result.rowCount} potential matches. Top score: ${result.rows[0].vector_score.toFixed(4)}`);
+          console.log(`   ✅ Table "${table}": Found ${result.rowCount} potential matches. Top score: ${result.rows[0].hybrid_score.toFixed(4)}`);
         } else {
           console.log(`   ⚪ Table "${table}": No relevant matches found.`);
         }
 
+        const tableResults: VectorMatch[] = [];
         for (const row of result.rows) {
-          const { vector_score, id, ...rest } = row as Record<string, unknown>;
+          const { hybrid_score, id, ...rest } = row as Record<string, unknown>;
           delete rest.embedding;
+          delete rest.vector_score;
+          delete rest.keyword_score;
 
-          const content = `[TYPE: ${table.replace(/s$/, '').toUpperCase()}]\n` + 
+          const content = `[TYPE: ${table.replace(/s$/, '').toUpperCase()}]\n` +
             Object.entries(rest)
               .filter(([k, v]) => v !== null && typeof v !== 'object' && k !== 'id')
               .map(([k, v]) => `${k}: ${v}`)
               .join('\n');
 
-          allResults.push({
+          tableResults.push({
             id: `${table}-${id}`,
-            score: parseFloat(String(vector_score)),
+            score: parseFloat(String(hybrid_score)),
             content,
             metadata: { ...rest, source_table: table },
           });
         }
+        return tableResults;
       } catch (err) {
         console.error(
           `[MultiTablePostgresProvider] Error querying table "${table}":`,
           (err as Error).message
         );
+        return [];
       }
+    });
+
+    const resultsArray = await Promise.all(queryPromises);
+    for (const tableResults of resultsArray) {
+      allResults.push(...tableResults);
     }
 
     // 1. Group results by table to ensure we take the top ones from each
@@ -179,7 +211,7 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
     // 2. Take top 3 from EACH table guaranteed, then fill the rest with overall best
     const balancedResults: VectorMatch[] = [];
     const tables = Object.keys(resultsByTable);
-    
+
     // First, ensure every table's best match is included
     for (const table of tables) {
       balancedResults.push(...resultsByTable[table].slice(0, 3));