Update app.py

app.py

@@ -1,31 +1,21 @@
 import logging
-import smtplib
 import re
-from email.mime.text import MIMEText
+import requests
 from fastapi import FastAPI
 from pydantic import BaseModel, Field
-from aiosmtpd.controller import Controller
-from aiosmtpd.handlers import Sink
 import uvicorn
 
 # =======================
 # Configuration Settings
 # =======================
-# SMTP server settings for our own SMTP server (running locally)
-SMTP_SERVER_HOST = "localhost"       # Hostname for our SMTP server
-SMTP_SERVER_PORT = 1025              # Port for our SMTP server (local testing port)
-
-# SMTP client settings (used by the bot to send emails via our SMTP server)
-CLIENT_SMTP_HOST = "localhost"       # Must match SMTP_SERVER_HOST for local testing
-SMTP_PORT = 1025                    # Must match SMTP_SERVER_PORT
-SMTP_USER = "noreply@yourdomain.com" # For local testing with a simple SMTP server, these values are not used
-SMTP_PASSWORD = "password"
+# URL of the SMTP API endpoint (hosted on Vercel)
+SMTP_API_URL = "https://your-smtp-endpoint.vercel.app/api/send-email"  # <--- change this to your deployed Vercel endpoint
 
 # =======================
 # Logging Configuration
 # =======================
 logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(levelname)s - %(message)s")
-logger = logging.getLogger("bot_brain")
+logger = logging.getLogger("bot_server")
 
 # =======================
 # Global Conversation State
@@ -40,34 +30,31 @@ conversations = {}
 EMAIL_REGEX = re.compile(r"^[^@]+@[^@]+\.[^@]+$")
 
 def validate_email(email: str) -> bool:
-    """Validate an email address using regex."""
     return re.match(EMAIL_REGEX, email) is not None
 
-def send_email(from_addr: str, to_addr: str, subject: str, body: str) -> bool:
+def send_email_via_api(from_addr: str, to_addr: str, subject: str, body: str) -> bool:
     """
-    Sends an email using the SMTP client.
-    For local testing with our own SMTP server (plain text, no TLS), we remove starttls and login.
+    Calls the external SMTP API endpoint to send an email.
     """
-    msg = MIMEText(body)
-    msg['Subject'] = subject
-    msg['From'] = from_addr
-    msg['To'] = to_addr
-
-    logger.debug(f"Preparing to send email from {from_addr} to {to_addr} with subject '{subject}'")
-
+    payload = {
+        "from": from_addr,
+        "to": to_addr,
+        "subject": subject,
+        "body": body,
+    }
+    logger.debug("Calling SMTP API with payload: %s", payload)
     try:
-        # Connect to the local SMTP server (plain text)
-        with smtplib.SMTP(CLIENT_SMTP_HOST, SMTP_PORT) as server:
-            # For a plain SMTP server running locally (e.g. aiosmtpd Sink), do not call starttls() or login()
-            server.sendmail(from_addr, [to_addr], msg.as_string())
-        logger.info(f"Email sent successfully from {from_addr} to {to_addr}")
-        return True
+        response = requests.post(SMTP_API_URL, json=payload, timeout=10)
+        response.raise_for_status()
+        result = response.json()
+        logger.info("SMTP API response: %s", result)
+        return result.get("success", False)
     except Exception as e:
-        logger.error(f"Error sending email: {e}")
+        logger.error("Error calling SMTP API: %s", e)
         return False
 
 # =======================
-# Pydantic Models
+# Pydantic Models for Bot Requests
 # =======================
 class Text(BaseModel):
     body: str
@@ -80,7 +67,7 @@ class BotRequest(BaseModel):
     message: Message
 
 # =======================
-# FastAPI Application
+# FastAPI Bot Application
 # =======================
 app = FastAPI()
 
@@ -88,15 +75,14 @@ app = FastAPI()
 async def bot_endpoint(request_data: BotRequest):
     payload = request_data.dict(by_alias=True)
     logger.debug("Received request payload: %s", payload)
-
+    
     sender_number = request_data.from_
     message_body = request_data.message.text.body.strip()
     logger.info("Processing message from %s: '%s'", sender_number, message_body)
-
+    
     state = conversations.get(sender_number, {})
-
+    
     if not state:
-        # Start a new conversation
         conversations[sender_number] = {"step": "from"}
         response_msg = "Welcome to SMTP Assistant! Please provide your 'From' email address."
     else:
@@ -127,40 +113,18 @@ async def bot_endpoint(request_data: BotRequest):
             subject = state.get("subject")
             body = state.get("body")
             logger.info("Attempting to send email from %s to %s with subject '%s'", from_addr, to_addr, subject)
-            if send_email(from_addr, to_addr, subject, body):
+            if send_email_via_api(from_addr, to_addr, subject, body):
                 response_msg = f"Email sent successfully from {from_addr} to {to_addr}."
             else:
                 response_msg = "Failed to send email. Please try again later."
-            # Clear conversation state after sending
             del conversations[sender_number]
             logger.info("Cleared conversation state for %s", sender_number)
         else:
             response_msg = "Unrecognized step. Let's start over. Please provide your 'From' email address."
             conversations[sender_number] = {"step": "from"}
-
+    
     logger.debug("Response message to %s: %s", sender_number, response_msg)
     return {"status": "success", "message": response_msg}
 
-# =======================
-# SMTP Server (using aiosmtpd)
-# =======================
-def start_smtp_server():
-    """
-    Start our own SMTP server using aiosmtpd.
-    For simplicity, we use the Sink handler which accepts and prints all emails.
-    """
-    handler = Sink()
-    controller = Controller(handler, hostname=SMTP_SERVER_HOST, port=SMTP_SERVER_PORT)
-    controller.start()
-    logger.info(f"SMTP server started at {SMTP_SERVER_HOST}:{SMTP_SERVER_PORT}")
-    return controller
-
-# =======================
-# Main Execution
-# =======================
 if __name__ == "__main__":
-    # Start the SMTP server
-    smtp_controller = start_smtp_server()
-
-    # Run the FastAPI app using Uvicorn
-    uvicorn.run("main:app", host="0.0.0.0", port=5000, reload=True)
+    uvicorn.run("bot_server:app", host="0.0.0.0", port=5000, reload=True)