@retrivora-ai/rag-engine 2.0.8 → 2.1.2

package/src/llm/providers/QwenProvider.ts

@@ -99,12 +99,16 @@ export class QwenProvider implements ILLMProvider {
       content: buildSystemContent(basePrompt, context),
     };
 
+    const safeMessages = (Array.isArray(messages) ? messages : [])
+      .filter((m): m is ChatMessage => Boolean(m && typeof m === 'object'))
+      .map((m) => ({
+        role: (m.role || 'user') as 'user' | 'assistant',
+        content: typeof m.content === 'string' ? m.content : (m.content != null ? String(m.content) : ''),
+      }));
+
     const formattedMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
       systemMessage,
-      ...messages.map((m) => ({
-        role: m.role as 'user' | 'assistant',
-        content: m.content,
-      })),
+      ...safeMessages,
     ];
 
     const completion = await this.client.chat.completions.create({
@@ -129,12 +133,16 @@ export class QwenProvider implements ILLMProvider {
       content: buildSystemContent(basePrompt, context),
     };
 
+    const safeStreamMessages = (Array.isArray(messages) ? messages : [])
+      .filter((m): m is ChatMessage => Boolean(m && typeof m === 'object'))
+      .map((m) => ({
+        role: (m.role || 'user') as 'user' | 'assistant',
+        content: typeof m.content === 'string' ? m.content : (m.content != null ? String(m.content) : ''),
+      }));
+
     const formattedMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
       systemMessage,
-      ...messages.map((m) => ({
-        role: m.role as 'user' | 'assistant',
-        content: m.content,
-      })),
+      ...safeStreamMessages,
     ];
 
     const stream = await this.client.chat.completions.create({

package/src/llm/providers/UniversalLLMAdapter.ts

@@ -83,9 +83,16 @@ export class UniversalLLMAdapter implements ILLMProvider {
   async chat(messages: ChatMessage[], context?: string): Promise<string> {
     const path = this.opts.chatPath ?? '/chat/completions';
 
+    const safeMessages = (Array.isArray(messages) ? messages : [])
+      .filter((m): m is ChatMessage => Boolean(m && typeof m === 'object'))
+      .map((m) => ({
+        role: m.role || 'user',
+        content: typeof m.content === 'string' ? m.content : (m.content != null ? String(m.content) : ''),
+      }));
+
     const formattedMessages = [
       { role: 'system', content: `${this.systemPrompt}\n\nContext:\n${context ?? 'None'}` },
-      ...messages,
+      ...safeMessages,
     ];
 
     let payload: unknown;
@@ -105,8 +112,17 @@ export class UniversalLLMAdapter implements ILLMProvider {
       };
     }
 
-    const isSelfHost = this.baseUrl.includes('retrivora.com') || this.baseUrl.includes('localhost');
-    if (isSelfHost || Boolean(process.env.VERCEL)) {
+    // Try direct HTTP POST request to llm.retrivora.com first
+    try {
+      const { data } = await this.http.post(path, payload);
+      const extractPath = this.opts.responseExtractPath ?? 'choices[0].message.content';
+      const result = resolvePath(data, extractPath) ?? extractContent(data);
+      if (result !== undefined) {
+        return String(result);
+      }
+    } catch (httpErr: any) {
+      console.warn(`[UniversalLLMAdapter] Direct HTTP POST to ${this.baseUrl}${path} failed (${httpErr.message}). Attempting in-process gateway dispatch fallback...`);
+      
       const _g = globalThis as any;
       let dispatch = _g.__retrivoraDispatchChat;
       if (typeof dispatch !== 'function') {
@@ -121,25 +137,19 @@ export class UniversalLLMAdapter implements ILLMProvider {
       }
 
       if (typeof dispatch === 'function') {
-        try {
-          const res = await dispatch({
-            model: this.model,
-            messages: formattedMessages as any,
-            max_tokens: this.maxTokens,
-            temperature: this.temperature,
-          }, this.apiKey);
-
-          const content = extractContent(res?.response);
-          if (content !== undefined) {
-            return content;
-          }
-          throw new Error(`[UniversalLLMAdapter] In-process dispatch returned empty content for model: ${this.model}`);
-        } catch (dispatchErr) {
-          throw dispatchErr;
+        const res = await dispatch({
+          model: this.model,
+          messages: formattedMessages as any,
+          max_tokens: this.maxTokens,
+          temperature: this.temperature,
+        }, this.apiKey);
+
+        const content = extractContent(res?.response);
+        if (content !== undefined) {
+          return content;
         }
-      } else {
-        throw new Error(`[UniversalLLMAdapter] In-process gateway dispatch not registered. Direct self-referential HTTP calls to ${this.baseUrl} are disabled on Vercel to prevent HTTP 508 Loop Detected.`);
       }
+      throw httpErr;
     }
 
     const { data } = await this.http.post(path, payload);
@@ -166,9 +176,16 @@ export class UniversalLLMAdapter implements ILLMProvider {
     const extractPath = (this.opts.responseExtractPath ?? 'choices[0].message.content')
       .replace('message.content', 'delta.content');
 
+    const safeMessages = (Array.isArray(messages) ? messages : [])
+      .filter((m): m is ChatMessage => Boolean(m && typeof m === 'object'))
+      .map((m) => ({
+        role: m.role || 'user',
+        content: typeof m.content === 'string' ? m.content : (m.content != null ? String(m.content) : ''),
+      }));
+
     const formattedMessages = [
       { role: 'system', content: `${this.systemPrompt}\n\nContext:\n${context ?? 'None'}` },
-      ...messages,
+      ...safeMessages,
     ];
 
     let payload: unknown;
@@ -314,8 +331,17 @@ export class UniversalLLMAdapter implements ILLMProvider {
       };
     }
 
-    const isSelfHost = this.baseUrl.includes('retrivora.com') || this.baseUrl.includes('localhost');
-    if (isSelfHost || Boolean(process.env.VERCEL)) {
+    // Try direct HTTP POST request to llm.retrivora.com first
+    try {
+      const { data } = await this.http.post(path, payload);
+      const extractPath = this.opts.embedExtractPath ?? 'data[0].embedding';
+      const vector = resolvePath(data, extractPath);
+      if (Array.isArray(vector)) {
+        return vector as number[];
+      }
+    } catch (httpErr: any) {
+      console.warn(`[UniversalLLMAdapter] Direct HTTP embedding POST to ${this.baseUrl}${path} failed (${httpErr.message}). Attempting in-process gateway dispatch fallback...`);
+
       const _g = globalThis as any;
       let dispatch = _g.__retrivoraDispatchEmbedding;
       if (typeof dispatch !== 'function') {
@@ -330,22 +356,16 @@ export class UniversalLLMAdapter implements ILLMProvider {
       }
 
       if (typeof dispatch === 'function') {
-        try {
-          const res = await dispatch({
-            model: this.model,
-            input: text,
-          }, this.apiKey);
+        const res = await dispatch({
+          model: this.model,
+          input: text,
+        }, this.apiKey);
 
-          if (res?.data?.[0]?.embedding) {
-            return res.data[0].embedding;
-          }
-          throw new Error(`[UniversalLLMAdapter] In-process embedding dispatch returned invalid vector for model: ${this.model}`);
-        } catch (dispatchErr) {
-          throw dispatchErr;
+        if (res?.data?.[0]?.embedding) {
+          return res.data[0].embedding;
         }
-      } else {
-        throw new Error(`[UniversalLLMAdapter] In-process gateway dispatch not registered. Direct self-referential HTTP calls to ${this.baseUrl} are disabled on Vercel to prevent HTTP 508 Loop Detected.`);
       }
+      throw httpErr;
     }
 
     const { data } = await this.http.post(path, payload);

package/src/rendering/IntentClassifier.ts

@@ -126,10 +126,10 @@ export class IntentClassifier {
   // ─── Intent Heuristic Checkers ─────────────────────────────────────────────
 
   private static isInformationLookup(query: string): boolean {
-    // Exact single-fact pattern matches e.g. "What is X?", "Explain Y", "Price of Z", "Can Auvira be assigned..."
-    if (/^(what|who|explain|define|where|when|why|how|how does|can|could|does|do|is|are|has|have|will|should|would|meaning of)\s+/i.test(query)) {
+    // Exact single-fact pattern matches e.g. "What is X?", "Explain Y", "Explore Z", "Tell me about A"
+    if (/^(what|who|explain|explore|define|where|when|why|how|how does|can|could|does|do|is|are|has|have|will|should|would|meaning of|tell me about|show details of|overview of|summarize)\s+/i.test(query)) {
       // Exclude comparison or analytical phrasing inside "what is the trend..."
-      if (!/\b(compare|versus|vs\.?|trend|monthly|revenue|top selling|best)\b/i.test(query)) {
+      if (!/\b(compare|versus|vs\.?|trend|monthly|revenue|top 10|top selling|best|chart|graph|plot|breakdown|analytics)\b/i.test(query)) {
         return true;
       }
     }

package/src/rendering/rules/Rule1SpecificInfoRule.ts

@@ -10,7 +10,7 @@ export class Rule1SpecificInfoRule implements IRenderRule {
     // Check specific fact/definition/explanation indicators
     const isFactQuery =
       intent === 'information_lookup' ||
-      /^(what|who|explain|define|where|when|why|meaning of)\s+/i.test(q) ||
+      /^(what|who|explain|explore|define|where|when|why|meaning of|tell me about|show details of|overview of|summarize)\s+/i.test(q) ||
       /^(what is the price of|price of|cost of)\b/i.test(q);
 
     const isNonVisual = !/\b(compare|versus|vs\.?|trend|monthly|revenue|best|top 10|chart|table|list|grid)\b/i.test(q);

package/src/utils/ProductExtractor.ts

@@ -196,6 +196,7 @@ export function isLikelyUiOnlyMessage(text: string): boolean {
 export function extractProductsFromSources(sources: VectorMatch[] | undefined, isUser: boolean): Product[] {
   if (isUser || !sources) return [];
   return sources
+    .filter((s): s is VectorMatch => Boolean(s && typeof s === 'object'))
     .filter(s => {
       const m = s.metadata ?? {};
       const keys = Object.keys(m).map(k => k.toLowerCase());
@@ -204,7 +205,7 @@ export function extractProductsFromSources(sources: VectorMatch[] | undefined, i
       );
       const hasProductIdentity = keys.some(k => ['brand', 'model'].includes(k)) &&
         keys.some(k => ['name', 'title', 'product_name', 'product'].includes(k));
-      const hasPricePattern = /\$\s*\d+/.test(s.content);
+      const hasPricePattern = /\$\s*\d+/.test(s?.content ?? '');
       return hasStrongProductKey || hasProductIdentity || hasPricePattern || m.type === 'product';
     })
     .map(s => {
@@ -215,13 +216,13 @@ export function extractProductsFromSources(sources: VectorMatch[] | undefined, i
       const description = resolveMetadataValue(m, 'description') as string;
 
       return {
-        id: s.id,
+        id: s?.id ?? `prod_${Math.random().toString(36).substring(2, 8)}`,
         name: name ?? (s?.content ?? '').split('\n')[0] ?? 'Unknown Product',
         brand: brand,
         price: price,
         image: resolveImage(m),
         link: resolveMetadataValue(m, 'link') as string,
-        description: description ? description : '' //description ?? s.content,
+        description: description ? description : '',
       };
     });
 }

package/src/utils/UITransformer.ts

@@ -1121,6 +1121,15 @@ RULES:
     query: string,
   ): UITransformationResponse | null {
     if (profile.records.length === 0) return null;
+
+    const q = query.toLowerCase().trim();
+    // Do not automatically force charts unless query contains visual or analytical intent
+    const isExplicitVisualOrAnalytic = /\b(chart|graph|plot|visualize|trend|monthly|revenue|top\s*\d+|breakdown|analytics|compare|versus|vs\.?|histogram|pie|bar|line|distribution|percentage|share|summary of metrics)\b/i.test(q);
+
+    if (!isExplicitVisualOrAnalytic) {
+      return null;
+    }
+
     if (profile.dateFields.length > 0 && profile.numericFields.length > 0) {
       return this.transformToLineChart(profile);
     }
@@ -1265,6 +1274,7 @@ RULES:
   }
 
   private static getProductCategory(item: VectorMatch): string | null {
+    if (!item) return null;
     const meta = item.metadata || {};
     const metadataCategory = resolveMetadataValue(meta, 'category');
     if (this.isUsableCategory(metadataCategory)) return String(metadataCategory).trim();
@@ -1401,6 +1411,7 @@ RULES:
     };
 
     data.forEach(item => {
+      if (!item) return;
       Object.keys(item.metadata || {}).forEach(addField);
       for (const match of (item.content || '').matchAll(/(?:^|\n)\s*([A-Za-z][A-Za-z0-9_ /-]{1,50})\s*[:\-–]\s*([^\n]+)/g)) {
         addField(match[1]);
@@ -1551,6 +1562,7 @@ RULES:
   }
 
   private static extractStockQuantity(item: VectorMatch): number | null {
+    if (!item) return null;
     const meta = item.metadata || {};
     const stockValue = resolveMetadataValue(meta, 'stock');
     const numericStock = this.toFiniteNumber(stockValue);