Update main.py

main.py

@@ -2,20 +2,95 @@ import os
 import time
 import argparse
 import requests
+import random
+import logging
+import json
 from datetime import datetime
 from dotenv import load_dotenv
 import threading
-from http.server import BaseHTTPRequestHandler, HTTPServer
+import asyncio
+
+from fastapi import FastAPI, BackgroundTasks
+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()
 
+# ==============================================================================
+# LOGGING (Task 5)
+# ==============================================================================
+logging.basicConfig(
+    level=logging.INFO,
+    format='[%(asctime)s] %(levelname)s: %(message)s',
+    datefmt='%I:%M:%S %p'
+)
+logger = logging.getLogger(__name__)
+
 # ==============================================================================
 # CONFIGURATION
 # ==============================================================================
 # 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
+EMAIL_ADDRESS = os.getenv("EMAIL_ADDRESS", "")
+EMAIL_RECIPIENT = os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS)
+EMAIL_PASSWORD = os.getenv("EMAIL_PASSWORD", "")
+BREVO_API_KEY = os.getenv("BREVO_API_KEY", "")
+
+# App check interval in seconds (default 60 secs = 1 min)
+CHECK_INTERVAL_SECONDS = int(os.getenv("CHECK_INTERVAL_SECONDS", "60"))
+
+BIP_API = "https://bip.bitsathy.ac.in/nova-api/student-activity-masters"
+HEADERS = {
+    "accept": "application/json",
+    "x-requested-with": "XMLHttpRequest",
+}
+
+# ==============================================================================
+# GLOBAL SESSION (Task 2)
+# ==============================================================================
+SESSION = requests.Session()
+SESSION.headers.update(HEADERS)
+
+# State tracking for the loop
+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)
+# ==============================================================================
+def load_state():
+    global LAST_EVENT_ID
+    if os.path.exists(STATE_FILE):
+        try:
+            with open(STATE_FILE, "r") as f:
+                content = f.read().strip()
+                if content:
+                    LAST_EVENT_ID = int(content)
+                    logger.info(f"Loaded LAST_EVENT_ID from state: {LAST_EVENT_ID}")
+        except Exception as e:
+            logger.error(f"Failed to read state file: {e}")
+
+def save_state(event_id):
+    try:
+        with open(STATE_FILE, "w") as f:
+            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", "")
@@ -49,12 +124,48 @@ from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 
 def send_email_message(subject: str, body: str, is_html=False):
-    print(f"\n[DEBUG] --> send_email_message called")
+    # Cloud Safe Alternative (Brevo API)
+    if BREVO_API_KEY:
+        logger.debug("--> send_email_message called via Brevo API")
+        try:
+            url = "https://api.brevo.com/v3/smtp/email"
+            headers = {
+                "accept": "application/json",
+                "api-key": BREVO_API_KEY,
+                "content-type": "application/json"
+            }
+            
+            payload = {
+                "sender": {"name": "BIP Auto Notifier", "email": EMAIL_ADDRESS},
+                "to": [{"email": EMAIL_RECIPIENT}],
+                "subject": subject
+            }
+            
+            if is_html:
+                payload["htmlContent"] = body
+            else:
+                payload["textContent"] = body
+                
+            response = requests.post(url, json=payload, headers=headers, timeout=10)
+            
+            if response.status_code in [201, 200, 202]:
+                logger.info(f"Brevo email sent successfully! Status: {response.status_code}")
+                return True
+            else:
+                try:
+                    error_data = response.json()
+                    logger.error(f"Brevo API Error (Status {response.status_code}): {error_data.get('message', 'Unknown error')} - Code: {error_data.get('code', 'Unknown')}")
+                except Exception:
+                    logger.error(f"Brevo API Error: {response.status_code} - {response.text}")
+                return False
+        except Exception as e:
+            logger.error(f"Brevo Network EXCEPTION: {e}")
+            return False
+
+    # Local Fallback (SMTP)
+    logger.debug("--> send_email_message called via Standard SMTP")
     if not EMAIL_ADDRESS or not EMAIL_PASSWORD or not EMAIL_RECIPIENT:
