Update app.py

app.py

@@ -4,32 +4,41 @@ import re
 from email.mime.text import MIMEText
 from fastapi import FastAPI
 from pydantic import BaseModel, Field
-from dotenv import load_dotenv
-import os
 from aiosmtpd.controller import Controller
 from aiosmtpd.handlers import Sink
 import uvicorn
 
-# Load environment variables
-load_dotenv()
+# =======================
+# Configuration Settings
+# =======================
 
-# Configure logging
-logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(levelname)s - %(message)s")
-logger = logging.getLogger("bot_brain")
+# 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 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)
 
-# SMTP server configuration for our own SMTP server
-SMTP_SERVER_HOST = os.getenv("SMTP_SERVER_HOST", "localhost")
-SMTP_SERVER_PORT = int(os.getenv("SMTP_SERVER_PORT", "1025"))
+# =======================
+# Logging Configuration
+# =======================
 
-# Configuration for the SMTP client (sending emails via our own SMTP server)
-CLIENT_SMTP_HOST = os.getenv("CLIENT_SMTP_HOST", SMTP_SERVER_HOST)
-SMTP_PORT = int(os.getenv("SMTP_PORT", SMTP_SERVER_PORT))
-SMTP_USER = os.getenv("SMTP_USER", "noreply@yourdomain.com")
-SMTP_PASSWORD = os.getenv("SMTP_PASSWORD", "password")
+logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(levelname)s - %(message)s")
+logger = logging.getLogger("bot_brain")
 
-# Global conversation state: maps sender's WhatsApp number to conversation data.
+# =======================
+# Global Conversation State
+# =======================
+# Maps sender's WhatsApp number to conversation data.
 conversations = {}
 
+# =======================
+# Helper Functions
+# =======================
+
 # Regex for validating email addresses
 EMAIL_REGEX = re.compile(r"^[^@]+@[^@]+\.[^@]+$")
 
@@ -40,6 +49,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).
     """
     msg = MIMEText(body)
     msg['Subject'] = subject
@@ -50,7 +60,7 @@ def send_email(from_addr: str, to_addr: str, subject: str, body: str) -> bool:
 
     try:
         with smtplib.SMTP(CLIENT_SMTP_HOST, SMTP_PORT) as server:
-            server.starttls()  # Upgrade to TLS
+            server.starttls()  # Upgrade connection to TLS
             server.login(SMTP_USER, SMTP_PASSWORD)
             server.sendmail(from_addr, [to_addr], msg.as_string())
         logger.info(f"Email sent successfully from {from_addr} to {to_addr}")
@@ -59,7 +69,10 @@ def send_email(from_addr: str, to_addr: str, subject: str, body: str) -> bool:
         logger.error(f"Error sending email: {e}")
         return False
 
-# Pydantic models for request validation
+# =======================
+# Pydantic Models
+# =======================
+
 class Text(BaseModel):
     body: str
 
@@ -70,11 +83,15 @@ class BotRequest(BaseModel):
     from_: str = Field(..., alias="from")
     message: Message
 
-# Create FastAPI app
+# =======================
+# 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)
 
@@ -85,6 +102,7 @@ async def bot_endpoint(request_data: BotRequest):
     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:
@@ -129,6 +147,10 @@ async def bot_endpoint(request_data: BotRequest):
     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.
@@ -140,9 +162,13 @@ def start_smtp_server():
     logger.info(f"SMTP server started at {SMTP_SERVER_HOST}:{SMTP_SERVER_PORT}")
     return controller
 
+# =======================
+# Main Execution
+# =======================
+
 if __name__ == "__main__":
-    # Start the SMTP server (our own SMTP server)
+    # Start the SMTP server
     smtp_controller = start_smtp_server()
 
-    # Run the FastAPI app using Uvicorn
+    # Run the FastAPI app with Uvicorn
     uvicorn.run("main:app", host="0.0.0.0", port=5000, reload=True)