Update main.py

main.py

@@ -8,6 +8,7 @@ from prompt_instructions import build_system_message
 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
 
 app = Flask(__name__)
 CORS(app)
@@ -15,23 +16,22 @@ CORS(app)
 db = get_firestore_client()
 
 # 🔧 Normalize Gemini plan into proper Firestore fetch format
-def normalize_plan(plan: dict) -> dict:
+def normalize_plan(plan: dict, token_map: dict) -> dict:
     filters = plan.get("filters", {})
     filter_list = []
 
     for k, v in filters.items():
-        # 🔄 Adjust "running" to match actual Firestore value
+        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
-            }
+            {"name": col, "filters": filter_list, "limit": 50}
             for col in plan.get("collections", [])
         ]
     }
@@ -43,39 +43,46 @@ def chat():
     role = data.get('role')
     user_input = data.get('message')
     company_code = data.get('companyCode')
-    user_id = data.get('userId')  # ✅
+    user_id = data.get('userId')
 
     if not role or not user_input or not company_code or not user_id:
         return jsonify({"error": "Missing role, message, companyCode, or userId"}), 400
 
-    print("🧠 Incoming user message:", user_input)
-
-    # 🧠 Step 1: Gemini plans what data to fetch
-    planning_result = determine_data_requirements(user_input, company_code, user_id)
-    print("📋 Raw planning result:", planning_result)
+    # 🔎 Resolve current user's email + participantId
+    ctx = resolve_user_context(user_id, company_code)
+    token_map = {
+        "{{participantId}}": ctx.get("participantId"),
+        "{{userEmail}}": ctx.get("email"),
+        "{{userId}}": ctx.get("uid"),
+    }
 
+    # 🧠 Plan
+    planning_result = determine_data_requirements(
+        user_input, company_code, user_id,
+        participant_email=ctx.get("email"),
+        participant_id=ctx.get("participantId"),
+    )
     if "error" in planning_result:
         return jsonify({"reply": f"⚠️ Planning error: {planning_result['error']}"})
 
-    try:
-        normalized_plan = normalize_plan(planning_result)
-        print("🛠️ Normalized Plan:", normalized_plan)
+    # 🛠️ Normalize & replace tokens
+    normalized_plan = normalize_plan(planning_result, token_map)
 
-        firestore_data = fetch_data_from_firestore(normalized_plan)
-        print("📦 Fetched Firestore Data:", firestore_data)
-    except Exception as e:
-        return jsonify({"reply": f"⚠️ Firestore fetch error: {str(e)}"})
+    # 📥 Fetch
+    firestore_data = fetch_data_from_firestore(normalized_plan)
 
-    # 🤖 Step 2: Use Gemini to interpret and answer
+    # 🧩 Add current-user context to the model explicitly (helps answering)
     system_msg = build_system_message(company_code)
     data_msg = {
         "role": "system",
-        "content": f"Here is the data from Firestore:\n{json.dumps(firestore_data)}"
+        "content": (
+          f"CurrentUserContext: {json.dumps(ctx)}\n"
+          f"Here is the data from Firestore:\n{json.dumps(firestore_data)}"
+        )
     }
-    user_msg = { "role": "user", "content": user_input }
-
+    user_msg = {"role": "user", "content": user_input}
     final_response = ask_gpt([system_msg, data_msg, user_msg])
-    return jsonify({ "reply": final_response })
+    return jsonify({"reply": final_response})
 
 
 if __name__ == "__main__":