@retrivora-ai/rag-engine 1.6.3 → 1.6.5

package/dist/index.js

@@ -838,10 +838,13 @@ 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(/(?:^|\n)\s*\{[\s\S]*\}\s*(?:\n|$)/g, (match) => {
-        if (match.includes("```")) return match;
+      raw = raw.replace(/(\{[\s\S]+?\})(?!\s*```)/g, (match) => {
         if (!looksLikeStructuredPayload(match)) return match;
-        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";
+        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";
         return `
 
 \`\`\`${type}

package/dist/index.mjs

@@ -801,10 +801,13 @@ 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(/(?:^|\n)\s*\{[\s\S]*\}\s*(?:\n|$)/g, (match) => {
-        if (match.includes("```")) return match;
+      raw = raw.replace(/(\{[\s\S]+?\})(?!\s*```)/g, (match) => {
         if (!looksLikeStructuredPayload(match)) return match;
-        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";
+        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";
         return `
 
 \`\`\`${type}

package/package.json

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

@@ -439,7 +439,7 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
         .trim();
       const parsed = JSON.parse(sanitizeJson(extractLikelyJsonBlock(clean)));
       const config = { ...parsed } as Partial<RawUIConfig> & Record<string, unknown>;
-      
+
       // Smart Auto-Detection for legacy or simpler formats
       if (!config.view) {
         if (config.type === 'products' || Array.isArray(config.items)) {
@@ -502,8 +502,8 @@ function UIDispatcher({ rawContent, primaryColor, accentColor, isStreaming, onAd
           {hasDescription && (
             <p className={`px-2 ${isCompact ? 'text-xs' : 'text-sm'} text-slate-500 dark:text-white/60`}>{config.description}</p>
           )}
-          <DynamicChart 
-            config={{ 
+          <DynamicChart
+            config={{
               type: (config.chartType || 'bar') as 'bar' | 'line' | 'pie',
               data: config.data as unknown as Record<string, string | number>[],
               xAxisKey: config.xAxisKey,
@@ -692,22 +692,25 @@ export function MessageBubble({
   const processedMarkdown = React.useMemo(() => {
     let raw = structuredContent.payload ? structuredContent.text : (cleanContent || message.content);
     const hasStructuredUiBlock = Boolean(structuredContent.payload) || /```(?:ui|json|chart)\s*[\s\S]*?"(?:view|chartType|type|data|items|rows|products|results)"\s*:/i.test(raw);
-    
+
     // 1. Structural fixes
     raw = raw.replace(/([^\n])\n\|/g, '$1\n\n|') // Ensure blank line before table
-             .replace(/(\|[^\n]*\|)\n\n+(?=\|)/g, '$1\n'); // Remove blank lines between rows
+      .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
-    // This handles models (like Llama 3.2) that often omit the ```chart markers.
+    // This handles models (like Llama 3.2) that often omit the ```ui markers.
     if (!isStreaming) {
-      // 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;
+      // Find potential JSON objects that are not already wrapped in code blocks
+      raw = raw.replace(/(\{[\s\S]+?\})(?!\s*```)/g, (match) => {
         if (!looksLikeStructuredPayload(match)) return match;
-        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';
+        
+        // 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';
         return `\n\n\`\`\`${type}\n${match.trim()}\n\`\`\`\n\n`;
       });
     }
@@ -871,8 +874,8 @@ export function MessageBubble({
       {/* Avatar */}
       <div
         className={`flex-shrink-0 ${isCompact ? 'w-7 h-7' : 'w-8 h-8'} rounded-full flex items-center justify-center shadow-lg ${isUser
-            ? 'text-white'
-            : 'bg-slate-100 dark:bg-white/10 text-slate-700 dark:text-white/80'
+          ? 'text-white'
+          : 'bg-slate-100 dark:bg-white/10 text-slate-700 dark:text-white/80'
           }`}
         style={isUser ? { background: `linear-gradient(135deg, ${primaryColor}, ${accentColor})` } : {}}
       >
@@ -883,8 +886,8 @@ export function MessageBubble({
         {/* Bubble */}
         <div
           className={`relative ${isCompact ? 'px-3 py-2.5 text-[13px]' : 'px-4 py-3 text-sm'} rounded-2xl leading-relaxed shadow-sm dark:shadow-lg ${isUser
-              ? 'text-white rounded-tr-sm'
-              : 'bg-white dark:bg-white/5 border border-slate-200 dark:border-white/10 text-slate-800 dark:text-white/90 rounded-tl-sm'
+            ? 'text-white rounded-tr-sm'
+            : 'bg-white dark:bg-white/5 border border-slate-200 dark:border-white/10 text-slate-800 dark:text-white/90 rounded-tl-sm'
             }`}
           style={
             isUser ? { background: `linear-gradient(135deg, ${primaryColor}, ${accentColor})` } : {}

package/src/core/Pipeline.ts

@@ -214,7 +214,7 @@ Assistant:
       try {
         const chunks = await this.prepareChunks(doc);
         const vectors = await this.processEmbeddings(chunks);
-        
+
         const upsertDocs = chunks.map((chunk, i) => ({
           id: chunk.id,
           vector: vectors[i],
@@ -316,7 +316,7 @@ Assistant:
    */
   private async processGraphIngestion(docId: string | number, chunks: Chunk[]): Promise<void> {
     console.log(`[Pipeline] Extracting entities for doc ${docId} (${chunks.length} chunks)...`);
-    
+
     const extractionOptions: BatchOptions = {
       batchSize: 2, // Low concurrency for LLM extraction
       maxRetries: 1,
@@ -387,11 +387,11 @@ Assistant:
       // 2. Parallel Retrieval
       const hints = QueryProcessor.extractQueryFieldHints(question, this.config.rag?.filterableFields);
       const filter = QueryProcessor.buildQueryFilter(question, hints);
-      
+
       console.log(`[Pipeline] 🧩 Extracted filters:`, JSON.stringify(filter));
 
-      const { sources: rawSources, graphData } = await this.retrieve(searchQuery, { 
-        namespace: ns, 
+      const { sources: rawSources, graphData } = await this.retrieve(searchQuery, {
+        namespace: ns,
         topK: topK * 2,
         filter
       });
@@ -410,7 +410,7 @@ Assistant:
         : 'No relevant context found.';
 
       if (graphData && graphData.nodes.length > 0) {
-        const graphContext = graphData.nodes.map(n => 
+        const graphContext = graphData.nodes.map(n =>
           `Entity: ${n.label} (${n.id})${n.properties ? ' - ' + JSON.stringify(n.properties) : ''}`
         ).join('\n');
         context = `GRAPH KNOWLEDGE:\n${graphContext}\n\nVECTOR CONTEXT:\n${context}`;
@@ -418,7 +418,7 @@ Assistant:
 
       // 5. Generation (Streaming)
       const messages: ChatMessage[] = [...history, { role: 'user', content: question }];
-      
+
       if (this.llmProvider.chatStream) {
         const stream = this.llmProvider.chatStream(messages, context);
         if (!stream) {
@@ -450,7 +450,7 @@ Assistant:
 
     const cacheKey = `${ns}::${query}`;
     let queryVector = this.embeddingCache.get(cacheKey);
-    
+
     const [retrievedVector, graphData] = await Promise.all([
       queryVector ? Promise.resolve(queryVector) : this.embeddingProvider.embed(query, { taskType: 'query' }),
       this.graphDB && this.config.rag?.useGraphRetrieval