Update main.py

main.py

@@ -38,7 +38,8 @@ logger = logging.getLogger(__name__)
 
 # Email settings
 EMAIL_ADDRESS = os.getenv("EMAIL_ADDRESS", "")
-EMAIL_RECIPIENT = os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS)
+EVENT_EMAIL_RECIPIENT = os.getenv("EVENT_EMAIL_RECIPIENT", os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS))
+WARNING_EMAIL_RECIPIENT = os.getenv("WARNING_EMAIL_RECIPIENT", os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS))
 EMAIL_PASSWORD = os.getenv("EMAIL_PASSWORD", "")
 BREVO_API_KEY = os.getenv("BREVO_API_KEY", "")
 
@@ -67,21 +68,28 @@ SESSION_EXPIRED = False
 # STATE MANAGEMENT (Task 1)
 # ==============================================================================
 def load_state():
-    global LAST_EVENT_ID
+    global LAST_EVENT_ID, LAST_EVENT_CODE
     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)
+                    # In case the file has multiple lines (id and code)
+                    parts = content.split(",")
+                    LAST_EVENT_ID = int(parts[0])
+                    if len(parts) > 1:
+                        LAST_EVENT_CODE = parts[1]
                     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):
+def save_state(event_id, event_code=None):
     try:
         with open(STATE_FILE, "w") as f:
-            f.write(str(event_id))
+            if event_code:
+                f.write(f"{event_id},{event_code}")
+            else:
+                f.write(str(event_id))
     except Exception as e:
         logger.error(f"Failed to write state file: {e}")
 
@@ -92,7 +100,10 @@ import smtplib
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 
-def send_email_message(subject: str, body: str, is_html=False):
+def send_email_message(subject: str, body: str, is_html=False, recipient=None):
+    if recipient is None:
+        recipient = WARNING_EMAIL_RECIPIENT
+
     # Cloud Safe Alternative (Brevo API)
     if BREVO_API_KEY:
         logger.debug("--> send_email_message called via Brevo API")
@@ -104,12 +115,13 @@ def send_email_message(subject: str, body: str, is_html=False):
                 "content-type": "application/json"
             }
             
-            recipient_list = [{"email": e.strip()} for e in EMAIL_RECIPIENT.split(",") if e.strip()]
+            recipient_list = [{"email": e.strip()} for e in recipient.split(",") if e.strip()]
             
             payload = {
                 "sender": {"name": "BIP Auto Notifier", "email": EMAIL_ADDRESS},
-                "to": recipient_list,
-                "subject": subject
+                "bcc": recipient_list,
+                "subject": subject,
+                "replyTo": {"name": "BIP Auto Notifier", "email": "noreply@bip.notifier"}
             }
             
             if is_html:
@@ -135,14 +147,14 @@ def send_email_message(subject: str, body: str, is_html=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:
+    if not EMAIL_ADDRESS or not EMAIL_PASSWORD or not recipient:
         logger.warning(f"Email credentials not configured. The following alert '{subject}' would have been sent.")
         return False
         
     try:
         msg = MIMEMultipart()
         msg['From'] = EMAIL_ADDRESS
-        msg['To'] = EMAIL_RECIPIENT
+        msg['Bcc'] = recipient
         msg['Subject'] = subject
         
         if is_html:
@@ -150,7 +162,7 @@ def send_email_message(subject: str, body: str, is_html=False):
         else:
             msg.attach(MIMEText(body, 'plain'))
             
-        recipient_list = [e.strip() for e in EMAIL_RECIPIENT.split(",") if e.strip()]
+        recipient_list = [e.strip() for e in recipient.split(",") if e.strip()]
         
         server = smtplib.SMTP('smtp.gmail.com', 587)
         server.starttls()
@@ -193,7 +205,7 @@ def send_event_alerts(events):
             f"<a href='{ev.get('web_url', '#')}'>View Event Here</a><br>"
             f"<hr>"
         )
-    send_email_message("📢 New BIP Event(s) Found!", msg, is_html=True)
+    send_email_message("📢 New BIP Event(s) Found!", msg, is_html=True, recipient=EVENT_EMAIL_RECIPIENT)
 
 
 # ==============================================================================
@@ -335,7 +347,7 @@ 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)
-                save_state(LAST_EVENT_ID)
+                save_state(LAST_EVENT_ID, LAST_EVENT_CODE)
                 logger.info(f"EVENT ID : {LAST_EVENT_CODE} (Tracking started)")
                 
                 # Send the startup notification
@@ -350,13 +362,14 @@ def process_tick():
                 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)
+                save_state(LAST_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}")
+            display_code = LAST_EVENT_CODE if LAST_EVENT_CODE else LAST_EVENT_ID
+            logger.info(f"EVENT ID : {display_code}")
             
     except Exception as e:
         logger.error(f"CRITICAL EXCEPTION in process_tick: {e}")
@@ -428,12 +441,16 @@ def get_latest_event():
 
 def test_email_alert():
     """Sends a dummy test message to the configured Email."""
-    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:
-        logger.info("✅ Test message sent successfully!")
+    logger.info("Sending test exact alert to Event Email...")
+    success1 = send_email_message("🤖 Test Alert - Event Receivers", "🤖 <b>Test Alert from BIP CLI Notifier</b><br><br>Event emails are working perfectly!", is_html=True, recipient=EVENT_EMAIL_RECIPIENT)
+    
+    logger.info("Sending test exact alert to Warning Email...")
+    success2 = send_email_message("🤖 Test Alert - Warning Receivers", "🤖 <b>Test Alert from BIP CLI Notifier</b><br><br>Warning emails are working perfectly!", is_html=True, recipient=WARNING_EMAIL_RECIPIENT)
+    
+    if success1 and success2:
+        logger.info("✅ Test messages sent successfully!")
     else:
-        logger.error("❌ Failed to send test message. Check your .env configuration.")
+        logger.error("❌ Failed to send one or more test messages. Check your .env configuration.")
 
 def test_real_event_alert():
     """Fetches the actual latest event from BIP and sends it as a test alert."""