-        print("\n[!] Email credentials not configured. The following alert would have been sent:\n")
-        print(f"Subject: {subject}")
-        print(body)
-        print("-" * 50)
+        logger.warning(f"Email credentials not configured. The following alert '{subject}' would have been sent.")
         return False
         
     try:
@@ -74,11 +185,10 @@ def send_email_message(subject: str, body: str, is_html=False):
         text = msg.as_string()
         server.sendmail(EMAIL_ADDRESS, EMAIL_RECIPIENT, text)
         server.quit()
-        print(f"[DEBUG] Email sent successfully.")
+        logger.info(f"SMTP Email sent successfully.")
         return True
     except Exception as e:
-        print(f"[DEBUG] Network/SMTP EXCEPTION: {e}")
-        print(f"[!] Failed to send email: {e}")
+        logger.error(f"Network/SMTP EXCEPTION: {e}")
         return False
 
 def send_event_alerts(events):
@@ -117,25 +227,47 @@ def send_event_alerts(events):
 # SCRAPER LOGIC
 # ==============================================================================
 def fetch_bip_events(xsrf_token, bip_session, page=1):
-    print(f"\n[DEBUG] --> fetch_bip_events(page={page})")
+    logger.debug(f"--> fetch_bip_events(page={page})")
+    
     cookies = {
         "XSRF-TOKEN": xsrf_token,
         "bip_session": bip_session
     }
     params = {"perPage": 10, "page": page}
-    try:
-        print(f"[DEBUG] Fetching strictly from {BIP_API} ...")
-        r = requests.get(BIP_API, params=params, headers=HEADERS, cookies=cookies, timeout=20)
-        print(f"[DEBUG] BIP API responded with HTTP {r.status_code}")
-        # Check if session expired based on HTML redirect instead of JSON
-        if "text/html" in r.headers.get("Content-Type", "") or r.status_code == 401 or r.status_code == 403:
-            print(f"[DEBUG] Session expired detected! Content-type: {r.headers.get('Content-Type')}, Status: {r.status_code}")
-            return None, "Session expired or invalid cookies."
-        r.raise_for_status()
-        return r.json(), None
-    except Exception as e:
-        print(f"[DEBUG] Network/Request EXCEPTION in fetch_bip_events: {type(e).__name__} - {e}")
-        return None, str(e)
+    
+    # Task 3: Exponential Backoff Retry Logic
+    max_retries = 3
+    for attempt in range(max_retries):
+        try:
+            # Task 2: Use global requests.Session instead of bare requests.get
+            r = SESSION.get(BIP_API, params=params, cookies=cookies, timeout=20)
+            
+            # 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}")
+                return None, "Session expired or invalid cookies."
+                
+            r.raise_for_status()
+            
+            # Task 7: Response format validation
+            data = r.json()
+            if not isinstance(data, dict) or "resources" not in data or not isinstance(data["resources"], list):
+                if attempt < max_retries - 1:
+                    raise Exception("Invalid JSON structure received from BIP API: missing or malformed 'resources' list")
+                return None, "Invalid JSON structure received from BIP API."
+                
+            return data, None
+
+        except Exception as e:
+            if attempt < max_retries - 1:
+                sleep_time = (2 ** attempt) + random.uniform(0.1, 1.0)
+                logger.warning(f"Attempt {attempt + 1} failed: {e}. Retrying in {sleep_time:.2f}s...")
+                time.sleep(sleep_time)
+            else:
+                logger.error(f"Network/Request EXCEPTION in fetch_bip_events after {max_retries} attempts: {e}")
+                return None, str(e)
+                
+    return None, "Max retries exceeded."
 
 def parse_event(resource):
     data = {}
@@ -182,35 +314,34 @@ 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
-    print("\n[DEBUG] --- process_tick starting ---")
-    # Reload environment variables on every tick so user can update .env without restarting
+    global LAST_EVENT_ID, LAST_EVENT_CODE, SESSION_EXPIRED
+    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", "")
     
-    now = datetime.now()
-    time_str = now.strftime('%I:%M:%S %p')
-
     if not xsrf or not bip:
-        print(f"[{time_str}] ⏳ Skipping check: Please configure XSRF_TOKEN and BIP_SESSION in the .env file.")
+        logger.warning("Skipping check: Please configure XSRF_TOKEN and BIP_SESSION in the .env file.")
         return
 
