@retrivora-ai/rag-engine 1.6.6 → 1.6.7

package/dist/index.js

@@ -456,7 +456,7 @@ function extractLikelyJsonBlock(raw) {
   return trimmed.slice(Math.min(...starts));
 }
 function looksLikeStructuredPayload(raw) {
-  return /"(view|chartType|type|data|items|rows|products|results)"\s*:/.test(raw);
+  return /"?(view|chartType|type|data|items|rows|products|results)"?\s*:/.test(raw);
 }
 function stripMarkdownTables(raw) {
   return raw.replace(
@@ -532,7 +532,7 @@ function extractStructuredPayload(raw) {
 }
 function isLikelyUiOnlyMessage(text) {
   const trimmed = text.trim();
-  return trimmed.length === 0 || /^(chart data|table data|visualization|visual representation)\s*:?\s*$/i.test(trimmed);
+  return trimmed.length === 0 || /^(chart data|table data|visualization|visual representation|product catalog|product recommendations|catalog summary)\s*:?\s*$/i.test(trimmed);
 }
 function resolveImage(data) {
   for (const key of ["image", "img", "thumbnail"]) {
@@ -637,9 +637,9 @@ function normalizeTabularRows(rows, columns) {
 }
 function resolveStructuredRows(config) {
   if (Array.isArray(config.data) && config.data.length > 0) return config.data;
-  if (Array.isArray(config.rows) && config.rows.length > 0) return config.rows;
   if (Array.isArray(config.items) && config.items.length > 0) return config.items;
   if (Array.isArray(config.products) && config.products.length > 0) return config.products;
+  if (Array.isArray(config.rows) && config.rows.length > 0) return config.rows;
   if (Array.isArray(config.results) && config.results.length > 0) return config.results;
   return [];
 }
@@ -652,14 +652,16 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
       const parsed = JSON.parse(sanitizeJson(extractLikelyJsonBlock(clean)));
       const config2 = __spreadValues({}, parsed);
       if (!config2.view) {
-        if (config2.type === "products" || Array.isArray(config2.items)) {
+        const resolvedRows2 = resolveStructuredRows(config2);
+        const hasProductLikeData = resolvedRows2.length > 0 && typeof resolvedRows2[0] === "object" && resolvedRows2[0] !== null && ("price" in resolvedRows2[0] || "brand" in resolvedRows2[0] || "image" in resolvedRows2[0]);
+        if (config2.type === "products" || Array.isArray(config2.items) || Array.isArray(config2.data) && hasProductLikeData) {
           config2.view = "carousel";
-          config2.data = config2.data || config2.items || [];
+          config2.data = resolvedRows2;
         } else if (typeof config2.type === "string" && ["pie", "bar", "line"].includes(config2.type) || typeof config2.chartType === "string" && ["pie", "bar", "line"].includes(config2.chartType)) {
           const resolvedChartType = config2.chartType === "pie" || config2.chartType === "bar" || config2.chartType === "line" ? config2.chartType : config2.type === "pie" || config2.type === "bar" || config2.type === "line" ? config2.type : "bar";
           config2.view = "chart";
           config2.chartType = resolvedChartType;
-          config2.data = config2.data || [];
+          config2.data = resolvedRows2;
         } else {
           config2.view = "table";
           config2.data = Array.isArray(config2.data) ? config2.data : Array.isArray(config2) ? config2 : [];
@@ -743,7 +745,7 @@ function MessageBubble({
   const isMedium = viewportSize === "medium";
   const [showSources, setShowSources] = import_react5.default.useState(false);
   const hasStructuredProductBlock = import_react5.default.useMemo(
-    () => /```(?:ui|json|chart)\s*[\s\S]*?"(?:view|type)"\s*:\s*"(?:carousel|products)"/i.test(message.content),
+    () => /```(?:ui|json|chart)\s*[\s\S]*?"?(?:view|type|data|products)"?\s*:\s*"?(?:carousel|products|table)"?/i.test(message.content) || /\{[\s\S]*?"?(?:view|type|data|products)"?\s*:\s*"?(?:carousel|products)"?[\s\S]*\}/i.test(message.content) && looksLikeStructuredPayload(message.content),
     [message.content]
   );
   const structuredContent = import_react5.default.useMemo(
@@ -838,13 +840,10 @@ function MessageBubble({
     const hasStructuredUiBlock = Boolean(structuredContent.payload) || /```(?:ui|json|chart)\s*[\s\S]*?"(?:view|chartType|type|data|items|rows|products|results)"\s*:/i.test(raw);
     raw = raw.replace(/([^\n])\n\|/g, "$1\n\n|").replace(/(\|[^\n]*\|)\n\n+(?=\|)/g, "$1\n");
     if (!isStreaming) {
-      raw = raw.replace(/(\{[\s\S]+?\})(?!\s*```)/g, (match) => {
+      raw = raw.replace(/(?:^|\n)\s*\{[\s\S]*\}\s*(?:\n|$)/g, (match) => {
+        if (match.includes("```")) return match;
         if (!looksLikeStructuredPayload(match)) return match;
-        const index = raw.indexOf(match);
-        const prefix = raw.substring(0, index);
-        const openBlocks = (prefix.match(/```/g) || []).length;
-        if (openBlocks % 2 !== 0) return match;
-        const type = match.includes('"view"') || match.includes('"chartType"') ? "ui" : "json";
+        const type = match.includes('"view"') || match.includes('"chartType"') || match.includes('"type": "pie"') || match.includes('"type":"pie"') || match.includes('"type": "bar"') || match.includes('"type":"bar"') || match.includes('"type": "line"') || match.includes('"type":"line"') ? "ui" : "json";
         return `
 
 \`\`\`${type}

package/dist/index.mjs

@@ -419,7 +419,7 @@ function extractLikelyJsonBlock(raw) {
   return trimmed.slice(Math.min(...starts));
 }
 function looksLikeStructuredPayload(raw) {
-  return /"(view|chartType|type|data|items|rows|products|results)"\s*:/.test(raw);
+  return /"?(view|chartType|type|data|items|rows|products|results)"?\s*:/.test(raw);
 }
 function stripMarkdownTables(raw) {
   return raw.replace(
@@ -495,7 +495,7 @@ function extractStructuredPayload(raw) {
 }
 function isLikelyUiOnlyMessage(text) {
   const trimmed = text.trim();
-  return trimmed.length === 0 || /^(chart data|table data|visualization|visual representation)\s*:?\s*$/i.test(trimmed);
+  return trimmed.length === 0 || /^(chart data|table data|visualization|visual representation|product catalog|product recommendations|catalog summary)\s*:?\s*$/i.test(trimmed);
 }
 function resolveImage(data) {
   for (const key of ["image", "img", "thumbnail"]) {
@@ -600,9 +600,9 @@ function normalizeTabularRows(rows, columns) {
 }
 function resolveStructuredRows(config) {
   if (Array.isArray(config.data) && config.data.length > 0) return config.data;
-  if (Array.isArray(config.rows) && config.rows.length > 0) return config.rows;
   if (Array.isArray(config.items) && config.items.length > 0) return config.items;
   if (Array.isArray(config.products) && config.products.length > 0) return config.products;
+  if (Array.isArray(config.rows) && config.rows.length > 0) return config.rows;
   if (Array.isArray(config.results) && config.results.length > 0) return config.results;
   return [];
 }
@@ -615,14 +615,16 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
       const parsed = JSON.parse(sanitizeJson(extractLikelyJsonBlock(clean)));
       const config2 = __spreadValues({}, parsed);
       if (!config2.view) {
-        if (config2.type === "products" || Array.isArray(config2.items)) {
+        const resolvedRows2 = resolveStructuredRows(config2);
+        const hasProductLikeData = resolvedRows2.length > 0 && typeof resolvedRows2[0] === "object" && resolvedRows2[0] !== null && ("price" in resolvedRows2[0] || "brand" in resolvedRows2[0] || "image" in resolvedRows2[0]);
+        if (config2.type === "products" || Array.isArray(config2.items) || Array.isArray(config2.data) && hasProductLikeData) {
           config2.view = "carousel";
-          config2.data = config2.data || config2.items || [];
+          config2.data = resolvedRows2;
         } else if (typeof config2.type === "string" && ["pie", "bar", "line"].includes(config2.type) || typeof config2.chartType === "string" && ["pie", "bar", "line"].includes(config2.chartType)) {
           const resolvedChartType = config2.chartType === "pie" || config2.chartType === "bar" || config2.chartType === "line" ? config2.chartType : config2.type === "pie" || config2.type === "bar" || config2.type === "line" ? config2.type : "bar";
           config2.view = "chart";
           config2.chartType = resolvedChartType;
-          config2.data = config2.data || [];
+          config2.data = resolvedRows2;
         } else {
           config2.view = "table";
           config2.data = Array.isArray(config2.data) ? config2.data : Array.isArray(config2) ? config2 : [];
@@ -706,7 +708,7 @@ function MessageBubble({
   const isMedium = viewportSize === "medium";
   const [showSources, setShowSources] = React5.useState(false);
   const hasStructuredProductBlock = React5.useMemo(
-    () => /```(?:ui|json|chart)\s*[\s\S]*?"(?:view|type)"\s*:\s*"(?:carousel|products)"/i.test(message.content),
+    () => /```(?:ui|json|chart)\s*[\s\S]*?"?(?:view|type|data|products)"?\s*:\s*"?(?:carousel|products|table)"?/i.test(message.content) || /\{[\s\S]*?"?(?:view|type|data|products)"?\s*:\s*"?(?:carousel|products)"?[\s\S]*\}/i.test(message.content) && looksLikeStructuredPayload(message.content),
     [message.content]
   );
   const structuredContent = React5.useMemo(
@@ -801,13 +803,10 @@ function MessageBubble({
     const hasStructuredUiBlock = Boolean(structuredContent.payload) || /```(?:ui|json|chart)\s*[\s\S]*?"(?:view|chartType|type|data|items|rows|products|results)"\s*:/i.test(raw);
     raw = raw.replace(/([^\n])\n\|/g, "$1\n\n|").replace(/(\|[^\n]*\|)\n\n+(?=\|)/g, "$1\n");
     if (!isStreaming) {
-      raw = raw.replace(/(\{[\s\S]+?\})(?!\s*```)/g, (match) => {
+      raw = raw.replace(/(?:^|\n)\s*\{[\s\S]*\}\s*(?:\n|$)/g, (match) => {
+        if (match.includes("```")) return match;
         if (!looksLikeStructuredPayload(match)) return match;
-        const index = raw.indexOf(match);
-        const prefix = raw.substring(0, index);
-        const openBlocks = (prefix.match(/```/g) || []).length;
-        if (openBlocks % 2 !== 0) return match;
-        const type = match.includes('"view"') || match.includes('"chartType"') ? "ui" : "json";
+        const type = match.includes('"view"') || match.includes('"chartType"') || match.includes('"type": "pie"') || match.includes('"type":"pie"') || match.includes('"type": "bar"') || match.includes('"type":"bar"') || match.includes('"type": "line"') || match.includes('"type":"line"') ? "ui" : "json";
         return `
 
 \`\`\`${type}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrivora-ai/rag-engine",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "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/components/MessageBubble.tsx

@@ -103,7 +103,7 @@ function extractLikelyJsonBlock(raw: string): string {
 }
 
 function looksLikeStructuredPayload(raw: string): boolean {
-  return /"(view|chartType|type|data|items|rows|products|results)"\s*:/.test(raw);
+  return /"?(view|chartType|type|data|items|rows|products|results)"?\s*:/.test(raw);
 }
 
 function stripMarkdownTables(raw: string): string {
@@ -195,7 +195,10 @@ function extractStructuredPayload(raw: string): { payload: string | null; text:
 
 function isLikelyUiOnlyMessage(text: string): boolean {
   const trimmed = text.trim();
-  return trimmed.length === 0 || /^(chart data|table data|visualization|visual representation)\s*:?\s*$/i.test(trimmed);
+  return (
+    trimmed.length === 0 ||
+    /^(chart data|table data|visualization|visual representation|product catalog|product recommendations|catalog summary)\s*:?\s*$/i.test(trimmed)
+  );
 }
 
 // ─── Tiny helpers ─────────────────────────────────────────────────────────────
@@ -415,9 +418,9 @@ function normalizeTabularRows(
 
 function resolveStructuredRows(config: Partial<RawUIConfig> & Record<string, unknown>) {
   if (Array.isArray(config.data) && config.data.length > 0) return config.data;
-  if (Array.isArray(config.rows) && config.rows.length > 0) return config.rows;
   if (Array.isArray(config.items) && config.items.length > 0) return config.items;
   if (Array.isArray(config.products) && config.products.length > 0) return config.products;
+  if (Array.isArray(config.rows) && config.rows.length > 0) return config.rows;
   if (Array.isArray(config.results) && config.results.length > 0) return config.results;
   return [];
 }
@@ -442,9 +445,13 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
 
       // Smart Auto-Detection for legacy or simpler formats
       if (!config.view) {
-        if (config.type === 'products' || Array.isArray(config.items)) {
+        const resolvedRows = resolveStructuredRows(config);
+        const hasProductLikeData = resolvedRows.length > 0 && typeof resolvedRows[0] === 'object' && resolvedRows[0] !== null && 
+          ('price' in resolvedRows[0] || 'brand' in resolvedRows[0] || 'image' in resolvedRows[0]);
+
+        if (config.type === 'products' || Array.isArray(config.items) || (Array.isArray(config.data) && hasProductLikeData)) {
           config.view = 'carousel';
-          config.data = config.data || config.items || [];
+          config.data = resolvedRows;
         } else if (
           (typeof config.type === 'string' && ['pie', 'bar', 'line'].includes(config.type)) ||
           (typeof config.chartType === 'string' && ['pie', 'bar', 'line'].includes(config.chartType))
@@ -457,7 +464,7 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
                 : 'bar';
           config.view = 'chart';
           config.chartType = resolvedChartType;
-          config.data = config.data || [];
+          config.data = resolvedRows;
         } else {
           config.view = 'table';
           config.data = Array.isArray(config.data) ? config.data : (Array.isArray(config) ? config : []);
@@ -582,7 +589,8 @@ export function MessageBubble({
   const isMedium = viewportSize === 'medium';
   const [showSources, setShowSources] = React.useState(false);
   const hasStructuredProductBlock = React.useMemo(
-    () => /```(?:ui|json|chart)\s*[\s\S]*?"(?:view|type)"\s*:\s*"(?:carousel|products)"/i.test(message.content),
+    () => /```(?:ui|json|chart)\s*[\s\S]*?"?(?:view|type|data|products)"?\s*:\s*"?(?:carousel|products|table)"?/i.test(message.content) ||
+          (/\{[\s\S]*?"?(?:view|type|data|products)"?\s*:\s*"?(?:carousel|products)"?[\s\S]*\}/i.test(message.content) && looksLikeStructuredPayload(message.content)),
     [message.content],
   );
   const structuredContent = React.useMemo(
@@ -699,20 +707,16 @@ export function MessageBubble({
       .replace(/(\|[^\n]*\|)\n\n+(?=\|)/g, '$1\n'); // Remove blank lines between rows
 
     // 2. HEALING: Detect naked JSON charts/products and wrap them if markers are missing
-    // CRITICAL: DO NOT REVERT THIS REGEX. It must remain non-greedy and position-independent
-    // to catch JSON that is not preceded by a newline (common in many LLM outputs).
+    // This handles models (like Llama 3.2) that often omit the ```chart markers.
     if (!isStreaming) {
-      // Find potential JSON objects that are not already wrapped in code blocks
-      raw = raw.replace(/(\{[\s\S]+?\})(?!\s*```)/g, (match) => {
+      // Look for objects that look like chart or product data
+      raw = raw.replace(/(?:^|\n)\s*\{[\s\S]*\}\s*(?:\n|$)/g, (match) => {
+        // Only wrap if not already in a code block
+        if (match.includes('```')) return match;
         if (!looksLikeStructuredPayload(match)) return match;
-        
-        // Final check: is it already inside a code block? (heuristic check)
-        const index = raw.indexOf(match);
-        const prefix = raw.substring(0, index);
-        const openBlocks = (prefix.match(/```/g) || []).length;
-        if (openBlocks % 2 !== 0) return match;
-
-        const type = match.includes('"view"') || match.includes('"chartType"') ? 'ui' : 'json';
+        const type = match.includes('"view"') || match.includes('"chartType"') || match.includes('"type": "pie"') || match.includes('"type":"pie"') || match.includes('"type": "bar"') || match.includes('"type":"bar"') || match.includes('"type": "line"') || match.includes('"type":"line"')
+          ? 'ui'
+          : 'json';
         return `\n\n\`\`\`${type}\n${match.trim()}\n\`\`\`\n\n`;
       });
     }