@retrivora-ai/rag-engine 1.8.4 → 1.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrivora-ai/rag-engine",
-  "version": "1.8.4",
+  "version": "1.8.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/app/globals.css

@@ -2,7 +2,104 @@
 
 @custom-variant dark (&:where(.dark, .dark *));
 
+@theme {
+  --animate-shapeshift: shapeshift 5s ease-in-out infinite forwards;
+  --animate-gradientMove: gradientMove 3.5s ease-in-out infinite alternate;
+  
+  @keyframes shapeshift {
+    0% { clip-path: var(--circle); rotate: 0turn; }
+    25% { clip-path: var(--flower); }
+    50% { clip-path: var(--cylinder); }
+    75% { clip-path: var(--hexagon); }
+    100% { clip-path: var(--circle); rotate: 1turn; }
+  }
+
+  @keyframes gradientMove {
+    0% { translate: 0 0; }
+    100% { translate: -75% -75%; }
+  }
+}
 
+@layer base {
+  :root {
+    --star: shape(
+      evenodd from 50% 24.787%,
+      curve by 7.143% 18.016% with 0% 0% / 2.9725% 13.814%,
+      curve by 17.882% 7.197% with 4.171% 4.2025% / 17.882% 7.197%,
+      curve by -17.882% 8.6765% with 0% 0% / -13.711% 4.474%,
+      curve by -7.143% 16.5365% with -4.1705% 4.202% / -7.143% 16.5365%,
+      curve by -8.6115% -16.5365% with 0% 0% / -4.441% -12.3345%,
+      curve by -16.4135% -8.6765% with -4.171% -4.2025% / -16.4135% -8.6765%,
+      curve by 16.4135% -7.197% with 0% 0% / 12.2425% -2.9945%,
+      curve by 8.6115% -18.016% with 4.1705% -4.202% / 8.6115% -18.016%,
+      close
+    );
+    --flower: shape(
+      evenodd from 17.9665% 82.0335%,
+      curve by -12.349% -32.0335% with -13.239% -5.129% / -18.021% -15.402%,
+      curve by -0.0275% -22.203% with -3.1825% -9.331% / -3.074% -16.6605%,
+      curve by 12.3765% -9.8305% with 2.3835% -4.3365% / 6.565% -7.579%,
+      curve by 32.0335% -12.349% with 5.129% -13.239% / 15.402% -18.021%,
+      curve by 20.4535% -0.8665% with 8.3805% -2.858% / 15.1465% -3.062%,
+      curve by 11.58% 13.2155% with 5.225% 2.161% / 9.0355% 6.6475%,
+      curve by 12.349% 32.0335% with 13.239% 5.129% / 18.021% 15.402%,
+      curve by 0.5715% 21.1275% with 2.9805% 8.7395% / 3.0745% 15.723%,
+      curve by -12.9205% 10.906% with -2.26% 4.88% / -6.638% 8.472%,
+      curve by -32.0335% 12.349% with -5.129% 13.239% / -15.402% 18.021%,
+      curve by -21.1215% 0.5745% with -8.736% 2.9795% / -15.718% 3.0745%,
+      curve by -10.912% -12.9235% with -4.883% -2.2595% / -8.477% -6.6385%,
+      close
+    );
+    --hexagon: shape(
+      evenodd from 6.47% 67.001%,
+      curve by 0% -34.002% with -1.1735% -7.7% / -1.1735% -26.302%,
+      curve by 7.0415% -12.1965% with 0.7075% -4.641% / 3.3765% -9.2635%,
+      curve by 29.447% -17.001% with 6.0815% -4.8665% / 22.192% -14.1675%,
+      curve by 14.083% 0% with 4.3725% -1.708% / 9.7105% -1.708%,
+      curve by 29.447% 17.001% with 7.255% 2.8335% / 23.3655% 12.1345%,
+      curve by 7.0415% 12.1965% with 3.665% 2.933% / 6.334% 7.5555%,
+      curve by 0% 34.002% with 1.1735% 7.7% / 1.1735% 26.302%,
+      curve by -7.0415% 12.1965% with -0.7075% 4.641% / -3.3765% 9.2635%,
+      curve by -29.447% 17.001% with -6.0815% 4.8665% / -22.192% 14.1675%,
+      curve by -14.083% 0% with -4.3725% 1.708% / -9.7105% 1.708%,
+      curve by -29.447% -17.001% with -7.255% -2.8335% / -23.3655% -12.1345%,
+      curve by -7.0415% -12.1965% with -3.665% -2.933% / -6.334% -7.5555%,
+      close
+    );
+    --cylinder: shape(
+      evenodd from 10.5845% 59.7305%,
+      curve by 0% -19.461% with -0.113% -1.7525% / -0.11% -18.14%,
+      curve by 10.098% -26.213% with 0.837% -10.0375% / 3.821% -19.2625%,
+      curve by 29.3175% -13.0215% with 7.2175% -7.992% / 17.682% -13.0215%,
+      curve by 19.5845% 5.185% with 7.1265% 0% / 13.8135% 1.887%,
+      curve by 9.8595% 7.9775% with 3.7065% 2.1185% / 7.035% 4.8195%,
+      curve by 9.9715% 26.072% with 6.2015% 6.933% / 9.4345% 16.082%,
+      curve by 0% 19.461% with 0.074% 1.384% / 0.0745% 17.7715%,
+      curve by -13.0065% 29.1155% with -0.511% 11.5345% / -5.021% 21.933%,
+      curve by -26.409% 10.119% with -6.991% 6.288% / -16.254% 10.119%,
+      curve by -20.945% -5.9995% with -7.6935% 0% / -14.8755% -2.199%,
+      curve by -8.713% -7.404% with -3.255% -2.0385% / -6.1905% -4.537%,
+      curve by -9.7575% -25.831% with -6.074% -6.9035% / -9.1205% -15.963%,
+      close
+    );
+    --circle: shape(
+      evenodd from 13.482% 79.505%,
+      curve by -7.1945% -12.47% with -1.4985% -1.8575% / -6.328% -10.225%,
+      curve by 0.0985% -33.8965% with -4.1645% -10.7945% / -4.1685% -23.0235%,
+      curve by 6.9955% -12.101% with 1.72% -4.3825% / 4.0845% -8.458%,
+      curve by 30.125% -17.119% with 7.339% -9.1825% / 18.4775% -15.5135%,
+      curve by 13.4165% 0.095% with 4.432% -0.6105% / 8.9505% -0.5855%,
+      curve by 29.364% 16.9% with 11.6215% 1.77% / 22.102% 7.9015%,
+      curve by 7.176% 12.4145% with 3.002% 3.7195% / 5.453% 7.968%,
+      curve by -0.0475% 33.8925% with 4.168% 10.756% / 4.2305% 22.942%,
+      curve by -7.1135% 12.2825% with -1.74% 4.4535% / -4.1455% 8.592%,
+      curve by -29.404% 16.9075% with -7.202% 8.954% / -18.019% 15.137%,
+      curve by -14.19% -0.018% with -4.6635% 0.7255% / -9.4575% 0.7205%,
+      curve by -29.226% -16.8875% with -11.573% -1.8065% / -21.9955% -7.9235%,
+      close
+    );
+  }
+}
 
 /* ─── Design Tokens ─────────────────────────────────────────── */
 :root {

package/src/components/ChatWidget.tsx

@@ -119,25 +119,38 @@ export function ChatWidget({ position = 'bottom-right', onAddToCart }: ChatWidge
       {/* ── Floating Action Button ── */}
       <button
         onClick={isOpen ? () => setIsOpen(false) : handleOpen}
-        className={`fixed z-[9999] w-14 h-14 shadow-2xl flex items-center justify-center transition-all duration-300 cursor-pointer hover:scale-110 active:scale-95 ${
-          ui.borderRadius === 'full' ? 'rounded-full' : 'rounded-2xl'
-        } ${positionClass}`}
-        style={{ background: `linear-gradient(135deg, ${ui.primaryColor}, ${ui.accentColor})` }}
+        className={`group fixed z-[9999] w-14 h-14 drop-shadow-2xl flex items-center justify-center transition-all duration-300 cursor-pointer hover:scale-110 active:scale-95 ${positionClass}`}
         aria-label="Open chat"
       >
+        {/* Animated Background */}
+        <div 
+          className={`absolute inset-0 transition-all duration-300 overflow-hidden ${
+            ui.borderRadius === 'full' ? 'rounded-full' : 'rounded-2xl'
+          } group-hover:rounded-none group-hover:animate-shapeshift`}
+        >
+          <div 
+            className="absolute top-0 left-0 w-[400%] h-[400%] transition-transform duration-300 group-hover:animate-gradientMove"
+            style={{
+              background: `linear-gradient(135deg, ${ui.primaryColor}, ${ui.accentColor}, ${ui.primaryColor}, ${ui.accentColor})`
+            }}
+          />
+        </div>
+
         {/* Ripple ring */}
         <span
-          className="absolute inset-0 rounded-full animate-ping opacity-20"
+          className="absolute inset-0 rounded-full animate-ping opacity-20 pointer-events-none"
           style={{ background: ui.primaryColor }}
         />
 
+        {/* Icon Layer */}
         <span
-          className={`transition-transform duration-300 ${isOpen ? 'rotate-90 scale-90' : 'rotate-0 scale-100'}`}
+          className={`relative z-10 transition-transform duration-300 ${isOpen ? 'rotate-90 scale-90' : 'rotate-0 scale-100'}`}
         >
-          {isOpen
-            ? <X className="w-6 h-6 text-white" />
-            : <MessageSquare className="w-6 h-6 text-white" />
-          }
+          {isOpen ? (
+            <X className="w-6 h-6 text-white" />
+          ) : (
+            <MessageSquare className="w-6 h-6 text-white" />
+          )}
         </span>
 
         {/* Unread badge */}

package/src/config/RagConfig.ts

@@ -44,6 +44,8 @@ export interface VectorDBConfig {
    * - searchFields?: string[] | string // optional override for which columns receive exact-match boosts
    */
   options: Record<string, unknown>;
+  /** Optional distance metric (defaults to cosine if not specified and supported by provider) */
+  distanceMetric?: 'cosine' | 'euclidean' | 'dotproduct';
 }
 
 // ---------------------------------------------------------------------------

package/src/providers/vectordb/ChromaDBProvider.ts

@@ -41,9 +41,13 @@ export class ChromaDBProvider extends BaseVectorProvider {
     } catch (err) {
       if (axios.isAxiosError(err) && err.response?.status === 404) {
         // Create the collection if it doesn't exist
+        const metric = this.config.distanceMetric || 'cosine';
+        const space = metric === 'euclidean' ? 'l2' : metric === 'dotproduct' ? 'ip' : 'cosine';
+
         console.log(`[ChromaDBProvider] ⏳ Collection "${this.indexName}" not found. Creating...`);
         const { data } = await this.http.post('/api/v1/collections', {
           name: this.indexName,
+          metadata: { "hnsw:space": space }
         });
         this.collectionId = data.id;
         console.log(`[ChromaDBProvider] ✅ Created collection "${this.indexName}" (id: ${this.collectionId})`);

package/src/providers/vectordb/MultiTablePostgresProvider.ts

@@ -66,10 +66,13 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
           embedding   VECTOR(${this.dimensions})
         )
       `);
+      const metric = this.config.distanceMetric || 'cosine';
+      const indexOps = metric === 'euclidean' ? 'vector_l2_ops' : metric === 'dotproduct' ? 'vector_ip_ops' : 'vector_cosine_ops';
+
       await client.query(`
         CREATE INDEX IF NOT EXISTS ${this.uploadTable}_embedding_idx
         ON ${this.uploadTable}
-        USING hnsw (embedding vector_cosine_ops)
+        USING hnsw (embedding ${indexOps})
       `);
 
       const res = await client.query(`
@@ -147,10 +150,13 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
         await client.query(createTableSql);
         
         // Create Index
+        const metric = this.config.distanceMetric || 'cosine';
+        const indexOps = metric === 'euclidean' ? 'vector_l2_ops' : metric === 'dotproduct' ? 'vector_ip_ops' : 'vector_cosine_ops';
+
         await client.query(`
           CREATE INDEX IF NOT EXISTS "${tableName}_embedding_idx"
           ON "${tableName}"
-          USING hnsw (embedding vector_cosine_ops)
+          USING hnsw (embedding ${indexOps})
         `);
         
         // Ensure this new table is added to our search scope
@@ -274,6 +280,13 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
         let sqlQuery = '';
         let params: unknown[] = [];
 
+        const metric = this.config.distanceMetric || 'cosine';
+        const scoreExpr = metric === 'euclidean' 
+          ? `1 / (1 + (embedding <-> $1::vector))` 
+          : metric === 'dotproduct' 
+          ? `(embedding <#> $1::vector) * -1` 
+          : `1 - (embedding <=> $1::vector)`;
+
         if (queryText) {
           const hasEntityHints = entityHints.length > 0;
           const exactNameScoreExpr = hasEntityHints
@@ -290,9 +303,9 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
           // Actual Hybrid Search: Semantic Vector Score + Full-Text Keyword Rank
           sqlQuery = `
             SELECT *, 
-             (1 - (embedding <=> $1::vector)) AS vector_score,
+             (${scoreExpr}) AS vector_score,
              COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) AS keyword_score,
-             ((1 - (embedding <=> $1::vector)) + (COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) * 2.0) ${exactNameScoreExpr}) AS hybrid_score
+             ((${scoreExpr}) + (COALESCE(ts_rank(to_tsvector('english', (to_jsonb(t) - 'embedding')::text), to_tsquery('english', $2)), 0) * 2.0) ${exactNameScoreExpr}) AS hybrid_score
             FROM "${table}" t
             ORDER BY hybrid_score DESC
             LIMIT 50
@@ -302,7 +315,7 @@ export class MultiTablePostgresProvider extends BaseVectorProvider {
           // Fallback to Vector-only Search
           sqlQuery = `
             SELECT *, 
-             (1 - (embedding <=> $1::vector)) AS hybrid_score
+             (${scoreExpr}) AS hybrid_score
             FROM "${table}" t
             ORDER BY hybrid_score DESC
             LIMIT 50

package/src/providers/vectordb/PostgreSQLProvider.ts

@@ -97,10 +97,13 @@ export class PostgreSQLProvider extends BaseVectorProvider {
           embedding   VECTOR(${this.dimensions})
         )
       `);
+      const metric = this.config.distanceMetric || 'cosine';
+      const indexOps = metric === 'euclidean' ? 'vector_l2_ops' : metric === 'dotproduct' ? 'vector_ip_ops' : 'vector_cosine_ops';
+      
       await client.query(`
         CREATE INDEX IF NOT EXISTS ${this.tableName}_embedding_idx
         ON ${this.tableName}
-        USING hnsw (embedding vector_cosine_ops)
+        USING hnsw (embedding ${indexOps})
       `);
     } finally {
       client.release();
@@ -182,11 +185,19 @@ export class PostgreSQLProvider extends BaseVectorProvider {
       const efSearch = (this.config.options.efSearch as number) || Math.max(topK * 10, 40);
       await client.query(`SET LOCAL hnsw.ef_search = ${efSearch}`);
 
+      const metric = this.config.distanceMetric || 'cosine';
+      const queryOp = metric === 'euclidean' ? '<->' : metric === 'dotproduct' ? '<#>' : '<=>';
+      const scoreExpr = metric === 'euclidean' 
+        ? `1 / (1 + (embedding <-> $1::vector))` 
+        : metric === 'dotproduct' 
+        ? `(embedding <#> $1::vector) * -1` 
+        : `1 - (embedding <=> $1::vector)`;
+
       const result = await client.query(
-        `SELECT id, content, metadata, 1 - (embedding <=> $1::vector) AS score
+        `SELECT id, content, metadata, ${scoreExpr} AS score
          FROM ${this.tableName}
          ${whereClause}
-         ORDER BY embedding <=> $1::vector
+         ORDER BY embedding ${queryOp} $1::vector
          LIMIT $2`,
         params
       );

package/src/providers/vectordb/QdrantProvider.ts

@@ -120,11 +120,14 @@ export class QdrantProvider extends BaseVectorProvider {
         const opts = this.config.options as Record<string, unknown>;
         const dimensionsForCreate = (opts.dimensions as number) || 1536;
 
+        const metric = this.config.distanceMetric || 'cosine';
+        const distance = metric === 'euclidean' ? 'Euclid' : metric === 'dotproduct' ? 'Dot' : 'Cosine';
+
         console.log(`[QdrantProvider] ⏳ Creating collection "${this.indexName}" (dimensions: ${dimensionsForCreate})...`);
         await this.http.put(`/collections/${this.indexName}`, {
           vectors: {
             size: dimensionsForCreate,
-            distance: 'Cosine',
+            distance: distance,
           },
         });
         console.log(`[QdrantProvider] ✅ Created collection "${this.indexName}"`);

package/src/utils/UITransformer.ts

@@ -29,7 +29,8 @@ export class UITransformer {
       ? retrievedData.filter(item => this.determineStockStatus(item))
       : retrievedData;
 
-    const categories = this.detectCategories(filteredData);
+    const groupByField = this.determineGroupByField(userQuery, filteredData);
+    const categories = this.detectCategories(filteredData, groupByField);
     const hasProducts = filteredData.some(item => this.isProductData(item));
     const isTimeSeries = filteredData.some(item => this.isTimeSeriesData(item));
     const isTrendQuery = this.isTrendQuery(userQuery);
@@ -39,14 +40,16 @@ export class UITransformer {
       return this.transformToLineChart(filteredData);
     }
 
+    const explicitChartRequest = this.isExplicitChartQuery(userQuery);
+
     // 2. High Priority: Products (Always prefer carousel for products unless it's a specific breakdown request)
-    if (hasProducts && !this.shouldShowCategoryChart(userQuery, categories)) {
+    if (hasProducts && !explicitChartRequest && !this.shouldShowCategoryChart(userQuery)) {
       return this.transformToProductCarousel(filteredData, config, trainedSchema);
     }
 
     // 3. Category breakdowns
-    if (categories.length > 1 && this.shouldShowCategoryChart(userQuery, categories)) {
-      return this.transformToPieChart(filteredData);
+    if (explicitChartRequest || (categories.length > 1 && this.shouldShowCategoryChart(userQuery))) {
+      return this.transformToPieChart(filteredData, groupByField);
     }
 
     // 4. Secondary: Products as carousel if not already handled
@@ -87,13 +90,16 @@ export class UITransformer {
    * Transform data to pie chart format
    */
   private static transformToPieChart(
-    data: VectorMatch[]
+    data: VectorMatch[],
+    groupByField: string
   ): UITransformationResponse {
-    const categories = this.detectCategories(data);
-    const categoryData = this.aggregateByCategory(data, categories);
+    let categories = this.detectCategories(data, groupByField);
+    if (categories.length === 0) categories = ['All Data'];
+    
+    const categoryData = this.aggregateByCategory(data, categories, groupByField);
 
     const pieData: PieChartData[] = Object.entries(categoryData).map(([label, count]) => {
-      const { inStockCount, outOfStockCount } = this.calculateStockCounts(label, data);
+      const { inStockCount, outOfStockCount } = this.calculateStockCounts(label, data, groupByField);
       return {
         label,
         value: count as number,
@@ -104,7 +110,7 @@ export class UITransformer {
 
     return {
       type: 'pie_chart',
-      title: 'Distribution by Category',
+      title: `Distribution by ${groupByField.charAt(0).toUpperCase() + groupByField.slice(1)}`,
       description: `Showing breakdown across ${categories.length} categories`,
       data: pieData,
     };
@@ -371,11 +377,16 @@ export class UITransformer {
     return hasTimeKeyword || hasValidDateValue;
   }
 
-  private static shouldShowCategoryChart(query: string, categories: string[]): boolean {
-    if (categories.length < 2) {
-      return false;
-    }
+  private static isExplicitChartQuery(query: string): boolean {
+    const normalized = query.toLowerCase();
+    return normalized.includes('pie chart') || 
+           normalized.includes('piechart') || 
+           normalized.includes('bar chart') || 
+           normalized.includes('barchart') ||
+           normalized.includes('radar chart');
+  }
 
+  private static shouldShowCategoryChart(query: string): boolean {
     const normalized = query.toLowerCase();
     const chartKeywords = [
       'distribution',
@@ -389,6 +400,10 @@ export class UITransformer {
       'split',
       'category breakdown',
       'category distribution',
+      'pie chart',
+      'piechart',
+      'bar chart',
+      'barchart'
     ];
 
     return chartKeywords.some(keyword => normalized.includes(keyword));
@@ -501,38 +516,57 @@ export class UITransformer {
   }
 
   /**
-   * Helper: Detect categories in data
+   * Helper: Dynamically determine what field to group by based on user query
+   */
+  private static determineGroupByField(query: string, data: VectorMatch[]): string {
+    const normalized = query.toLowerCase();
+    const match = normalized.match(/(?:by|across|per|based on)\s+([a-zA-Z]+)/i);
+    
+    let targetField = 'category';
+    if (match && match[1]) {
+      let field = match[1].toLowerCase();
+      // Un-pluralize common words to match schema keys
+      if (field.endsWith('ies')) field = field.replace(/ies$/, 'y');
+      else if (field.endsWith('s') && field !== 'status') field = field.slice(0, -1);
+      
+      const stopWords = ['the', 'all', 'different', 'various', 'some', 'these', 'those'];
+      if (!stopWords.includes(field)) {
+         targetField = field;
+      }
+    }
+
+    // Verify field exists, or fallback
+    const hasTargetField = data.some(d => d.metadata && d.metadata[targetField] !== undefined);
+    if (!hasTargetField && targetField === 'category') {
+       if (data.some(d => d.metadata && d.metadata['type'] !== undefined)) return 'type';
+       if (data.some(d => d.metadata && d.metadata['brand'] !== undefined)) return 'brand';
+    }
+
+    return targetField;
+  }
+
+  /**
+   * Helper: Detect grouping values dynamically
    */
-  private static detectCategories(data: VectorMatch[]): string[] {
+  private static detectCategories(data: VectorMatch[], groupByField: string): string[] {
     const categories = new Set<string>();
 
     data.forEach(item => {
       const meta = item.metadata || {};
 
-      // Check for category field
-      if (meta.category) {
-        categories.add(String(meta.category));
-      }
-      if (meta.type) {
-        categories.add(String(meta.type));
-      }
-      if (meta.tag) {
-        const tags = Array.isArray(meta.tag) ? meta.tag : [meta.tag];
-        tags.forEach(t => categories.add(String(t)));
-      }
-
-      // Parse category strings from content lines like "Shoes & Footwear: • Product"
-      const contentCategories = Array.from(new Set(
-        Array.from(item.content.matchAll(/^\s*([^:\n]+):\s*(?:•|\*|-)*/gm))
-          .map(match => match[1].trim())
-          .filter(Boolean)
-      ));
-      contentCategories.forEach((category) => categories.add(category));
-
-      // Parse from structured category hints in content
-      const categoryMatch = item.content.match(/(?:Category|Type|Class):\s*([^\n]+)/i);
-      if (categoryMatch) {
-        categories.add(categoryMatch[1].trim());
+      if (meta[groupByField] !== undefined) {
+        const val = meta[groupByField];
+        if (Array.isArray(val)) val.forEach(v => categories.add(String(v)));
+        else categories.add(String(val));
+      } else if (groupByField === 'category') {
+        // Fallbacks for legacy 'category' extraction
+        if (meta.type) categories.add(String(meta.type));
+        if (meta.tag) {
+          const tags = Array.isArray(meta.tag) ? meta.tag : [meta.tag];
+          tags.forEach(t => categories.add(String(t)));
+        }
+        const categoryMatch = item.content.match(/(?:Category|Type|Class):\s*([^\n]+)/i);
+        if (categoryMatch) categories.add(categoryMatch[1].trim());
       }
     });
 
@@ -540,11 +574,12 @@ export class UITransformer {
   }
 
   /**
-   * Helper: Aggregate data by category
+   * Helper: Aggregate data dynamically
    */
   private static aggregateByCategory(
     data: VectorMatch[],
-    categories: string[]
+    categories: string[],
+    groupByField: string
   ): Record<string, number> {
     const result: Record<string, number> = {};
 
@@ -554,7 +589,13 @@ export class UITransformer {
 
     data.forEach(item => {
       const meta = item.metadata || {};
-      const itemCategory = (meta.category || meta.type || 'Other') as string;
+      let itemCategory = 'Other';
+
+      if (meta[groupByField] !== undefined) {
+        itemCategory = String(meta[groupByField]);
+      } else if (groupByField === 'category' && meta.type) {
+        itemCategory = String(meta.type);
+      }
 
       if (Object.prototype.hasOwnProperty.call(result, itemCategory)) {
         result[itemCategory]++;
@@ -615,15 +656,21 @@ export class UITransformer {
   }
 
   /**
-   * Helper: Calculate stock counts by category
+   * Helper: Calculate stock counts dynamically
    */
-  private static calculateStockCounts(category: string, data: VectorMatch[]): { inStockCount: number; outOfStockCount: number } {
+  private static calculateStockCounts(category: string, data: VectorMatch[], groupByField: string): { inStockCount: number; outOfStockCount: number } {
     let inStock = 0;
     let outOfStock = 0;
 
     data.forEach(d => {
       const meta = d.metadata || {};
-      const itemCategory = (meta.category || meta.type || 'Other') as string;
+      let itemCategory = 'Other';
+      if (meta[groupByField] !== undefined) {
+        itemCategory = String(meta[groupByField]);
+      } else if (groupByField === 'category' && meta.type) {
+        itemCategory = String(meta.type);
+      }
+
       if (itemCategory === category) {
         if (this.determineStockStatus(d)) {
           inStock++;
@@ -772,12 +819,13 @@ DATA SHAPE per type:
 - text:       { "content": "<prose answer>" }
 
 DECISION RULES (follow strictly):
-1. bar_chart  → comparing quantities across categories (e.g. sales by region, price by product). Use this when there is only ONE value per category.
-2. line_chart → trends or changes over time (dates, months, years, sequential events)
-3. pie_chart  → proportional breakdown or percentage distribution
-4. radar_chart → comparing 2 or more products across MULTIPLE attributes (e.g. comparing features, ratings, or characteristics of 2 specific products). If the user asks to "compare" products and the data contains multiple dimensions or ratings for them, you MUST use this.
-5. table      → multi-field structured records where each item has ≥ 3 attributes
-6. text       → conversational or free-form answers where no chart adds value
+1. IF the user explicitly asks for a "pie chart", "bar chart", or "table", you MUST output that exact type. Do not deviate from their request.
+2. bar_chart  → comparing quantities across categories (e.g. sales by region, price by product). Use this when there is only ONE value per category.
+3. line_chart → trends or changes over time (dates, months, years, sequential events)
+4. pie_chart  → proportional breakdown or percentage distribution
+5. radar_chart → comparing 2 or more products across MULTIPLE attributes.
+6. table      → multi-field structured records where each item has ≥ 3 attributes
+7. text       → conversational or free-form answers where no chart adds value
 
 IMPORTANT:
 - Aggregate numeric values from the raw data — do not pass raw object arrays as data.