-    # Unsilenced print block to report resuming checking!
     if SESSION_EXPIRED:
         if xsrf == EXPIRED_XSRF and bip == EXPIRED_BIP:
-            print(f"{time_str.lower()}  - ⏸️ Paused: Waiting for new cookies in .env to resume...")
+            logger.info("Paused: Waiting for new cookies in .env to resume...")
             return
         else:
-            print(f"{time_str.lower()}  - 🔄 New cookies detected! Resuming checks...")
+            logger.info("New cookies detected! Resuming checks...")
             SESSION_EXPIRED = False
-            EXPIRED_XSRF = None
-            EXPIRED_BIP = None
+            
+    # 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:
-        print(f"{time_str.lower()}  - ❌ Error scraping events: {err}")
+        logger.error(f"Error scraping events: {err}")
         send_email_message(
             "⚠️ BIP Scraper Error",
             "⚠️ <b>Scraper Error!</b><br><br>"
@@ -220,8 +351,6 @@ def process_tick():
             is_html=True
         )
         SESSION_EXPIRED = True
-        EXPIRED_XSRF = xsrf
-        EXPIRED_BIP = bip
         return
         
     if new_events:
@@ -229,21 +358,23 @@ def process_tick():
         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)
-            print(f"{time_str.lower()}  - EVENT ID : {LAST_EVENT_CODE} (Tracking started)")
+            save_state(LAST_EVENT_ID)
+            logger.info(f"EVENT ID : {LAST_EVENT_CODE} (Tracking started)")
         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'])
-                print(f"{time_str.lower()}  - 🚨 NEW EVENT ID : {code} (Alert Sent!)")
+                logger.info(f"🚨 NEW EVENT ID : {code} (Alert Sent!)")
     else:
-        # Just print the tracking status format exactly as requested on every 1-minute tick
-        print(f"{time_str.lower()}  - EVENT ID : {LAST_EVENT_CODE}")
+        logger.info(f"EVENT ID : {LAST_EVENT_CODE}")
 
 def list_all_events():
     """Fetches the first page of events from BIP and prints them."""
-    print("Fetching recent events from BIP...")
+    logger.info("Fetching recent events from BIP...")
     
     load_dotenv(override=True)
     xsrf = os.getenv("XSRF_TOKEN", "")
@@ -251,15 +382,15 @@ def list_all_events():
     
     data, err = fetch_bip_events(xsrf, bip, page=1)
     if err:
-        print(f"❌ Error: {err}")
+        logger.error(f"Error: {err}")
         return
         
     resources = data.get("resources", [])
     if not resources:
-        print("No events found.")
+        logger.info("No events found.")
         return
         
-    print(f"\nFound {len(resources)} recent events:")
+    logger.info(f"\nFound {len(resources)} recent events:")
     print("-" * 60)
     for res in resources:
         ev = parse_event(res)
@@ -268,7 +399,7 @@ def list_all_events():
 
 def get_latest_event():
     """Fetches and prints only the single most recent event."""
-    print("Fetching the latest event...")
+    logger.info("Fetching the latest event...")
     
     load_dotenv(override=True)
     xsrf = os.getenv("XSRF_TOKEN", "")
@@ -276,12 +407,12 @@ def get_latest_event():
     
     data, err = fetch_bip_events(xsrf, bip, page=1)
     if err:
-        print(f"❌ Error: {err}")
+        logger.error(f"Error: {err}")
         return
         
     resources = data.get("resources", [])
     if not resources:
-        print("No events found.")
+        logger.info("No events found.")
         return
         
     ev = parse_event(resources[0])
@@ -298,18 +429,18 @@ def get_latest_event():
 
 def test_email_alert():
     """Sends a dummy test message to the configured Email."""
-    print("Sending test exact alert to Email...")
-    success = send_email_message("🤖 Test Alert", "🤖 <b>Test Alert from BIP CLI Notifier</b><br><br>Your Email integration is working perfectly!", is_html=True)
+    logger.info("Sending test exact alert to Email...")
+    success = send_email_message("🤖 Test Alert", "🤖 <b>Test Alert from BIP CLI Notifier</b><br><br>Your currently configured email system is working perfectly!", is_html=True)
     if success:
