Upload engine.py

engine.py

@@ -86,20 +86,34 @@ def resolve_join_path(start_table, end_table):
     )
 
 
+FIELD_ALIASES = {
+    "join_date": "start_date",
+    "joining_date": "start_date",
+    "joined": "start_date",
+    "hire_date": "start_date"
+}
+
 def resolve_field(field_name, module):
     meta = load_metadata()
     fields = meta["fields"]
 
+    # 🔹 Normalize field name
+    field_name = field_name.lower().strip()
+    field_name = FIELD_ALIASES.get(field_name, field_name)
+
+    # 🔹 Validate existence
     if field_name not in fields:
         raise ValueError(f"Unknown field: {field_name}")
 
     field = fields[field_name]
 
+    # 🔹 Validate module
     if field["module"] != module:
         raise ValueError(
             f"Field '{field_name}' does not belong to module '{module}'"
         )
 
+    # 🔹 Validate mapping
     if "table" not in field or "column" not in field:
         raise ValueError(
             f"Field '{field_name}' is missing table/column mapping"
@@ -108,6 +122,7 @@ def resolve_field(field_name, module):
     return field
 
 
+
 def build_join_sql(base_table, steps):
     sql = []
     prev_alias = base_table  # alias == table name
@@ -128,8 +143,24 @@ def build_join_sql(base_table, steps):
 # =========================
 
 def parse_intent(question):
+    # 1️⃣ Load metadata
+    meta = load_metadata()
+
+    # 2️⃣ Build schema description for the LLM
+    schema_description = "\n".join([
+        f"{module}: {', '.join(meta['modules'][module]['fields'])}"
+        for module in meta["modules"]
+    ])
+
+    # 3️⃣ Prompt with schema awareness
     prompt = f"""
-You are a query planner.
+You are a SQL query planner.
+
+You MUST only use fields listed below.
+If a field does not exist, choose the closest valid one.
+
+Available schema:
+{schema_description}
 
 Extract:
 - module
@@ -142,7 +173,7 @@ Example:
 {{
   "module": "employees",
   "filters": [
-    {{ "field": "department", "operator": "equals", "value": "IT" }}
+    {{ "field": "start_date", "operator": "greater_or_equal", "value": "2024-01-01" }}
   ]
 }}
 
@@ -158,6 +189,7 @@ User question:
 
     return json.loads(res.choices[0].message.content)
 
+
 # =========================
 # SQL GENERATOR
 # =========================