Update email_sender_api.py

email_sender_api.py

@@ -7,8 +7,10 @@ from email.mime.base import MIMEBase
 from email import encoders
 import base64
 import os
+import socket # For socket-related exceptions and timeout
+import traceback # For detailed error printing
 
-app = Flask(__name__) # Make sure your Flask app instance is named 'app'
+app = Flask(__name__)
 CORS(app)
 
 # Environment variables will be set as Secrets in Hugging Face Space settings
@@ -17,40 +19,45 @@ SMTP_SERVER_PORT = os.environ.get("SMTP_SERVER_PORT")
 SMTP_SENDER_EMAIL = os.environ.get("SMTP_SENDER_EMAIL")
 SMTP_SENDER_PASSWORD = os.environ.get("SMTP_SENDER_PASSWORD")
 
+SMTP_CONNECTION_TIMEOUT = 20  # seconds for connection
+SMTP_COMMAND_TIMEOUT = 20     # seconds for individual commands
+
 @app.route('/send-report-via-email', methods=['POST'])
 def handle_send_email():
-    print("EMAIL_SENDER_API (HF): Received request at /send-report-via-email")
+    request_id = base64.b64encode(os.urandom(6)).decode('utf-8') # Simple request ID for logging
+    print(f"EMAIL_SENDER_API (HF) [{request_id}]: Received request at /send-report-via-email")
+
     if not all([SMTP_SERVER_HOST, SMTP_SERVER_PORT, SMTP_SENDER_EMAIL, SMTP_SENDER_PASSWORD]):
-        error_msg = "EMAIL_SENDER_API (HF): ERROR - SMTP environment variables (Secrets) not fully set."
+        error_msg = "EMAIL_SENDER_API (HF) [{request_id}]: ERROR - SMTP environment variables (Secrets) not fully set."
         print(error_msg)
         return jsonify({"status": "error", "message": "Email server configuration incomplete on the API."}), 500
     
     try:
         SMTP_PORT_INT = int(SMTP_SERVER_PORT)
     except ValueError:
-        error_msg = "EMAIL_SENDER_API (HF): ERROR - Invalid SMTP_SERVER_PORT configured."
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: ERROR - Invalid SMTP_SERVER_PORT: '{SMTP_SERVER_PORT}'."
         print(error_msg)
         return jsonify({"status": "error", "message": "Invalid email server port configured on the API."}), 500
 
     data = request.json
     if not data:
-        print("EMAIL_SENDER_API (HF): No JSON data received.")
+        print(f"EMAIL_SENDER_API (HF) [{request_id}]: No JSON data received.")
         return jsonify({"status": "error", "message": "No data received by email API."}), 400
 
     recipient_email = data.get('recipient_email')
     pdf_base64_data = data.get('pdf_base64_data')
     pdf_filename = data.get('pdf_filename')
-    print(f"EMAIL_SENDER_API (HF): Attempting to send to: {recipient_email}, Filename: {pdf_filename}")
+    print(f"EMAIL_SENDER_API (HF) [{request_id}]: Attempting to send to: {recipient_email}, Filename: {pdf_filename}")
 
     if not all([recipient_email, pdf_base64_data, pdf_filename]):
-        print("EMAIL_SENDER_API (HF): Missing required data in JSON payload.")
+        print(f"EMAIL_SENDER_API (HF) [{request_id}]: Missing required data in JSON payload.")
         return jsonify({"status": "error", "message": "Missing required data: recipient_email, pdf_base64_data, or pdf_filename."}), 400
 
     try:
         msg = MIMEMultipart()
         msg['From'] = SMTP_SENDER_EMAIL
         msg['To'] = recipient_email
-        msg['Subject'] = f"EPIC-AMP Analysis Report: {pdf_filename}"
+        msg['Subject'] = f"EPIC-AMP Analysis Report: {pdf_filename}" # Subject kept as is
         body = f"""Dear User,\n\nPlease find your EPIC-AMP analysis report attached.\n\nFilename: {pdf_filename}\n\nThis report includes details on your sequence analysis.\n\nThank you for using EPIC-AMP!\n\nBest regards,\nThe EPIC-AMP Team\nBioinformatics and Computational Biology Unit, Zewail City\nFor inquiries: [email protected]"""
         msg.attach(MIMEText(body, 'plain'))
 
