Update app.py

app.py

@@ -696,46 +696,92 @@ class DatabaseService:
         else:
             return "Miscellaneous"
 
-# Real Twilio WhatsApp Service (unchanged)
+# Fixed Twilio WhatsApp Service
 class TwilioWhatsAppService:
     def __init__(self):
-        self.account_sid = os.getenv('TWILIO_ACCOUNT_SID')
-        self.auth_token = os.getenv('TWILIO_AUTH_TOKEN') 
+        # Set your Twilio credentials here
+        self.account_sid = os.getenv('TWILIO_ACCOUNT_SID', 'your_account_sid_here')
+        self.auth_token = os.getenv('TWILIO_AUTH_TOKEN', 'your_auth_token_here')
+        
+        # For Twilio Sandbox - use this number
         self.whatsapp_number = 'whatsapp:+14155238886'
         
-        if self.account_sid and self.auth_token and TWILIO_AVAILABLE:
+        # For production Twilio (after approval) - use your approved number
+        # self.whatsapp_number = 'whatsapp:+1234567890'  # Your approved WhatsApp Business number
+        
+        print(f"🔧 Twilio Configuration:")
+        print(f"   Account SID: {self.account_sid[:10]}... (masked)")
+        print(f"   Auth Token: {'*' * len(self.auth_token) if self.auth_token != 'your_auth_token_here' else 'Not set'}")
+        print(f"   WhatsApp Number: {self.whatsapp_number}")
+        
+        if self.account_sid != 'your_account_sid_here' and self.auth_token != 'your_auth_token_here' and TWILIO_AVAILABLE:
             try:
                 self.client = Client(self.account_sid, self.auth_token)
-                print("✅ Twilio WhatsApp Service initialized successfully")
+                
+                # Test the connection by getting account info
+                account = self.client.api.accounts(self.account_sid).fetch()
+                print(f"✅ Twilio WhatsApp Service initialized successfully")
+                print(f"   Account Status: {account.status}")
+                print(f"   Account Name: {account.friendly_name}")
                 self.enabled = True
+                
             except Exception as e:
                 print(f"❌ Failed to initialize Twilio: {e}")
+                print(f"   Please check your Account SID and Auth Token")
                 self.client = None
                 self.enabled = False
         else:
-            print("❌ Twilio credentials not found or Twilio not installed")
+            print("❌ Twilio credentials not configured or Twilio not installed")
+            print("   Please set TWILIO_ACCOUNT_SID and TWILIO_AUTH_TOKEN environment variables")
+            print("   Or modify the credentials directly in the code")
             self.client = None
             self.enabled = False
     
     def send_whatsapp(self, phone, message):
+        """Send WhatsApp message with proper error handling"""
         if not self.enabled or not self.client:
             print(f"📱 [DEMO MODE] WhatsApp to {phone}: {message}")
             return False
         
         try:
+            # Ensure phone number has correct format
+            if not phone.startswith('+'):
+                phone = '+' + phone
+            
             to_whatsapp = f"whatsapp:{phone}"
+            
+            print(f"📤 Attempting to send WhatsApp message:")
+            print(f"   From: {self.whatsapp_number}")
+            print(f"   To: {to_whatsapp}")
+            print(f"   Message: {message[:50]}...")
+            
             twilio_message = self.client.messages.create(
                 body=message,
                 from_=self.whatsapp_number,
                 to=to_whatsapp
             )
             
-            print(f"✅ WhatsApp sent to {phone}: {twilio_message.sid}")
+            print(f"✅ WhatsApp sent successfully!")
+            print(f"   Message SID: {twilio_message.sid}")
+            print(f"   Status: {twilio_message.status}")
             return True
             
         except Exception as e:
-            print(f"❌ Failed to send WhatsApp to {phone}: {e}")
-            print(f"📱 [FALLBACK] Message was: {message}")
+            print(f"❌ Failed to send WhatsApp to {phone}")
+            print(f"   Error: {str(e)}")
+            print(f"   Error Type: {type(e).__name__}")
+            
+            # Common error messages and solutions
+            if "not a valid phone number" in str(e).lower():
+                print(f"   💡 Solution: Check phone number format. Should be +country_code + number")
+            elif "unverified" in str(e).lower():
+                print(f"   💡 Solution: For Twilio Sandbox, recipient must send 'join catch-manner' to +14155238886 first")
+            elif "forbidden" in str(e).lower():
+                print(f"   💡 Solution: Check your Twilio credentials and account status")
+            elif "unauthorized" in str(e).lower():
+                print(f"   💡 Solution: Verify your Account SID and Auth Token are correct")
+            
+            print(f"📱 [FALLBACK] Message content: {message}")
             return False
 
 # Initialize services
@@ -745,7 +791,7 @@ ocr_service = OCRService()
 
 # Helper functions (unchanged)
 def validate_phone_number(phone):
-    pattern = r'^\+\d{1,3}\d{6,14}$'
+    pattern = r'^\+\d{1,3}\d{6,14}
     return re.match(pattern, phone) is not None
 
 def validate_password(password):
@@ -1119,9 +1165,12 @@ def register_user(name, phone, password, confirm_password):
         return "⚠️ This number is already registered"
     
     msg = f"🏦 Welcome to FinGenius Pro, {name}! Your account has been created successfully. You can now track expenses, manage budgets, and receive instant financial alerts. Start by adding your first balance! 💰"
-    twilio.send_whatsapp(phone, msg)
+    whatsapp_sent = twilio.send_whatsapp(phone, msg)
     
-    return "✅ Registration complete! Check WhatsApp for confirmation and sign in to continue."
+    if whatsapp_sent:
+        return "✅ Registration complete! Check WhatsApp for confirmation and sign in to continue."
+    else:
+        return "✅ Registration complete! WhatsApp alerts are not configured, but you can still use all features. Sign in to continue."
 
 def add_balance(phone, amount_val, description=""):
     if not phone:
@@ -2169,6 +2218,24 @@ with gr.Blocks(title="FinGenius Pro", theme=gr.themes.Soft(), css=custom_css) as
     )
 
 if __name__ == "__main__":
+    print("🚀 Starting FinGenius Pro...")
+    print("📱 WhatsApp Integration Status:")
+    print(f"   Twilio Available: {TWILIO_AVAILABLE}")
+    print(f"   Service Enabled: {twilio.enabled}")
+    print("🔍 OCR Services Status:")
+    print(f"   Tesseract Available: {TESSERACT_AVAILABLE}")
+    print(f"   Google Vision Available: {VISION_API_AVAILABLE}")
+    print("🖼️ Image Processing Status:")
+    print(f"   PIL/OpenCV Available: {PIL_AVAILABLE}")
+    print("")
+    print("📋 Setup Instructions:")
+    if not twilio.enabled:
+        print("   1. Set TWILIO_ACCOUNT_SID and TWILIO_AUTH_TOKEN environment variables")
+        print("   2. Or modify credentials directly in TwilioWhatsAppService class")
+    print("   3. Users must send 'join catch-manner' to +14155238886 to activate WhatsApp")
+    print("   4. Use the same phone number for both WhatsApp activation and app registration")
+    print("")
+    
     demo.launch(
         server_name="0.0.0.0", 
         server_port=7860,