Update app.py

app.py

@@ -7,6 +7,11 @@ from apscheduler.schedulers.asyncio import AsyncIOScheduler
 import sqlite3
 import os
 import logging
+from tenacity import retry, stop_after_attempt, wait_fixed, retry_if_exception_type
+from dotenv import load_dotenv
+
+# Load environment variables from .env file (for local development)
+load_dotenv()
 
 # Set up logging
 logging.basicConfig(level=logging.DEBUG)
@@ -45,7 +50,7 @@ def init_db():
 # Run database initialization on startup
 init_db()
 
-# Salesforce connection (using Space Secrets)
+# Salesforce connection (using environment variables)
 def get_salesforce_connection():
     try:
         username = os.getenv("SFDC_USERNAME")
@@ -53,9 +58,6 @@ def get_salesforce_connection():
         security_token = os.getenv("SFDC_SECURITY_TOKEN")
         domain = os.getenv("SFDC_DOMAIN", "login")
 
-        logger.debug(f"SFDC_USERNAME: {username}")
-        logger.debug(f"SFDC_SECURITY_TOKEN: {security_token}")
-
         if not username or not password or not security_token:
             logger.error("Missing Salesforce credentials.")
             return None
@@ -72,7 +74,13 @@ def get_salesforce_connection():
         logger.error(f"Error connecting to Salesforce: {e}")
         return None
 
-# Sync function
+# Sync function with retry logic
+@retry(
+    stop=stop_after_attempt(3),
+    wait=wait_fixed(2),
+    retry=retry_if_exception_type(Exception),
+    before_sleep=lambda retry_state: logger.debug(f"Retrying Salesforce sync, attempt {retry_state.attempt_number}")
+)
 async def sync_to_salesforce():
     try:
         sf = get_salesforce_connection()
@@ -100,7 +108,7 @@ async def sync_to_salesforce():
         conn.close()
     except Exception as e:
         logger.error(f"Error syncing to Salesforce: {str(e)}")
-        raise  # Raise the exception to see the error in the response
+        raise
 
 # Set up scheduler
 scheduler = AsyncIOScheduler()
@@ -133,16 +141,27 @@ async def submit_case(request: Request):
         data = await request.json()
         logger.debug(f"Received form data: {data}")
 
-        # Extract form data with default values
-        name = data.get("name", "")
-        mobile_number = data.get("mobileNumber", "")
-        email = data.get("email", "")
-        issue_description = data.get("issueDescription", "")
-
-        # Validate required fields
-        if not name or not email or not issue_description:
-            logger.error("Missing required fields in form data.")
-            raise HTTPException(status_code=400, detail="Missing required fields")
+        # Extract form data with default values and strip whitespace
+        name = data.get("name", "").strip()
+        mobile_number = data.get("mobileNumber", "").strip()
+        email = data.get("email", "").strip()
+        issue_description = data.get("issueDescription", "").strip()
+
+        # Validate required fields with specific error messages
+        if not name:
+            logger.error("Missing 'name' field in form data.")
+            raise HTTPException(status_code=400, detail="Name is required")
+        if not email:
+            logger.error("Missing 'email' field in form data.")
+            raise HTTPException(status_code=400, detail="Email is required")
+        if not issue_description:
+            logger.error("Missing 'issueDescription' field in form data.")
+            raise HTTPException(status_code=400, detail="Issue description is required")
+
+        # Basic email validation
+        if "@" not in email or "." not in email:
+            logger.error("Invalid email format.")
+            raise HTTPException(status_code=400, detail="Invalid email format")
 
         # Store in SQLite
         conn = sqlite3.connect("cases.db")
@@ -158,7 +177,7 @@ async def submit_case(request: Request):
         conn.close()
         logger.debug("Data successfully stored in SQLite.")
 
-        # Immediately trigger sync for testing
+        # Immediately trigger sync
         await sync_to_salesforce()
 
         return {"success": True}