@@ -61,38 +68,97 @@ def handle_send_email():
         part.add_header('Content-Disposition', f"attachment; filename=\"{pdf_filename}\"")
         msg.attach(part)
 
-        print(f"EMAIL_SENDER_API (HF): Connecting to SMTP server {SMTP_SERVER_HOST}:{SMTP_PORT_INT}")
-        with smtplib.SMTP(SMTP_SERVER_HOST, SMTP_PORT_INT) as server:
+        print(f"EMAIL_SENDER_API (HF) [{request_id}]: Preparing to connect to SMTP server {SMTP_SERVER_HOST}:{SMTP_PORT_INT} with timeout {SMTP_CONNECTION_TIMEOUT}s")
+        
+        # Using timeout for the SMTP connection itself
+        # For commands, smtplib uses the same timeout by default or it can be passed to sendmail
+        server = None # Initialize server to None for finally block
+        try:
+            if SMTP_PORT_INT == 465: # SSL
+                print(f"EMAIL_SENDER_API (HF) [{request_id}]: Using SMTP_SSL for port 465.")
+                server = smtplib.SMTP_SSL(SMTP_SERVER_HOST, SMTP_PORT_INT, timeout=SMTP_CONNECTION_TIMEOUT)
+            else: # Standard port, try STARTTLS (e.g., for 587)
+                print(f"EMAIL_SENDER_API (HF) [{request_id}]: Using standard SMTP for port {SMTP_PORT_INT}.")
+                server = smtplib.SMTP(SMTP_SERVER_HOST, SMTP_PORT_INT, timeout=SMTP_CONNECTION_TIMEOUT)
+            
             server.set_debuglevel(1) 
-            server.ehlo()
-            if SMTP_PORT_INT == 587:
-                print("EMAIL_SENDER_API (HF): Starting TLS...")
+            print(f"EMAIL_SENDER_API (HF) [{request_id}]: Connected. Sending EHLO/HELO...")
+            server.ehlo() # Or server.helo() if ehlo fails
+
+            if SMTP_PORT_INT == 587: # Attempt STARTTLS if on port 587
+                print(f"EMAIL_SENDER_API (HF) [{request_id}]: Port is 587, attempting STARTTLS...")
                 server.starttls()
+                print(f"EMAIL_SENDER_API (HF) [{request_id}]: STARTTLS successful. Re-sending EHLO...")
                 server.ehlo()
-            print("EMAIL_SENDER_API (HF): Logging in...")
+            
+            print(f"EMAIL_SENDER_API (HF) [{request_id}]: Attempting login with user: {SMTP_SENDER_EMAIL}...")
             server.login(SMTP_SENDER_EMAIL, SMTP_SENDER_PASSWORD)
-            print("EMAIL_SENDER_API (HF): Sending mail...")
+            print(f"EMAIL_SENDER_API (HF) [{request_id}]: Login successful. Sending mail to {recipient_email}...")
+            # The sendmail command will also use the timeout set on the SMTP object.
             server.sendmail(SMTP_SENDER_EMAIL, recipient_email, msg.as_string())
-            print("EMAIL_SENDER_API (HF): Mail sent.")
+            print(f"EMAIL_SENDER_API (HF) [{request_id}]: Mail sent successfully.")
         
+        finally:
+            if server:
+                try:
+                    print(f"EMAIL_SENDER_API (HF) [{request_id}]: Quitting SMTP server connection.")
+                    server.quit()
+                except Exception as e_quit:
+                    print(f"EMAIL_SENDER_API (HF) [{request_id}]: Error during server.quit(): {e_quit}")
+
         success_msg = f"Report successfully sent to {recipient_email}."
-        print(f"EMAIL_SENDER_API (HF): {success_msg}")
+        print(f"EMAIL_SENDER_API (HF) [{request_id}]: {success_msg}")
         return jsonify({"status": "success", "message": success_msg}), 200
 
+    except smtplib.SMTPConnectError as e:
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: SMTP Connect Error - Could not connect to {SMTP_SERVER_HOST}:{SMTP_PORT_INT}. {e}"
+        print(error_msg); traceback.print_exc()
+        return jsonify({"status": "error", "message": f"Could not connect to email server: {e.strerror if hasattr(e, 'strerror') else e}"}), 503 # Service Unavailable
+    except smtplib.SMTPHeloError as e:
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: SMTP Helo/Ehlo Error - Server did not reply properly. {e}"
+        print(error_msg); traceback.print_exc()
+        return jsonify({"status": "error", "message": "Email server did not respond correctly (HELO/EHLO)."}), 502 # Bad Gateway
     except smtplib.SMTPAuthenticationError as e:
