Update utils.py

utils.py

@@ -3,10 +3,10 @@ import os
 import streamlit as st
 import requests
 from transformers import pipeline
-from typing import Dict
+from typing import Dict, Optional
 from together import Together
 from gtts import gTTS
-from gmail_smtplib_micro import GmailSMTPLib, Email
+from py_mailsender import Mailsender
 
 
 # Image-to-text
@@ -76,47 +76,43 @@ def get_user_preferences() -> Dict[str, str]:
     return preferences
 
 
-def create_gmail_config():
-    """
-    Creates a Gmail configuration file if it doesn't exist
-    """
-    config_content = f"""[GMail]
-username = {os.getenv('SENDER_EMAIL', '')}
-password = {os.getenv('SENDER_PASSWORD', '')}
-"""
-    with open('pysnail.conf', 'w') as f:
-        f.write(config_content)
-
 def send_story_email(recipient_email: str, story_text: str, audio_file_path: str) -> bool:
     """
-    Send the story text and audio file to the specified email address
+    Send the story text and audio file to the specified email address using py-mailsender
     Returns True if successful, False otherwise
     """
     try:
-        # Create email content
+        # Get email credentials from environment variables
+        sender_email = os.getenv('SENDER_EMAIL')
+        sender_password = os.getenv('SENDER_PASSWORD')
+        
+        if not sender_email or not sender_password:
+            raise ValueError("Email credentials not configured")
+            
+        # Create email subject and content
         subject = "Your Generated Story"
-        body = f"""Here's your generated story:
+        content = f"""Here's your generated story:
 
 {story_text}
 
 Enjoy!"""
         
-        # Create email object
-        email = Email(subject, body)
+        # Initialize mail sender
+        mailer = Mailsender(
+            sender_email,
+            sender_password,
+            recipient_email,
+            subject,
+            content
+        )
         
         # Add audio file attachment
-        email.add_attachment(audio_file_path)
-        
-        # Create Gmail configuration if it doesn't exist
-        if not os.path.exists('pysnail.conf'):
-            create_gmail_config()
-        
-        # Initialize Gmail client and send email
-        gmail = GmailSMTPLib('pysnail.conf')
-        gmail.send_object(email, recipient_email)
+        mailer.add_attachment(audio_file_path)
         
+        # Send email
+        mailer.send()
         return True
-    
+        
     except Exception as e:
         print(f"Error sending email: {str(e)}")
         return False
@@ -126,4 +122,24 @@ def validate_email(email: str) -> bool:
     Basic email validation
     """
     pattern = r'^[\w\.-]+@[\w\.-]+\.\w+$'
-    return re.match(pattern, email) is not None
+    return re.match(pattern, email) is not None
+
+def validate_gmail_credentials(email: str, password: str) -> Optional[str]:
+    """
+    Validate Gmail credentials by attempting to create a test mailer
+    Returns None if successful, error message if failed
+    """
+    try:
+        test_mailer = Mailsender(
+            email,
+            password,
+            email,  # Send to self for testing
+            "Test Connection",
+            "Testing credentials"
+        )
+        # Just initialize the connection without sending
+        test_mailer.initialize_connection()
+        test_mailer.close_connection()
+        return None
+    except Exception as e:
+        return str(e)