@retrivora-ai/rag-engine 0.2.4 → 0.2.6

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

@@ -3763,7 +3763,7 @@ 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.");
     }
@@ -3771,7 +3771,7 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
     const allResults = [];
     console.log(`[MultiTablePostgresProvider] --- Starting Multi-Table Search ---`);
     const queryText = _filter == null ? void 0 : _filter.__queryText;
-    for (const table of this.tables) {
+    const queryPromises = this.tables.map(async (table) => {
       try {
         let sqlQuery = "";
         let params = [];
@@ -3779,8 +3779,8 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
           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
+             COALESCE(ts_rank(to_tsvector('english', t.*::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', t.*::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) * 2.0)) AS hybrid_score
             FROM "${table}" t
             ORDER BY hybrid_score DESC
             LIMIT 50
@@ -3802,28 +3802,37 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
         } else {
           console.log(`   \u26AA Table "${table}": No relevant matches found.`);
         }
+        const tableResults = [];
         for (const row of result.rows) {
-          const _a = row, { hybrid_score, vector_score, keyword_score, id } = _a, rest = __objRest(_a, ["hybrid_score", "vector_score", "keyword_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(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);
     }
@@ -3835,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

@@ -406,7 +406,7 @@ 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.");
     }
@@ -414,7 +414,7 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
     const allResults = [];
     console.log(`[MultiTablePostgresProvider] --- Starting Multi-Table Search ---`);
     const queryText = _filter == null ? void 0 : _filter.__queryText;
-    for (const table of this.tables) {
+    const queryPromises = this.tables.map(async (table) => {
       try {
         let sqlQuery = "";
         let params = [];
@@ -422,8 +422,8 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
           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
+             COALESCE(ts_rank(to_tsvector('english', t.*::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', t.*::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) * 2.0)) AS hybrid_score
             FROM "${table}" t
             ORDER BY hybrid_score DESC
             LIMIT 50
@@ -445,28 +445,37 @@ var MultiTablePostgresProvider = class extends BaseVectorProvider {
         } else {
           console.log(`   \u26AA Table "${table}": No relevant matches found.`);
         }
+        const tableResults = [];
         for (const row of result.rows) {
-          const _a = row, { hybrid_score, vector_score, keyword_score, id } = _a, rest = __objRest(_a, ["hybrid_score", "vector_score", "keyword_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(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);
     }
@@ -478,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.4",
+  "version": "0.2.6",
   "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/providers/vectordb/MultiTablePostgresProvider.ts

@@ -1,3 +1,6 @@
+
+
+
 import { Pool, PoolClient } from 'pg';
 import { BaseVectorProvider } from './BaseVectorProvider';
 import { VectorMatch, UpsertDocument } from '../../types';
@@ -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.');
@@ -125,18 +128,20 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
 
     const queryText = _filter?.__queryText as string | undefined;
 
-    for (const table of this.tables) {
+    const queryPromises = this.tables.map(async (table) => {
       try {
         let sqlQuery = '';
-        let params: any[] = [];
+        let params: unknown[] = [];
 
         if (queryText) {
           // Actual Hybrid Search: Semantic Vector Score + Full-Text Keyword Rank
+          // We convert plainto_tsquery's AND (&) operator to OR (|) so that natural language queries
+          // (which contain words like "price", "product" not found in the row text) still match entities like "Router".
           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
+             COALESCE(ts_rank(to_tsvector('english', t.*::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) AS keyword_score,
+             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', t.*::text), NULLIF(REPLACE(plainto_tsquery('english', $2)::text, '&', '|'), '')::tsquery), 0) * 2.0)) AS hybrid_score
             FROM "${table}" t
             ORDER BY hybrid_score DESC
             LIMIT 50
@@ -162,9 +167,12 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
           console.log(`   ⚪ Table "${table}": No relevant matches found.`);
         }
 
+        const tableResults: VectorMatch[] = [];
         for (const row of result.rows) {
-          const { hybrid_score, vector_score, keyword_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` +
             Object.entries(rest)
@@ -172,19 +180,26 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
               .map(([k, v]) => `${k}: ${v}`)
               .join('\n');
 
-          allResults.push({
+          tableResults.push({
             id: `${table}-${id}`,
             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