Update main.py

main.py

@@ -8,8 +8,6 @@ from werkzeug.utils import secure_filename
 from flask_apscheduler import APScheduler
 import firebase_admin
 from firebase_admin import credentials, db, auth as firebase_auth
-from resend import Emails
-from resend.exceptions import ResendError
 import logging
 from logging.handlers import RotatingFileHandler
 import time
@@ -17,19 +15,8 @@ import random
 from datetime import datetime as dt_class, timezone
 from zoneinfo import ZoneInfo
 import pandas as pd
-import dns.resolver # <-- ADDED IMPORT
-import socket      # <-- ADDED IMPORT
-
-# === DNS RESOLUTION FIX ===
-# This is the definitive solution for networking issues in restricted environments.
-# It intercepts DNS lookups for 'api.resend.com' and forces them through a
-# reliable public DNS resolver, bypassing any potential issues with the
-# container's default DNS settings.
-
-
-
-
-
+import requests # <-- Used for direct API calls
+import certifi  # <-- Used for modern SSL certificates
 
 # === Logging Configuration ===
 if not os.path.exists('logs'):
@@ -49,42 +36,6 @@ root_logger.setLevel(logging.INFO)
 root_logger.addHandler(file_handler)
 root_logger.addHandler(console_handler)
 
-def setup_dns_override():
-    """Overrides the default socket address resolver for a specific domain."""
-    try:
-        # Use reliable public DNS servers
-        resolver = dns.resolver.Resolver()
-        resolver.nameservers = ['8.8.8.8', '8.8.4.4']
-
-        # Store the original resolver function
-        original_getaddrinfo = socket.getaddrinfo
-
-        def new_getaddrinfo(*args, **kwargs):
-            # Check if the domain we're looking up is the one we want to override
-            if args and isinstance(args[0], str) and 'api.resend.com' in args[0]:
-                try:
-                    # Resolve the domain to an IP address using our custom resolver
-                    answers = resolver.resolve(args[0], 'A')
-                    ip_address = str(answers[0])
-                    logger.info(f"DNS Override: Resolved {args[0]} to {ip_address}")
-                    # Call the original function with the IP address instead of the domain
-                    return original_getaddrinfo(ip_address, *args[1:], **kwargs)
-                except Exception as e:
-                    logger.error(f"DNS Override Failed for {args[0]}: {e}. Falling back to default resolver.")
-            
-            # For all other domains, use the original resolver
-            return original_getaddrinfo(*args, **kwargs)
-
-        # Replace the system's default resolver with our new one
-        socket.getaddrinfo = new_getaddrinfo
-        logger.info("Custom DNS resolver for 'api.resend.com' has been successfully set up.")
-    except Exception as e:
-        logger.error(f"Failed to set up custom DNS resolver: {e}")
-
-# Apply the fix at startup
-setup_dns_override()
-# === END DNS FIX ===
-
 # === ENV Config & Admin Setup ===
 ADMIN_EMAILS = ["rairorr@gmail.com", "nharingosheperd@gmail.com"]
 SEND_TO_EMAILS = ["rairorr@gmail.com", "nharingosheperd+guard@gmail.com"]
@@ -103,34 +54,68 @@ except Exception as e:
     logger.error(f"Failed to initialize Firebase Admin: {e}", exc_info=True)
     raise
 
-# === Flask App & Scheduler & Resend Setup ===
+# === Flask App & Scheduler Setup ===
 app = Flask(__name__)
 CORS(app)
 app.config.from_object(type('Config', (object,), {'SCHEDULER_API_ENABLED': True})())
 scheduler = APScheduler()
 scheduler.init_app(app)
 scheduler.start()
-Emails.api_key = RESEND_API_KEY
-logger.info("Flask, APScheduler, and Resend initialized.")
+logger.info("Flask and APScheduler initialized.")
 
 
+# === DEFINITIVE EMAIL SENDING FUNCTION ===
 def send_email(to, subject, html):
-    """Sends an email with robust error logging."""
+    """
+    Sends an email using a direct requests call to bypass library issues and
+    ensure a modern SSL certificate bundle is used.
+    """
+    if not RESEND_API_KEY:
+        logger.error("RESEND_API_KEY is not configured. Cannot send email.")
+        return None
+
+    url = "https://api.resend.com/emails"
+    headers = {
+        "Authorization": f"Bearer {RESEND_API_KEY.strip()}",
+        "Content-Type": "application/json"
+    }
+    payload = {
+        "from": "Admin <admin@resend.dev>",
+        "to": to.strip(),
+        "subject": subject,
+        "html": html
+    }
+    
+    logger.info(f"Attempting DIRECT API call to Resend for recipient: {to}")
+    
     try:
-        clean_to = to.strip()
-        response = Emails.send({
-            "from": "Admin <admin@resend.dev>",
-            "to": clean_to,
-            "subject": subject,
-            "html": html
-        })
-        logger.info(f"Email sent successfully to {clean_to}. Response ID: {response.get('id')}")
-        return response
-    except ResendError as e:
-        logger.error(f"A Resend API error occurred for recipient '{to}'. The error is: {str(e)}", exc_info=True)
+        # This is the critical part: make a direct request and explicitly
+        # tell it to verify the connection using certifi's CA bundle.
+        response = requests.post(
+            url,
+            headers=headers,
+            json=payload,
+            verify=certifi.where(),
+            timeout=15 # Add a reasonable timeout
+        )
+        
+        logger.info(f"Direct call response status for '{to}': {response.status_code}")
+        
+        # Check if the HTTP request itself was successful
+        response.raise_for_status()
+        
+        response_data = response.json()
+        logger.info(f"Email sent successfully to {to}. Email ID: {response_data.get('id')}")
+        return response_data
+
+    except requests.exceptions.SSLError as e:
+        logger.error(f"CRITICAL: SSL Error occurred for '{to}' despite using Certifi. This points to a deep network issue or firewall. Error: {repr(e)}", exc_info=True)
+        return None
+    except requests.exceptions.RequestException as e:
+        logger.error(f"A low-level network error occurred for '{to}'. The raw error is: {repr(e)}", exc_info=True)
         return None
     except Exception as e:
-        logger.error(f"An unexpected exception occurred while sending email to '{to}': {str(e)}", exc_info=True)
+        logger.error(f"An unexpected exception occurred during direct API call for '{to}'. Error: {repr(e)}", exc_info=True)
         return None