Update main.py

main.py

@@ -5,6 +5,7 @@ import requests
 import random
 import logging
 import json
+import traceback
 from datetime import datetime
 from dotenv import load_dotenv
 import threading
@@ -16,9 +17,6 @@ import uvicorn
 # Task 4 & 5 dependencies (Sendgrid API & Logging)
 from urllib.error import HTTPError
 
-# Task 4 & 5 dependencies (Sendgrid API & Logging)
-from urllib.error import HTTPError
-
 # Load optional .env if present in same directory
 load_dotenv()
 
@@ -64,8 +62,6 @@ STATE_FILE = "state.txt"
 LAST_EVENT_ID = None
 LAST_EVENT_CODE = None
 SESSION_EXPIRED = False
-EXPIRED_XSRF = None
-EXPIRED_BIP = None
 
 # ==============================================================================
 # STATE MANAGEMENT (Task 1)
@@ -88,33 +84,6 @@ def save_state(event_id):
             f.write(str(event_id))
     except Exception as e:
         logger.error(f"Failed to write state file: {e}")
-# Environment values (Make sure to populate your .env file)
-# We will reload these inside the loop so you can change them on the fly.
-
-# Email settings (Loaded from .env)
-# The email you are sending FROM and TO (can be the same)
-EMAIL_ADDRESS = os.getenv("EMAIL_ADDRESS", "")
-# Gmail App Password (NOT your regular password)
-EMAIL_PASSWORD = os.getenv("EMAIL_PASSWORD", "")
-# Notification recipient
-EMAIL_RECIPIENT = os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS)
-
-# App check interval in seconds (default 60 secs = 1 min)
-CHECK_INTERVAL_SECONDS = 60 
-
-BIP_API = "https://bip.bitsathy.ac.in/nova-api/student-activity-masters"
-HEADERS = {
-    "accept": "application/json",
-    "x-requested-with": "XMLHttpRequest",
-}
-
-# State tracking for the loop
-LAST_EVENT_ID = None
-LAST_EVENT_CODE = None
-SESSION_EXPIRED = False
-EXPIRED_XSRF = None
-EXPIRED_BIP = None
-
 
 # ==============================================================================
 # EMAIL NOTIFIER
@@ -195,7 +164,7 @@ def send_event_alerts(events):
     if not events:
         return
         
-    msg = f"📢 <b>{len(events)} New BIP Event Found!</b>\n\n"
+    msg = f"📢 <b>{len(events)} New BIP Event Found!</b><br><br>"
     
     for i, ev in enumerate(events, 1):
         # Format start date
@@ -227,6 +196,7 @@ def send_event_alerts(events):
 # SCRAPER LOGIC
 # ==============================================================================
 def fetch_bip_events(xsrf_token, bip_session, page=1):
