@memberjunction/query-gen 2.126.1 → 2.127.0

package/src/core/QuestionGenerator.ts

@@ -125,35 +125,61 @@ export class QuestionGenerator {
   /**
    * Validate and filter business questions
    * Removes low-quality or unanswerable questions
+   * Corrects entity name casing to match exact entity group names
    *
    * @param questions - Raw questions from AI
    * @param entityGroup - Entity group for validation context
-   * @returns Filtered array of valid questions
+   * @returns Filtered array of valid questions with corrected entity names
    */
   private validateQuestions(
     questions: BusinessQuestion[],
     entityGroup: EntityGroup
   ): BusinessQuestion[] {
-    const entityNames = new Set(entityGroup.entities.map((e) => e.Name));
-
-    return questions.filter((q) => {
-      // Must have required fields
-      if (!this.hasRequiredFields(q)) {
-        return false;
-      }
-
-      // Must reference entities in the group
-      if (!this.referencesGroupEntities(q, entityNames)) {
-        return false;
-      }
-
-      // Must not be overly generic
-      if (this.isTooGeneric(q)) {
-        return false;
+    // Create case-insensitive lookup map: lowercase -> exact entity name
+    // Also map BaseView names to correct entity names (in case LLM returns view names)
+    const entityNameLookup = new Map<string, string>();
+    for (const entity of entityGroup.entities) {
+      // Map entity name (case-insensitive)
+      entityNameLookup.set(entity.Name.toLowerCase(), entity.Name);
+
+      // Map base view name to entity name (case-insensitive) as backup
+      if (entity.BaseView) {
+        entityNameLookup.set(entity.BaseView.toLowerCase(), entity.Name);
       }
+    }
 
-      return true;
-    });
+    return questions
+      .filter((q) => {
+        // Must have required fields
+        if (!this.hasRequiredFields(q)) {
+          if (this.config.verbose) {
+            LogStatus(`  ❌ Filtered: Missing required fields - "${q.userQuestion?.substring(0, 60)}..."`);
+          }
+          return false;
+        }
+
+        // Must reference entities in the group (by name or base view)
+        if (!this.referencesGroupEntities(q, entityNameLookup)) {
+          if (this.config.verbose) {
+            LogStatus(`  ❌ Filtered: Doesn't reference group entities - "${q.userQuestion.substring(0, 60)}..." (references: ${q.entities.join(', ')})`);
+          }
+          return false;
+        }
+
+        return true;
+      })
+      .map((q) => {
+        // Correct entity name casing to match exact entity group names
+        const correctedEntities = q.entities.map((entityName) => {
+          const exactName = entityNameLookup.get(entityName.toLowerCase());
+          return exactName || entityName; // Use exact name if found, otherwise keep original
+        });
+
+        return {
+          ...q,
+          entities: correctedEntities
+        };
+      });
   }
 
   /**
@@ -172,28 +198,16 @@ export class QuestionGenerator {
 
   /**
    * Check if question references entities in the group
+   * Uses case-insensitive matching to handle minor casing differences
+   * Also accepts base view names as valid references
    */
   private referencesGroupEntities(
     question: BusinessQuestion,
-    entityNames: Set<string>
+    entityNameLookup: Map<string, string>
   ): boolean {
-    return question.entities.some((entityName) => entityNames.has(entityName));
-  }
-
-  /**
-   * Check if question is too generic to be useful
-   */
-  private isTooGeneric(question: BusinessQuestion): boolean {
-    const genericPatterns = [
-      /show\s+me\s+all/i,
-      /list\s+all/i,
-      /get\s+all/i,
-      /display\s+all/i,
-      /^what\s+is/i,
-    ];
-
-    return genericPatterns.some((pattern) =>
-      pattern.test(question.userQuestion)
+    return question.entities.some((entityName) =>
+      entityNameLookup.has(entityName.toLowerCase())
     );
   }
+
 }

package/src/data/schema.ts

@@ -81,6 +81,7 @@ export interface BusinessQuestion {
  * Note: selectClause removed - QueryEntity automatically creates QueryFieldEntity records from SQL
  */
 export interface GeneratedQuery {
+  queryName: string;
   sql: string;
   parameters: QueryParameter[];
 }
@@ -227,7 +228,6 @@ export interface QueryMetadataRecord {
     Description: string;
     TechnicalDescription: string;
     SQL: string;
-    OriginalSQL: string;
     UsesTemplate: boolean;
     Status: string;
   };

package/src/index.ts

@@ -46,4 +46,3 @@ export {
   hasRelationships,
   getRelationshipCount
 } from './utils/entity-helpers';
-export { generateQueryName } from './utils/query-helpers';

package/dist/utils/query-helpers.d.ts

@@ -1,23 +0,0 @@
-/**
- * Query generation utility functions
- */
-import { BusinessQuestion } from '../data/schema';
-/**
- * Generate a query name from a business question
- *
- * Removes question marks, filters short words, capitalizes each word,
- * and limits to 5 words for a concise query name.
- *
- * @param question - The business question to convert
- * @returns A formatted query name
- *
- * @example
- * generateQueryName({ userQuestion: "What are the top customers by revenue?" })
- * // Returns: "What Are Top Customers Revenue"
- *
- * @example
- * generateQueryName({ userQuestion: "Show me all active users" })
- * // Returns: "Show All Active Users"
- */
-export declare function generateQueryName(question: BusinessQuestion): string;
-//# sourceMappingURL=query-helpers.d.ts.map

package/dist/utils/query-helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"query-helpers.d.ts","sourceRoot":"","sources":["../../src/utils/query-helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAQpE"}

package/dist/utils/query-helpers.js

@@ -1,34 +0,0 @@
-"use strict";
-/**
- * Query generation utility functions
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateQueryName = void 0;
-/**
- * Generate a query name from a business question
- *
- * Removes question marks, filters short words, capitalizes each word,
- * and limits to 5 words for a concise query name.
- *
- * @param question - The business question to convert
- * @returns A formatted query name
- *
- * @example
- * generateQueryName({ userQuestion: "What are the top customers by revenue?" })
- * // Returns: "What Are Top Customers Revenue"
- *
- * @example
- * generateQueryName({ userQuestion: "Show me all active users" })
- * // Returns: "Show All Active Users"
- */
-function generateQueryName(question) {
-    return question.userQuestion
-        .replace(/\?/g, '')
-        .split(' ')
-        .filter(word => word.length > 2)
-        .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
-        .slice(0, 5)
-        .join(' ');
-}
-exports.generateQueryName = generateQueryName;
-//# sourceMappingURL=query-helpers.js.map

package/dist/utils/query-helpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"query-helpers.js","sourceRoot":"","sources":["../../src/utils/query-helpers.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAIH;;;;;;;;;;;;;;;;GAgBG;AACH,SAAgB,iBAAiB,CAAC,QAA0B;IAC1D,OAAO,QAAQ,CAAC,YAAY;SACzB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SAC/B,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SACvE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;SACX,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AARD,8CAQC"}

package/src/utils/query-helpers.ts

@@ -1,32 +0,0 @@
-/**
- * Query generation utility functions
- */
-
-import { BusinessQuestion } from '../data/schema';
-
-/**
- * Generate a query name from a business question
- *
- * Removes question marks, filters short words, capitalizes each word,
- * and limits to 5 words for a concise query name.
- *
- * @param question - The business question to convert
- * @returns A formatted query name
- *
- * @example
- * generateQueryName({ userQuestion: "What are the top customers by revenue?" })
- * // Returns: "What Are Top Customers Revenue"
- *
- * @example
- * generateQueryName({ userQuestion: "Show me all active users" })
- * // Returns: "Show All Active Users"
- */
-export function generateQueryName(question: BusinessQuestion): string {
-  return question.userQuestion
-    .replace(/\?/g, '')
-    .split(' ')
-    .filter(word => word.length > 2)
-    .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
-    .slice(0, 5)
-    .join(' ');
-}