Update utils.py

utils.py

@@ -1,12 +1,11 @@
 import re
 import os
 import streamlit as st
-import requests
 from transformers import pipeline
 from typing import Dict, Optional
 from together import Together
 from gtts import gTTS
-from py_mailsender import Mailsender
+from python_mail_sender import MailSender  # Updated import for python-mail-sender
 
 
 # Image-to-text
@@ -61,56 +60,40 @@ def txt2speech(text: str) -> None:
 
 # Get user preferences for the story
 def get_user_preferences() -> Dict[str, str]:
-    preferences = {}
-
-    preferences['continent'] = st.selectbox("Continent", ["North America", "Europe", "Asia", "Africa", "Australia"])
-    preferences['genre'] = st.selectbox("Genre", ["Science Fiction", "Fantasy", "Mystery", "Romance"])
-    preferences['setting'] = st.selectbox("Setting", ["Future", "Medieval times", "Modern day", "Alternate reality"])
-    preferences['plot'] = st.selectbox("Plot", ["Hero's journey", "Solving a mystery", "Love story", "Survival"])
-    preferences['tone'] = st.selectbox("Tone", ["Serious", "Light-hearted", "Humorous", "Dark"])
-    preferences['theme'] = st.selectbox("Theme", ["Self-discovery", "Redemption", "Love", "Justice"])
-    preferences['conflict'] = st.selectbox("Conflict Type", ["Person vs. Society", "Internal struggle", "Person vs. Nature", "Person vs. Person"])
-    preferences['twist'] = st.selectbox("Mystery/Twist", ["Plot twist", "Hidden identity", "Unexpected ally/enemy", "Time paradox"])
-    preferences['ending'] = st.selectbox("Ending", ["Happy", "Bittersweet", "Open-ended", "Tragic"])
-    
+    preferences = {
+        'continent': st.selectbox("Continent", ["North America", "Europe", "Asia", "Africa", "Australia"]),
+        'genre': st.selectbox("Genre", ["Science Fiction", "Fantasy", "Mystery", "Romance"]),
+        'setting': st.selectbox("Setting", ["Future", "Medieval times", "Modern day", "Alternate reality"]),
+        'plot': st.selectbox("Plot", ["Hero's journey", "Solving a mystery", "Love story", "Survival"]),
+        'tone': st.selectbox("Tone", ["Serious", "Light-hearted", "Humorous", "Dark"]),
+        'theme': st.selectbox("Theme", ["Self-discovery", "Redemption", "Love", "Justice"]),
+        'conflict': st.selectbox("Conflict Type", ["Person vs. Society", "Internal struggle", "Person vs. Nature", "Person vs. Person"]),
+        'twist': st.selectbox("Mystery/Twist", ["Plot twist", "Hidden identity", "Unexpected ally/enemy", "Time paradox"]),
+        'ending': st.selectbox("Ending", ["Happy", "Bittersweet", "Open-ended", "Tragic"])
+    }
     return preferences
 
 
 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 using py-mailsender
+    Send the story text and audio file to the specified email address using python-mail-sender
     Returns True if successful, False otherwise
     """
     try:
-        # Get email credentials from environment variables
-        sender_email = os.getenv('SENDER_EMAIL')
-        sender_password = os.getenv('SENDER_PASSWORD')
+        # Initialize the MailSender with env variables
+        mail_sender = MailSender()
         
-        if not sender_email or not sender_password:
-            raise ValueError("Email credentials not configured")
-            
-        # Create email subject and content
+        # Email configuration
         subject = "Your Generated Story"
-        content = f"""Here's your generated story:
-
-{story_text}
-
-Enjoy!"""
-        
-        # Initialize mail sender
-        mailer = Mailsender(
-            sender_email,
-            sender_password,
-            recipient_email,
-            subject,
-            content
-        )
-        
-        # Add audio file attachment
-        mailer.add_attachment(audio_file_path)
+        content = f"Here's your generated story:\n\n{story_text}\n\nEnjoy!"
         
         # Send email
-        mailer.send()
+        mail_sender.send_mail(
+            receiver_address=recipient_email,
+            subject=subject,
+            email_content=content,
+            attached_files=[audio_file_path]
+        )
         return True
         
     except Exception as e:
@@ -122,24 +105,4 @@ def validate_email(email: str) -> bool:
     Basic email validation
     """
     pattern = r'^[\w\.-]+@[\w\.-]+\.\w+$'
-    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)
+    return re.match(pattern, email) is not None