-        error_msg = f"EMAIL_SENDER_API (HF): SMTP Authentication Error - {e}"
-        print(error_msg)
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: SMTP Authentication Error - Check username/password (App Password). {e}"
+        print(error_msg); traceback.print_exc()
         return jsonify({"status": "error", "message": "Email server authentication failed on the API."}), 500
-    except Exception as e:
-        import traceback
-        error_msg = f"EMAIL_SENDER_API (HF): Error sending email to {recipient_email} - {e}"
+    except smtplib.SMTPSenderRefused as e:
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: SMTP Sender Refused - Server didn't accept from address '{SMTP_SENDER_EMAIL}'. {e}"
+        print(error_msg); traceback.print_exc()
+        return jsonify({"status": "error", "message": "Sender email address refused by server."}), 500
+    except smtplib.SMTPRecipientsRefused as e:
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: SMTP Recipients Refused - Server didn't accept to address(es). {e.recipients}" # e.recipients is a dict
+        print(error_msg); traceback.print_exc()
+        return jsonify({"status": "error", "message": f"Recipient email address(es) refused by server."}), 400 # Bad request if recipient is bad
+    except smtplib.SMTPDataError as e:
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: SMTP Data Error - Server replied with an unexpected error code to the DATA command. {e}"
+        print(error_msg); traceback.print_exc()
+        return jsonify({"status": "error", "message": "Error sending email content/data."}), 500
+    except smtplib.SMTPServerDisconnected as e:
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: SMTP Server Disconnected - {e}"
+        print(error_msg); traceback.print_exc()
+        return jsonify({"status": "error", "message": "Email server disconnected unexpectedly."}), 503
+    except socket.timeout as e:
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: Socket Timeout during SMTP operation. {e}"
+        print(error_msg); traceback.print_exc()
+        return jsonify({"status": "error", "message": "Connection to email server timed out."}), 504 # Gateway Timeout
+    except socket.gaierror as e: # getaddrinfo error (DNS lookup failure)
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: Address-related error connecting to SMTP host '{SMTP_SERVER_HOST}'. Check hostname. {e}"
+        print(error_msg); traceback.print_exc()
+        return jsonify({"status": "error", "message": "Could not resolve email server hostname."}), 503
+    except Exception as e: # Catch-all for other unexpected errors
+        error_msg = f"EMAIL_SENDER_API (HF) [{request_id}]: An unexpected error occurred while sending email to {recipient_email} - {e}"
         print(error_msg)
-        print(traceback.format_exc())
-        return jsonify({"status": "error", "message": f"Failed to send email via API: {e}"}), 500
+        traceback.print_exc() # Print full traceback for unexpected errors
+        return jsonify({"status": "error", "message": f"An unexpected error occurred on the email API: {type(e).__name__}"}), 500
 
-# This __main__ block is mostly for local testing.
+# This block is mostly for local testing.
 # On Hugging Face Spaces with Gunicorn, Gunicorn directly imports and runs the 'app' object.
 # if __name__ == '__main__':
-#     port = int(os.environ.get("PORT", 7860)) # Default port for HF Spaces if not overridden
-#     print(f"Starting Email Sender API Service on port {port} locally...")
-#     app.run(host='0.0.0.0', port=port, debug=True)
+#     # For local testing, you would set your ENV VARS in this terminal session before running
+#     api_port = int(os.environ.get("PORT", 5002)) # Example local port, HF uses PORT from Dockerfile ENV
+#     print(f"Starting Email Sender API Service locally on port {api_port}...")
+#     print(f"Local SMTP Config: Server={SMTP_SERVER_HOST}, Port={SMTP_SERVER_PORT}, User Email Set={SMTP_SENDER_EMAIL is not None}, Password Set={SMTP_SENDER_PASSWORD is not None}")
+#     if not all([SMTP_SERVER_HOST, SMTP_SERVER_PORT, SMTP_SENDER_EMAIL, SMTP_SENDER_PASSWORD]):
+#         print("WARNING: LOCAL - SMTP environment variables are not fully set. Email sending will likely fail if requests are made.")
+#     app.run(host='0.0.0.0', port=api_port, debug=True)