cronjob first commit

cronjob_service.py

@@ -1,24 +1,32 @@
 import logging
 import requests
 import pytz
-from datetime import time
+from datetime import datetime
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.cron import CronTrigger
 from dotenv import load_dotenv
 import os
+from twilio.rest import Client
+from twilio.base.exceptions import TwilioRestException
 
 load_dotenv()
 
-# --- Configuration ---
+# --- Twilio Configuration (New Additions) ---
+TWILIO_ENABLED = os.getenv("TWILIO_ENABLED", "false").lower() == "true"
+TWILIO_ACCOUNT_SID = os.getenv("TWILIO_ACCOUNT_SID")
+TWILIO_AUTH_TOKEN = os.getenv("TWILIO_AUTH_TOKEN")
+TWILIO_WHATSAPP_FROM = os.getenv("TWILIO_WHATSAPP_FROM", "whatsapp:+14155238886")
+ADMIN_WHATSAPP_NUMBER = os.getenv("ADMIN_WHATSAPP_NUMBER")
+
+# --- Existing Configuration (Unchanged) ---
 DAILY_CHAT_RATE_LIMIT_RESET_URL = os.getenv("DAILY_CHAT_RATE_LIMIT_RESET_URL")
 DAILY_CHAT_RATE_LIMIT_RESET_TOKEN = os.getenv("DAILY_CHAT_RATE_LIMIT_RESET_TOKEN")
-
 API_ONLY_USER_CHAT_LIMIT_RESET_URL = os.getenv("API_ONLY_USER_CHAT_LIMIT_RESET_URL")
 API_ONLY_USER_CHAT_LIMIT_RESET_TOKEN = os.getenv("API_ONLY_USER_CHAT_LIMIT_RESET_TOKEN")
 US_TIMEZONE = 'US/Eastern'
 LOG_FILE = 'cronjob_log.log'
 
-# --- Logging Setup ---
+# --- Existing Logging Setup (Unchanged) ---
 logging.basicConfig(
     level=logging.INFO,
     format='%(asctime)s - %(levelname)s - %(message)s',
@@ -27,24 +35,56 @@ logging.basicConfig(
         logging.StreamHandler()
     ]
 )
+logger = logging.getLogger(__name__)
+
+def send_whatsapp_notification(message: str):
+    """New: Safely send WhatsApp notification without disrupting main logic"""
+    if not TWILIO_ENABLED:
+        return False
+
+    try:
+        client = Client(TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN)
+        client.messages.create(
+            body=f"[CRONJOB] {message}",
+            from_=TWILIO_WHATSAPP_FROM,
+            to=ADMIN_WHATSAPP_NUMBER
+        )
+        return True
+    except Exception as e:
+        logger.warning(f"Notification failed (non-critical): {str(e)}")
+        return False
 
 def call_service(url: str, token: str, service_name: str):
-    """Makes a POST request to the specified URL with Bearer token."""
-    logging.info(f"Calling {service_name} at {url}")
-    headers = {
-        "Authorization": f"Bearer {token}",
-        "Content-Type": "application/json"
-    }
+    """Modified: Existing logic with added notifications"""
+    start_time = datetime.now()
+    logger.info(f"Starting {service_name} at {start_time}")
     
     try:
+        # Original unchanged logic
+        headers = {
+            "Authorization": f"Bearer {token}",
+            "Content-Type": "application/json"
+        }
         response = requests.post(url, headers=headers)
         response.raise_for_status()
-        logging.info(f"{service_name} success. Status: {response.status_code}")
+        
+        # New success notification
+        duration = (datetime.now() - start_time).total_seconds()
+        success_msg = f"{service_name} succeeded in {duration:.2f}s (Status: {response.status_code})"
+        logger.info(success_msg)
+        send_whatsapp_notification(f"✅ {success_msg}")
+        
     except Exception as e:
-        logging.error(f"{service_name} failed: {str(e)}")
+        # Original error handling preserved
+        error_msg = f"{service_name} failed: {str(e)}"
+        logger.error(error_msg)
+        
+        # New failure notification
+        send_whatsapp_notification(f"❌ {error_msg[:200]}")  # Truncate long errors
+        raise  # Maintains existing error propagation
 
 def init_scheduler():
-    """Initialize and start the scheduler"""
+    """Unchanged scheduler initialization"""
     scheduler = BackgroundScheduler(timezone=pytz.timezone(US_TIMEZONE))
     
     scheduler.add_job(
@@ -62,4 +102,9 @@ def init_scheduler():
     )
     
     scheduler.start()
+    
+    # New: Optional startup notification
+    if TWILIO_ENABLED:
+        send_whatsapp_notification("🟢 Scheduler started successfully")
+    
     return scheduler

requirements.txt

@@ -3,4 +3,5 @@ pytz
 fastapi
 uvicorn
 requests
-dotenv
+dotenv
+twilio