Update main.py

main.py

@@ -7,13 +7,36 @@ from openai_client import ask_gpt
 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  # 🧠 Replaces inline planner
+from data_planner import determine_data_requirements  # 🧠 Gemini planner
 
 app = Flask(__name__)
 CORS(app)
 
 db = get_firestore_client()
 
+# 🔧 Normalize Gemini plan into proper Firestore fetch format
+def normalize_plan(plan: dict) -> dict:
+    filters = plan.get("filters", {})
+    filter_list = []
+
+    for k, v in filters.items():
+        # 🔄 Adjust "running" to match actual Firestore value
+        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", [])
+        ]
+    }
+
+
 @app.route('/chat', methods=['POST'])
 def chat():
     data = request.json
@@ -24,20 +47,25 @@ def chat():
     if not role or not user_input or not company_code:
         return jsonify({"error": "Missing role, message, or companyCode"}), 400
 
-    # 🧠 Step 1: Use Gemini to plan the data to fetch
+    print("🧠 Incoming user message:", user_input)
+
+    # 🧠 Step 1: Gemini plans what data to fetch
     planning_result = determine_data_requirements(user_input, company_code)
-    print("📋 Data Plan:", planning_result)
+    print("📋 Raw planning result:", planning_result)
 
     if "error" in planning_result:
         return jsonify({"reply": f"⚠️ Planning error: {planning_result['error']}"})
 
     try:
-        firestore_data = fetch_data_from_firestore(planning_result)
-        print("📦 Firestore Fetched Data:", firestore_data)
+        normalized_plan = normalize_plan(planning_result)
+        print("🛠️ Normalized Plan:", normalized_plan)
+
+        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)}"})
 
-    # 💬 Step 2: Ask Gemini to answer using that data
+    # 🤖 Step 2: Use Gemini to interpret and answer
     system_msg = build_system_message(company_code)
     data_msg = {
         "role": "system",
@@ -48,5 +76,6 @@ def chat():
     final_response = ask_gpt([system_msg, data_msg, user_msg])
     return jsonify({ "reply": final_response })
 
+
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=7860)