Broke the Intervals

main.py

@@ -47,8 +47,8 @@ WARNING_EMAIL_RECIPIENT = os.getenv("WARNING_EMAIL_RECIPIENT", os.getenv("EMAIL_
 EMAIL_PASSWORD = os.getenv("EMAIL_PASSWORD", "")
 BREVO_API_KEY = os.getenv("BREVO_API_KEY", "")
 
-# App check interval in seconds (default 60 secs = 1 min)
-# Read dynamically inside the loop via os.getenv("CHECK_INTERVAL_SECONDS", "60")
+# App check intervals in seconds
+# Read dynamically via os.getenv for NORMAL_INTERVAL, FAST_INTERVAL, FAST_DURATION
 
 BIP_API = "https://bip.bitsathy.ac.in/nova-api/student-activity-masters"
 HEADERS = {
@@ -67,6 +67,7 @@ STATE_FILE = "state.txt"
 LAST_EVENT_ID = None
 LAST_EVENT_CODE = None
 SESSION_EXPIRED = False
+FAST_MODE_UNTIL = 0
 
 # ==============================================================================
 # STATE MANAGEMENT (Task 1)
@@ -184,6 +185,13 @@ def send_event_alerts(events):
     if not events:
         return
         
+    def format_date(date_str):
+        try:
+            dt = datetime.strptime(date_str, "%Y-%m-%d")
+            return dt.strftime('%d-%m-%Y')
+        except:
+            return date_str
+
     msg = """
     <div style="font-family: Arial, sans-serif; background-color: #f4f6f9; padding: 20px;">
         <div style="max-width: 600px; margin: 0 auto; background: #ffffff; border-radius: 8px; 
@@ -201,32 +209,29 @@ def send_event_alerts(events):
 
     for i, ev in enumerate(events, 1):
 
-        # Date formatting
-        from datetime import datetime
-
-        def format_date(date_str):
-            try:
-                dt = datetime.strptime(date_str, "%Y-%m-%d")
-                return f"<span style='font-weight:bold;'>{dt.strftime('%d-%m')}</span>-{dt.strftime('%Y')}"
-            except:
-                return date_str
-
         start = format_date(ev.get("start_date", "")) if ev.get("start_date") else ""
         end = format_date(ev.get("end_date", "")) if ev.get("end_date") else ""
 
         date_str = f"{start} to {end}" if start and end else (start or end or "-")
 
-        # Highlight last 3 digits of code
+        # Code formatting without highlight
         code = ev.get("event_code", "-")
-        if len(code) >= 3:
-            highlighted_code = code[:-3] + f"<span style='font-weight:bold; color:#dc3545;'>{code[-3:]}</span>"
-        else:
-            highlighted_code = code
 
-        # Count values
-        max_count = ev.get("max_count", 0)
-        applied = ev.get("applied_count", 0)
-        balance = max_count - applied
+        # Count values (convert to ints to ensure accurate calculation)
+        try:
+            max_count = int(ev.get("maximum_count", 0))
+        except (ValueError, TypeError):
+            max_count = 0
+            
+        try:
+            applied = int(ev.get("applied_count", 0))
+        except (ValueError, TypeError):
+            applied = 0
+            
+        try:
+            balance = int(ev.get("ComputedField", 0))
+        except (ValueError, TypeError):
+            balance = 0
 
         msg += f"""
             <table style="width: 100%; border-collapse: collapse; 
@@ -236,7 +241,7 @@ def send_event_alerts(events):
                 <tr>
                     <td style="padding: 8px 0; font-weight: bold; width: 35%;">Code</td>
                     <td style="padding: 8px 0; width: 5%;">:</td>
-                    <td style="padding: 8px 0; width: 60%;">{highlighted_code}</td>
+                    <td style="padding: 8px 0; width: 60%; font-weight: bold;">{code}</td>
                 </tr>
 
                 <tr>
@@ -263,16 +268,6 @@ def send_event_alerts(events):
                     <td style="padding: 8px 0;">{ev.get('location', '-')}</td>
                 </tr>
 
-                <tr>
-                    <td style="padding: 12px 0; font-weight: bold;">Count</td>
-                    <td style="padding: 12px 0;">:</td>
-                    <td style="padding: 12px 0;">
-                        Max: <b>{max_count}</b> |
-                        Balance: <b>{balance}</b> |
-                        Applied: <b>{applied}</b>
-                    </td>
-                </tr>
-
                 <tr>
                     <td style="padding: 8px 0; font-weight: bold;">Logger URL</td>
                     <td style="padding: 8px 0;">:</td>
@@ -295,6 +290,16 @@ def send_event_alerts(events):
                     </td>
                 </tr>
 
+                <tr>
+                    <td style="padding: 12px 0; font-weight: bold;">Count</td>
+                    <td style="padding: 12px 0;">:</td>
+                    <td style="padding: 12px 0;">
+                        Max: <b>{max_count}</b> |
+                        Balance: <b>{balance}</b> |
+                        Applied: <b>{applied}</b>
+                    </td>
+                </tr>
+
             </table>
         """
 
@@ -410,8 +415,25 @@ def check_new_events(last_id, xsrf_token, bip_session):
 # ==============================================================================
 # SCHEDULER ENGINE
 # ==============================================================================
+def get_current_interval():
+    """Returns the polling interval in seconds, or 0 if in inactive hours."""
+    global FAST_MODE_UNTIL
+    
+    fast_interval = int(os.getenv("FAST_INTERVAL", "30"))
+    normal_interval = int(os.getenv("NORMAL_INTERVAL", "120"))
+    
+    now_ist = datetime.now(IST)
+    current_hour = now_ist.hour
+    
+    if 8 <= current_hour < 17:
+        if time.time() < FAST_MODE_UNTIL:
+            return fast_interval
+        else:
+            return normal_interval
+    return 0
+
 def process_tick():
-    global LAST_EVENT_ID, LAST_EVENT_CODE
+    global LAST_EVENT_ID, LAST_EVENT_CODE, FAST_MODE_UNTIL
     logger.debug("--- process_tick starting ---")
     
     try:
@@ -451,6 +473,9 @@ def process_tick():
             raise SystemExit(1)
             
         if new_events:
+            fast_duration = int(os.getenv("FAST_DURATION", "120"))
+            FAST_MODE_UNTIL = time.time() + fast_duration
+            
             # 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"]
@@ -584,23 +609,24 @@ def test_real_event_alert():
     logger.info("✅ Real latest event alert sent successfully!")
 
 def start_loop():
+    global FAST_MODE_UNTIL
     logger.info("🚀 BIP CLI Notifier Started")
     
     sleep_notified = False
     
     try:
         while True:
-            now_ist = datetime.now(IST)
-            current_hour = now_ist.hour
+            check_interval = get_current_interval()
             
-            if 8 <= current_hour < 15:
-                check_interval = 120
-                sleep_notified = False
-            elif 15 <= current_hour < 17:
-                check_interval = 60
+            if check_interval > 0:
+                fast_interval = int(os.getenv("FAST_INTERVAL", "30"))
+                if check_interval == fast_interval:
+                    logger.info(f"⚡ Fast Mode Active ({fast_interval}s interval)")
                 sleep_notified = False
             else:
                 # Sleep until next 8 AM
+                now_ist = datetime.now(IST)
+                current_hour = now_ist.hour
                 next_8am = now_ist.replace(hour=8, minute=0, second=0, microsecond=0)
                 if current_hour >= 17:
                     next_8am += timedelta(days=1)
@@ -621,6 +647,7 @@ def start_loop():
                     )
                     sleep_notified = True
                     
+                FAST_MODE_UNTIL = 0
                 time.sleep(sleep_seconds)
                 continue
                 
@@ -717,17 +744,13 @@ async def root():
 async def internal_assistant():
     load_dotenv(override=True)
 
-    now_ist = datetime.now(IST)
-    current_hour = now_ist.hour
-    
-    if 8 <= current_hour < 15:
-        current_interval = 120
-        status_msg = "running"
-    elif 15 <= current_hour < 17:
-        current_interval = 60
+    current_interval = get_current_interval()
+    fast_interval = int(os.getenv("FAST_INTERVAL", "30"))
+    if current_interval == fast_interval:
+        status_msg = "running (fast mode)"
+    elif current_interval > 0:
         status_msg = "running"
     else:
-        current_interval = 0
         status_msg = "paused (inactive hours)"
 
     return {
@@ -774,4 +797,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, log_level="warning")
+        uvicorn.run(app, host="0.0.0.0", port=port, log_level="warning")