-        print("✅ Test message sent successfully!")
+        logger.info("✅ Test message sent successfully!")
     else:
-        print("❌ Failed to send test message. Check your .env configuration.")
+        logger.error("❌ Failed to send test message. Check your .env configuration.")
 
 def start_loop():
-    print("=" * 60)
-    print("🚀 BIP CLI Notifier Started")
-    print("=" * 60)
-    print("Press Ctrl+C to stop the notifier at any time.\n")
+    logger.info("=" * 60)
+    logger.info("🚀 BIP CLI Notifier Started")
+    logger.info("=" * 60)
+    logger.info("Press Ctrl+C to stop the notifier at any time.\n")
     
     try:
         while True:
@@ -324,37 +455,71 @@ def start_loop():
                 if remaining > 0:
                     time.sleep(min(5, remaining))
     except KeyboardInterrupt:
-        print("\n\n🛑 Notifier manually stopped by user. Goodbye!")
+        logger.info("\n🛑 Keyboard interrupt received.")
+    finally:
+        logger.info("Cleaning up resources...")
+        try:
+            SESSION.close()
+        except:
+            pass
+        logger.info("Notifier stopped gracefully. Goodbye!")
 
+# ==============================================================================
+# FASTAPI MICROSERVICE (Task 10)
+# ==============================================================================
+app = FastAPI(title="BIP Auto Notifier")
+
+def background_scraper_loop():
+    """Runs the main notification loop within the FastAPI background."""
+    start_loop()
+
+@app.on_event("startup")
+async def startup_event():
+    logger.info("FastAPI starting up. Launching background tracker thread...")
+    threading.Thread(target=background_scraper_loop, daemon=True).start()
 
-def run_dummy_server():
+@app.get("/health")
+async def health_check():
     """
-    Hugging Face Spaces requires a web server listening on port 7860 to pass health checks.
-    This tiny server does nothing but say "I am alive" in the background.
+    Task 6 & 10: Improved Health Endpoint
+    Returns status, active tracking state, and expiration errors.
     """
-    class DummyHandler(BaseHTTPRequestHandler):
-        def do_GET(self):
-            self.send_response(200)
-            self.send_header('Content-type', 'text/html')
-            self.end_headers()
-            self.wfile.write(b"BIP Notifier is running in the background!")
-            
-        def log_message(self, format, *args):
-            pass # Keep terminal clean from HTTP logs
-            
-    server = HTTPServer(('0.0.0.0', 7860), DummyHandler)
-    server.serve_forever()
+    return {
+        "status": "online",
+        "session_expired": SESSION_EXPIRED,
+        "last_event_id": LAST_EVENT_ID,
+        "timestamp": datetime.now().isoformat()
+    }
+
+@app.get("/latest")
+async def fetch_latest_api():
+    """Fetches the latest currently available event on the portal."""
+    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:
+        return {"error": err}
+        
+    resources = data.get("resources", [])
+    if not resources:
+        return {"message": "No events found."}
+        
+    return parse_event(resources[0])
+
 
 if __name__ == "__main__":
-    print("Starting BIP CLI Notifier...")   
+    logger.info("Starting BIP CLI Notifier...")   
     parser = argparse.ArgumentParser(description="BIP Cloud Notifier CLI")
     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("--run", action="store_true", help="Start the continuous 1-minute monitoring loop")
-    print("Parsed arguments:", parser.parse_args())
+    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()
@@ -363,9 +528,10 @@ if __name__ == "__main__":
     elif args.test_alert:
         test_email_alert()
     elif args.run:
-        threading.Thread(target=run_dummy_server, daemon=True).start()
-        start_loop()
+        # Launch FastAPI which internally starts the loop
+        port = int(os.getenv("PORT", 7860))
+        uvicorn.run(app, host="0.0.0.0", port=port)
     else:
-        # If no arguments provided, default to starting the loop just like before
-        threading.Thread(target=run_dummy_server, daemon=True).start()
-        start_loop()
+        # Default behavior: run FastAPI
+        port = int(os.getenv("PORT", 7860))
+        uvicorn.run(app, host="0.0.0.0", port=port)