Update main.py

main.py

@@ -9,6 +9,7 @@ from role_access import get_allowed_collections
 from data_fetcher import fetch_data_from_firestore
 from data_planner import determine_data_requirements  # 🧠 Gemini planner
 from resolver import resolve_user_context
+from schema_utils import has_field, resolve_field
 
 app = Flask(__name__)
 CORS(app)
@@ -16,25 +17,33 @@ CORS(app)
 db = get_firestore_client()
 
 # 🔧 Normalize Gemini plan into proper Firestore fetch format
-def normalize_plan(plan: dict, token_map: dict) -> dict:
-    filters = plan.get("filters", {})
-    filter_list = []
 
-    for k, v in filters.items():
-        if isinstance(v, str) and v in token_map:
-            v = token_map[v]
 
-        if k == "status" and v == "running":
-            v = "active"
-
-        filter_list.append({"field": k, "op": "==", "value": v})
-
-    return {
-        "collections": [
-            {"name": col, "filters": filter_list, "limit": 50}
-            for col in plan.get("collections", [])
-        ]
-    }
+def normalize_plan(plan: dict) -> dict:
+    filters = plan.get("filters", {}) or {}
+    planned_cols = plan.get("collections", []) or []
+
+    def canonical_value(key, val):
+        if key == "status" and val == "running":
+            return "active"
+        return val
+
+    collections_out = []
+    for col in planned_cols:
+        # Allow both string names or objects {name, fields}
+        name = col["name"] if isinstance(col, dict) else col
+        col_filters = []
+        for k, v in filters.items():
+            canon_key = resolve_field(name, k)
+            if has_field(name, canon_key):
+                col_filters.append({"field": canon_key, "op": "==", "value": canonical_value(k, v)})
+        collections_out.append({
+            "name": name,
+            "filters": col_filters,
+            "limit": 50
+        })
+
+    return {"collections": collections_out}
 
 
 @app.route('/chat', methods=['POST'])