Update app.py

app.py

@@ -11,21 +11,19 @@ import uvicorn
 # =======================
 # Configuration Settings
 # =======================
-
-# SMTP server settings for our own SMTP server (listening on a custom port)
-SMTP_SERVER_HOST = "localhost"        # Hostname for our SMTP server
-SMTP_SERVER_PORT = 1025               # Port for our SMTP server
+# 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"  # SMTP username (if required by your server)
-SMTP_PASSWORD = "password"           # SMTP password (if required by your 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"
 
 # =======================
 # Logging Configuration
 # =======================
-
 logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(levelname)s - %(message)s")
 logger = logging.getLogger("bot_brain")
 
@@ -38,7 +36,6 @@ conversations = {}
 # =======================
 # Helper Functions
 # =======================
-
 # Regex for validating email addresses
 EMAIL_REGEX = re.compile(r"^[^@]+@[^@]+\.[^@]+$")
 
@@ -49,7 +46,7 @@ def validate_email(email: str) -> bool:
 def send_email(from_addr: str, to_addr: str, subject: str, body: str) -> bool:
     """
     Sends an email using the SMTP client.
-    Connects to our own SMTP server (CLIENT_SMTP_HOST on SMTP_PORT).
+    For local testing with our own SMTP server (plain text, no TLS), we remove starttls and login.
     """
     msg = MIMEText(body)
     msg['Subject'] = subject
@@ -59,9 +56,9 @@ def send_email(from_addr: str, to_addr: str, subject: str, body: str) -> bool:
     logger.debug(f"Preparing to send email from {from_addr} to {to_addr} with subject '{subject}'")
 
     try:
+        # Connect to the local SMTP server (plain text)
         with smtplib.SMTP(CLIENT_SMTP_HOST, SMTP_PORT) as server:
-            server.starttls()  # Upgrade connection to TLS
-            server.login(SMTP_USER, SMTP_PASSWORD)
+            # 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
@@ -72,7 +69,6 @@ def send_email(from_addr: str, to_addr: str, subject: str, body: str) -> bool:
 # =======================
 # Pydantic Models
 # =======================
-
 class Text(BaseModel):
     body: str
 
@@ -86,12 +82,10 @@ class BotRequest(BaseModel):
 # =======================
 # FastAPI Application
 # =======================
-
 app = FastAPI()
 
 @app.post("/bot")
 async def bot_endpoint(request_data: BotRequest):
-    # Convert payload to dictionary using aliases
     payload = request_data.dict(by_alias=True)
     logger.debug("Received request payload: %s", payload)
 
@@ -150,7 +144,6 @@ async def bot_endpoint(request_data: BotRequest):
 # =======================
 # SMTP Server (using aiosmtpd)
 # =======================
-
 def start_smtp_server():
     """
     Start our own SMTP server using aiosmtpd.
@@ -165,10 +158,9 @@ def start_smtp_server():
 # =======================
 # Main Execution
 # =======================
-
 if __name__ == "__main__":
     # Start the SMTP server
     smtp_controller = start_smtp_server()
 
-    # Run the FastAPI app with Uvicorn
+    # Run the FastAPI app using Uvicorn
     uvicorn.run("main:app", host="0.0.0.0", port=5000, reload=True)