+    global SESSION_EXPIRED
     logger.debug(f"--> fetch_bip_events(page={page})")
     
     cookies = {
@@ -245,7 +215,10 @@ def fetch_bip_events(xsrf_token, bip_session, page=1):
             # Check for session expiration
             if "text/html" in r.headers.get("Content-Type", "") or r.status_code in [401, 403]:
                 logger.warning(f"Session expired detected! Content-type: {r.headers.get('Content-Type')}, Status: {r.status_code}")
+                SESSION_EXPIRED = True
                 return None, "Session expired or invalid cookies."
+            else:
+                SESSION_EXPIRED = False
                 
             r.raise_for_status()
             
@@ -314,64 +287,85 @@ def check_new_events(last_id, xsrf_token, bip_session):
 # SCHEDULER ENGINE
 # ==============================================================================
 def process_tick():
-    global LAST_EVENT_ID, LAST_EVENT_CODE, SESSION_EXPIRED, EXPIRED_XSRF, EXPIRED_BIP
+    global LAST_EVENT_ID, LAST_EVENT_CODE
     logger.debug("--- process_tick starting ---")
     
-    # Reload environment variables on every tick
-    load_dotenv(override=True)
-    xsrf = os.getenv("XSRF_TOKEN", "")
-    bip = os.getenv("BIP_SESSION", "")
-    
-    if not xsrf or not bip:
-        logger.warning("Skipping check: Please configure XSRF_TOKEN and BIP_SESSION in the deployment environment.")
-        os._exit(1)
-            
-    # Task 1: Load state if we just started
-    if LAST_EVENT_ID is None:
-        load_state()
-            
-    new_events, err = check_new_events(LAST_EVENT_ID, xsrf, bip)
-    
-    if err:
-        logger.error(f"Error scraping events: {err}")
-        send_email_message(
-            "⚠️ BIP Scraper Error",
-            "⚠️ <b>Scraper Error!</b><br><br>"
-            f"The notifier encountered an error and has paused checking. Error:<br>"
-            f"<code>{err}</code><br><br>"
-            "Please update the `XSRF_TOKEN` and `BIP_SESSION` variables in your Secret/Env configuration and restart the Space.",
-            is_html=True
-        )
-        logger.error("Notifier is shutting down completely because of the scraping error.")
-        os._exit(1)
+    try:
+        # Reload environment variables on every tick
+        load_dotenv(override=True)
+        xsrf = os.getenv("XSRF_TOKEN", "")
+        bip = os.getenv("BIP_SESSION", "")
         
-    if new_events:
-        # If LAST_EVENT_ID is None, it's the very first startup run. Set ID without alerting.
+        if not xsrf or not bip:
+            logger.warning("Skipping check: Please configure XSRF_TOKEN and BIP_SESSION in the deployment environment.")
+            send_email_message(
+                "⚠️ BIP Scraper Error",
+                "⚠️ <b>Deployment Configuration Error!</b><br><br>"
+                "The application was started without the required <code>XSRF_TOKEN</code> or <code>BIP_SESSION</code> secrets.<br><br>"
+                "Please configure these variables in your deployment settings to begin tracking.",
+                is_html=True
+            )
+            raise SystemExit(1)
+                
+        # Task 1: Load state if we just started
         if LAST_EVENT_ID is None:
-            LAST_EVENT_ID = new_events[0]["id"]
-            LAST_EVENT_CODE = new_events[0].get('event_code', LAST_EVENT_ID)
-            save_state(LAST_EVENT_ID)
-            logger.info(f"EVENT ID : {LAST_EVENT_CODE} (Tracking started)")
-            
-            # Send the startup notification
+            load_state()
+                
+        new_events, err = check_new_events(LAST_EVENT_ID, xsrf, bip)
+        
+        if err:
+            logger.error(f"Error scraping events: {err}")
             send_email_message(
-                "🚀 BIP Notifier is Online!",
-                f"You are receiving this because the <b>BIP Auto Notifier</b> script has successfully started tracking on the cloud.<br><br>"
-                f"<b>Current Active Event:</b> {LAST_EVENT_CODE}<br>"
-                f"The script is now monitoring in the background. You will receive alerts for any newer events.",
+                "⚠️ BIP Scraper Error",
+                "⚠️ <b>Scraper Error!</b><br><br>"
+                f"The notifier encountered an error and has paused checking. Error:<br>"
+                f"<code>{err}</code><br><br>"
+                "Please update the `XSRF_TOKEN` and `BIP_SESSION` variables in your Secret/Env configuration and restart the Space.",
                 is_html=True
             )
+            logger.error("Notifier is shutting down completely because of the scraping error.")
+            raise SystemExit(1)
+            
+        if new_events:
+            # If LAST_EVENT_ID is None, it's the very first startup run. Set ID without alerting.
+            if LAST_EVENT_ID is None:
+                LAST_EVENT_ID = new_events[0]["id"]
+                LAST_EVENT_CODE = new_events[0].get('event_code', LAST_EVENT_ID)
+                save_state(LAST_EVENT_ID)
+                logger.info(f"EVENT ID : {LAST_EVENT_CODE} (Tracking started)")
+                
+                # Send the startup notification
+                send_email_message(
+                    "🚀 BIP Notifier is Online!",
+                    f"You are receiving this because the <b>BIP Auto Notifier</b> script has successfully started tracking on the cloud.<br><br>"
+                    f"<b>Current Active Event:</b> {LAST_EVENT_CODE}<br>"
+                    f"The script is now monitoring in the background. You will receive alerts for any newer events.",
+                    is_html=True
+                )
+            else:
+                send_event_alerts(new_events)
+                LAST_EVENT_ID = new_events[0]["id"]
+                LAST_EVENT_CODE = new_events[0].get('event_code', LAST_EVENT_ID)
+                save_state(LAST_EVENT_ID)
+                
+                for ev in new_events:
+                    code = ev.get('event_code', ev['id'])
+                    logger.info(f"🚨 NEW EVENT ID : {code} (Alert Sent!)")
         else:
-            send_event_alerts(new_events)
-            LAST_EVENT_ID = new_events[0]["id"]
-            LAST_EVENT_CODE = new_events[0].get('event_code', LAST_EVENT_ID)
-            save_state(LAST_EVENT_ID)
+            logger.info(f"EVENT ID : {LAST_EVENT_CODE}")
             
-            for ev in new_events:
-                code = ev.get('event_code', ev['id'])
-                logger.info(f"🚨 NEW EVENT ID : {code} (Alert Sent!)")
-    else:
-        logger.info(f"EVENT ID : {LAST_EVENT_CODE}")
+    except Exception as e:
+        logger.error(f"CRITICAL EXCEPTION in process_tick: {e}")
+        error_details = traceback.format_exc()
+        logger.error(error_details)
+        send_email_message(
+            "🚨 CRITICAL: BIP Notifier Tick Crashed",
+            f"<b>The notifier encountered an unexpected exception during process_tick data parsing.</b><br><br>"
+            f"<b>Error Traceback:</b><br><pre>{error_details}</pre><br>"
+            f"The application has successfully caught this error, and is safely shutting down to prevent mail loops.",
+            is_html=True
+        )
+        raise SystemExit(1)
 
 def list_all_events():
     """Fetches the first page of events from BIP and prints them."""
@@ -437,6 +431,29 @@ def test_email_alert():
     else:
         logger.error("❌ Failed to send test message. Check your .env configuration.")
 
+def test_real_event_alert():
+    """Fetches the actual latest event from BIP and sends it as a test alert."""
+    logger.info("Fetching the real latest event to send as a test alert...")
+    
+    load_dotenv(override=True)
+    xsrf = os.getenv("XSRF_TOKEN", "")
+    bip = os.getenv("BIP_SESSION", "")
+    
+    data, err = fetch_bip_events(xsrf, bip, page=1)
+    if err:
+        logger.error(f"Error fetching real event: {err}")
+        return
+        
+    resources = data.get("resources", [])
+    if not resources:
+        logger.warning("No events found to test with.")
+        return
+        
+    ev = parse_event(resources[0])
+    logger.info(f"Triggering send_event_alerts with real event data: {ev.get('event_code')}")
+    send_event_alerts([ev])
+    logger.info("✅ Real latest event alert sent successfully!")
+
 def start_loop():
     logger.info("=" * 60)
     logger.info("🚀 BIP CLI Notifier Started")
@@ -457,6 +474,18 @@ def start_loop():
                     time.sleep(min(5, remaining))
     except KeyboardInterrupt:
         logger.info("\n🛑 Keyboard interrupt received.")
+    except Exception as e:
+        logger.error(f"FATAL SYSTEM ERROR in start_loop: {e}")
+        error_details = traceback.format_exc()
+        logger.error(error_details)
+        send_email_message(
+            "🚨 CRITICAL: BIP Notifier Crashed",
+            f"<b>The notifier encountered an unexpected fatal system error and has violently shut down.</b><br><br>"
+            f"<b>Error Traceback:</b><br><pre>{error_details}</pre><br>"
+            f"The application has been stopped to prevent instability. Please check your deployment logs.",
+            is_html=True
+        )
+        raise SystemExit(1)
     finally:
         logger.info("Cleaning up resources...")
         try:
@@ -547,18 +576,21 @@ if __name__ == "__main__":
     parser.add_argument("--list-all", action="store_true", help="List all recent events and exit")
     parser.add_argument("--latest", action="store_true", help="Print details of the latest event and exit")
     parser.add_argument("--test-alert", action="store_true", help="Send a test message to Email and exit")
+    parser.add_argument("--test-real-event", action="store_true", help="Fetch the actual latest event and send it as an alert")
     parser.add_argument("--run", action="store_true", help="Start the continuous monitoring loop (via FastAPI)")
-    
+
     # Task 8: Fix duplicate parsing
     args = parser.parse_args()
     logger.debug(f"Parsed arguments: {args}")
-    
+
     if args.list_all:
         list_all_events()
     elif args.latest:
         get_latest_event()
     elif args.test_alert:
         test_email_alert()
+    elif args.test_real_event:
+        test_real_event_alert()
     elif args.run:
         # Launch FastAPI which internally starts the loop
         port = int(os.getenv("PORT", 7860))
@@ -566,4 +598,4 @@ if __name__ == "__main__":
     else:
         # Default behavior: run FastAPI
         port = int(os.getenv("PORT", 7860))
-        uvicorn.run(app, host="0.0.0.0", port=port)
+        uvicorn.run(app, host="0.0.0.0", port=port)