Upload 11 files

app.py

@@ -16,7 +16,7 @@ from vendors import VendorManager
 # Page configuration
 st.set_page_config(
     page_title="Wedding Planner",
-    page_icon="👑",
+    page_icon="💒",
     layout="wide",
     initial_sidebar_state="expanded"
 )
@@ -212,108 +212,12 @@ def load_auth_config():
                 config = yaml.load(file, Loader=SafeLoader)
                 return config
         
-        st.error("⚠ No auth config found")
+        st.error("❌ No auth config found")
         return None
     except Exception as e:
         st.error(f"Error loading authentication config: {e}")
         return None
 
-def save_auth_config(auth_config):
-    """Save authentication configuration to Google Drive and local storage"""
-    try:
-        config_manager = st.session_state.config_manager
-        
-        # Convert to YAML string
-        config_yaml = yaml.dump(auth_config, default_flow_style=False, sort_keys=False)
-        
-        # Save to Google Drive if enabled
-        if config_manager.google_drive_enabled:
-            success = config_manager.drive_manager.upload_file('config.yaml', config_yaml)
-            if not success:
-                st.error("Failed to save authentication config to Google Drive")
-                return False
-        
-        # Also save locally as backup
-        try:
-            with open('config.yaml', 'w') as file:
-                yaml.dump(auth_config, file, default_flow_style=False, sort_keys=False)
-        except Exception as e:
-            print(f"Warning: Could not save local config backup: {e}")
-        
-        return True
-    except Exception as e:
-        st.error(f"Error saving authentication config: {e}")
-        return False
-
-def create_wedding_folder_structure(username, wedding_name, partner1, partner2):
-    """Create the folder structure and initial files for a new wedding"""
-    try:
-        config_manager = st.session_state.config_manager
-        
-        if not config_manager.google_drive_enabled:
-            st.error("Google Drive is required for creating new weddings")
-            return False
-        
-        # Create wedding folder name (sanitize it)
-        folder_name = username.lower().replace(' ', '').replace('@', '').replace('.', '')
-        
-        # Create default wedding configuration
-        default_wedding_config = {
-            'wedding_info': {
-                'partner1_name': partner1,
-                'partner2_name': partner2,
-                'wedding_start_date': '',
-                'wedding_end_date': '',
-                'venue_city': ''
-            },
-            'custom_settings': {
-                'custom_tags': [
-                    "Wedding Party", "Urgent", "Rehearsal", "Timeline",
-                    "Maid of Honor", "Best Man", "Bridesmaid", "Groomsman",
-                    "Flower Girl", "Ring Bearer", "Usher", "Reader",
-                    "Venue", "Catering", "Photography", "Videography", "Music/DJ", 
-                    "Flowers", "Decor", "Attire", "Hair & Makeup", "Transportation",
-                    "Invitations", "Cake", "Officiant", "Other",
-                    "Decorations", "Centerpieces", "Favors", "Signage", "Linens", 
-                    "Tableware", "Lighting", "Accessories", "Stationery", "Gifts",
-                    "Vendor", "Item", "Deposit Required", "Final Payment", "Installment",
-                    "Food & Beverage", "Music", "Entertainment", "Lodging"
-                ],
-                'task_assignees': []
-            },
-            'wedding_events': [
-                {"name": "Welcome Dinner", "date_offset": -1, "description": "Welcome dinner for out-of-town guests", "requires_meal_choice": True, "meal_options": ["Duck", "Surf & Turf", "Risotto (vegetarian)", "Stuffed Squash (vegetarian)"], "location": "", "address": ""},
-                {"name": "Church Ceremony", "date_offset": 0, "description": "Main wedding ceremony", "requires_meal_choice": False, "meal_options": [], "location": "", "address": ""},
-                {"name": "Reception", "date_offset": 0, "description": "Wedding reception with dinner", "requires_meal_choice": True, "meal_options": ["Duck", "Surf & Turf", "Risotto (vegetarian)", "Stuffed Squash (vegetarian)"], "location": "", "address": ""},
-                {"name": "Mehndi Afterparty", "date_offset": 1, "description": "Mehndi celebration and afterparty", "requires_meal_choice": False, "meal_options": [], "location": "", "address": ""},
-                {"name": "Indian Ceremony", "date_offset": 1, "description": "Traditional Indian wedding ceremony", "requires_meal_choice": False, "meal_options": [], "location": "", "address": ""},
-                {"name": "Indian Reception", "date_offset": 1, "description": "Indian reception celebration", "requires_meal_choice": True, "meal_options": ["Duck", "Surf & Turf", "Risotto (vegetarian)", "Stuffed Squash (vegetarian)"], "location": "", "address": ""}
-            ]
-        }
-        
-        # Create empty data files
-        empty_data_files = {
-            'guest_list_data.json': [],
-            'rsvp_data.json': {},
-            'tasks.json': [],
-            'vendors.json': [],
-            'wedding_party.json': []
-        }
-        
-        # Upload wedding config to user's folder
-        if not config_manager.drive_manager.upload_file(f'{folder_name}/wedding_config.json', default_wedding_config):
-            return False
-        
-        # Upload empty data files to user's folder
-        for filename, data in empty_data_files.items():
-            if not config_manager.drive_manager.upload_file(f'{folder_name}/{filename}', data):
-                return False
-        
-        return folder_name
-    except Exception as e:
-        st.error(f"Error creating wedding folder structure: {e}")
-        return False
-
 def get_user_folder_from_username(username):
     """Get the user folder based on username using wedding mappings"""
     try:
@@ -381,7 +285,7 @@ def main():
         st.error("Failed to load authentication configuration. Please check your Google Drive setup.")
         st.stop()
     
-    # Create authenticator with updated API for 0.4.2
+    # Create authenticator (auto_hash=True by default, so passwords will be hashed automatically)
     authenticator = stauth.Authenticate(
         st.session_state.auth_config['credentials'],
         st.session_state.auth_config['cookie']['name'],
@@ -389,16 +293,20 @@ def main():
         st.session_state.auth_config['cookie']['expiry_days']
     )
     
+    # Check authentication status
+    if 'authentication_status' not in st.session_state:
+        st.session_state.authentication_status = None
+    
     # Check if user is already authenticated
     if st.session_state.get('authentication_status'):
         # User is authenticated, show main app
         show_main_app(authenticator)
     else:
-        # Show login/signup page and handle authentication
+        # Show login page and handle authentication
         show_login_page(authenticator)
 
 def show_login_page(authenticator):
-    """Show the login page with signup option"""
+    """Show the login page"""
     
     # Hero Section
     st.markdown("""
@@ -411,7 +319,7 @@ def show_login_page(authenticator):
         margin-bottom: 3rem;
         box-shadow: 0 10px 30px rgba(0,0,0,0.2);
     ">
-        <h1 style="font-size: 3.5rem; margin-bottom: 1rem; font-weight: 700;">👑 Wedding Planner</h1>
+        <h1 style="font-size: 3.5rem; margin-bottom: 1rem; font-weight: 700;">💒 Wedding Planner</h1>
         <h2 style="font-size: 1.8rem; margin-bottom: 2rem; font-weight: 300; opacity: 0.9;">
             Your Complete Wedding Planning Solution
         </h2>
@@ -422,7 +330,7 @@ def show_login_page(authenticator):
     </div>
     """, unsafe_allow_html=True)
     
-    # Features Section (existing code remains the same)
+    # Features Section
     st.markdown("## ✨ What You Can Do")
     
     col1, col2, col3 = st.columns(3)
@@ -500,7 +408,7 @@ def show_login_page(authenticator):
             margin-bottom: 2rem;
             box-shadow: 0 4px 6px rgba(0,0,0,0.1);
         ">
-            <h3 style="color: #2d5016; margin-bottom: 1rem;">💐 Wedding Party</h3>
+            <h3 style="color: #2d5016; margin-bottom: 1rem;">👰 Wedding Party</h3>
             <ul style="color: #666; line-height: 1.8;">
                 <li>Manage bridal party</li>
                 <li>Track responsibilities</li>
@@ -552,113 +460,29 @@ def show_login_page(authenticator):
     
     st.markdown("---")
     
-    # Login/Signup Section
-    tab1, tab2 = st.tabs(["🔐 Login", "📝 Create New Wedding"])
+    # Login Section
+    st.markdown("## 🔐 Login to Your Wedding Planner")
     
-    with tab1:
-        st.markdown("## 🔐 Login to Your Wedding Planner")
-        
-        # Login form - Updated for 0.4.2 API
-        try:
-            authenticator.login(location='main')
-        except Exception as e:
-            st.error(f"Login error: {e}")
-        
-        # Check authentication status and show appropriate message
-        if st.session_state.get('authentication_status') is False:
-            st.error("⚠ Invalid username or password")
-        elif st.session_state.get('authentication_status') is None:
-            st.info("🔐 Please enter your username and password")
-        elif st.session_state.get('authentication_status'):
-            st.success(f"✅ Welcome, {st.session_state.get('name', 'User')}!")
-            st.rerun()  # Refresh to show main app
+    # Login form
+    try:
+        authenticator.login(location='main')
+    except Exception as e:
+        st.error(f"Login error: {e}")
     
-    with tab2:
-        st.markdown("## 📝 Create Your Wedding Planner")
-        st.markdown("Sign up to create your personalized wedding planning workspace!")
-        
-        # Signup form using register_user widget - Updated for 0.4.2 API
-        try:
-            email, username, name = authenticator.register_user(
-                location='main',
-                pre_authorized=None,  # Allow anyone to register
-                fields={'Form name': 'Create Your Wedding Account',
-                       'Email': 'Email Address',
-                       'Username': 'Username',
-                       'Password': 'Password',
-                       'Repeat password': 'Confirm Password',
-                       'First name': 'First Partner Name',
-                       'Last name': 'Second Partner Name',
-                       'Register': 'Create Wedding Account'},
-                captcha=False,  # Disable captcha for simplicity
-                merge_username_email=False,  # Keep username and email separate
-                password_hint=False,  # Disable password hint
-                key='register_user'
-            )
-            
-            if email:
-                st.success(f"🎉 Welcome to Wedding Planner! Account created for {name}")
-                
-                # Extract partner names from the registration
-                # For the updated API, 'name' might contain "FirstName LastName"
-                name_parts = name.split(' ', 1) if name else ['', '']
-                partner1 = name_parts[0] if len(name_parts) > 0 else 'Partner 1'
-                partner2 = name_parts[1] if len(name_parts) > 1 else 'Partner 2'
-                
-                # Create wedding folder structure
-                with st.spinner("Setting up your wedding workspace..."):
-                    folder_name = create_wedding_folder_structure(username, f"{partner1} & {partner2}", partner1, partner2)
-                    
-                    if folder_name:
-                        # Update the wedding mappings in auth config
-                        auth_config = st.session_state.auth_config
-                        
-                        # Initialize wedding_mappings if it doesn't exist
-                        if 'wedding_mappings' not in auth_config:
-                            auth_config['wedding_mappings'] = {}
-                        
-                        # Add new wedding mapping
-                        wedding_display_name = f"{partner1} & {partner2}"
-                        auth_config['wedding_mappings'][wedding_display_name] = {
-                            'folder': folder_name,
-                            'users': [username],
-                            'wedding_name': wedding_display_name
-                        }
-                        
-                        # Save updated auth config
-                        if save_auth_config(auth_config):
-                            st.session_state.auth_config = auth_config
-                            st.success("✅ Wedding workspace created successfully!")
-                            st.info("🔄 Please refresh the page and log in with your new account to complete the setup.")
-                            
-                            # Show next steps
-                            st.markdown("### 🎯 Next Steps:")
-                            st.markdown(f"""
-                            1. **Log in** using your credentials:
-                               - Username: `{username}`
-                               - Password: The password you just created
-                            
-                            2. **Complete your wedding setup** by adding:
-                               - Wedding dates and venue
-                               - Wedding events and timeline
-                               - Guest lists and vendors
-                            
-                            3. **Start planning** your perfect day!
-                            """)
-                        else:
-                            st.error("❌ Failed to save wedding configuration. Please try again.")
-                    else:
-                        st.error("❌ Failed to create wedding workspace. Please try again.")
-        
-        except Exception as e:
-            st.error(f"Registration error: {e}")
-            # Additional helpful information
-            st.info("💡 Registration requirements: unique username, valid email, and matching passwords")
+    # Check authentication status and show appropriate message
+    if st.session_state.get('authentication_status') is False:
+        st.error("❌ Invalid username or password")
+    elif st.session_state.get('authentication_status') is None:
+        st.info("🔐 Please enter your username and password")
+    elif st.session_state.get('authentication_status'):
+        st.success(f"✅ Welcome, {st.session_state.get('name', 'User')}!")
+        st.rerun()  # Refresh to show main app
+    
+
 
 def show_wedding_setup_form():
-    """Show the wedding setup form for creating a new wedding (updated for new users)"""
-    st.markdown("### 🔧 Complete Your Wedding Setup")
-    st.info("Welcome! Let's finish setting up your wedding planner with your specific details.")
+    """Show the wedding setup form for creating a new wedding"""
+    st.markdown("### 📝 Create Your Wedding Configuration")
     
     # Initialize session state for events and form data if not exists
     if 'setup_events' not in st.session_state:
@@ -853,6 +677,7 @@ def show_wedding_setup_form():
         else:
             st.error("Please fill in at least the partner names and wedding date range in the form above.")
 
+
 def show_main_app(authenticator):
     # Get current user from session state (set by authenticator.login)
     username = st.session_state.get('username')
@@ -891,20 +716,8 @@ def show_main_app(authenticator):
                     st.session_state.app_initialized = True
                     st.session_state.last_user_folder = user_folder
                 else:
-                    # For new users, check if we need to show setup form
-                    config = config_manager.load_config()
-                    wedding_info_data = config.get('wedding_info', {})
-                    
-                    # If basic wedding info is missing, show setup form
-                    if (not wedding_info_data.get('partner1_name') or 
-                        not wedding_info_data.get('partner2_name') or
-                        not wedding_info_data.get('wedding_start_date')):
-                        
-                        show_wedding_setup_form()
-                        return
-                    
-                    st.session_state.app_initialized = True
-                    st.session_state.last_user_folder = user_folder
+                    st.error("Failed to load wedding data.")
+                    return
     
     # Load config
     config = st.session_state.config_manager.load_config()
@@ -997,14 +810,14 @@ def show_main_app(authenticator):
             
             # Always show push button
             if modified_files:
-                st.warning(f"🔄 {len(modified_files)} unsaved changes")
+                st.warning(f"📝 {len(modified_files)} unsaved changes")
                 if st.button("📤 Push Changes", type="primary", help="Save changes to Google Drive", key="sidebar_push"):
                     with st.spinner("Pushing changes..."):
                         if config_manager.manual_sync_to_drive():
                             st.success("✅ Changes saved!")
                             st.rerun()
                         else:
-                            st.error("⚠ Failed to save changes")
+                            st.error("❌ Failed to save changes")
             else:
                 st.success("✅ All changes saved")
                 if st.button("📤 Push to Drive", help="Save current data to Google Drive", key="sidebar_push_all"):
@@ -1013,16 +826,16 @@ def show_main_app(authenticator):
                             st.success("✅ Data saved!")
                             st.rerun()
                         else:
-                            st.error("⚠ Failed to save")
+                            st.error("❌ Failed to save")
             
             # Always show pull button
-            if st.button("📄 Pull Latest", help="Get latest from Google Drive", key="sidebar_pull"):
+            if st.button("🔄 Pull Latest", help="Get latest from Google Drive", key="sidebar_pull"):
                 with st.spinner("Pulling latest..."):
                     if config_manager.manual_sync_from_drive():
                         st.success("✅ Latest loaded!")
                         st.rerun()
                     else:
-                        st.error("⚠ Failed to load changes")
+                        st.error("❌ Failed to load changes")
     
     # Route to appropriate page
     if page == "Dashboard":
@@ -1040,9 +853,794 @@ def show_main_app(authenticator):
     elif page == "Settings":
         show_settings_page(config)
 
-# [Rest of the functions remain the same - show_wedding_timeline_page, get_vendors_for_event, 
-#  get_meal_choices_for_event, show_wedding_events_section, show_settings_page, etc.]
-# ... (keeping all existing functions for brevity)
+def show_wedding_timeline_page(config):
+    st.markdown("## 📅 Wedding Overview")
+    
+    # Show wedding events directly without tabs
+    show_wedding_events_section(config)
+
+def get_vendors_for_event(event_name, vendors_data):
+    """Get vendors associated with a specific event, handling multiple categories per vendor"""
+    event_vendors = []
+    for vendor in vendors_data:
+        vendor_events = vendor.get('events', [])
+        if event_name in vendor_events:
+            # Get all categories for this vendor
+            categories = vendor.get('categories', [])
+            primary_category = vendor.get('category', '')
+            
+            # If no categories array, use the primary category
+            if not categories and primary_category:
+                categories = [primary_category]
+            
+            # If still no categories, use a default
+            if not categories:
+                categories = ['Vendor/Service']
+            
+            # Create an entry for each category this vendor serves
+            for category in categories:
+                event_vendors.append({
+                    'name': vendor.get('name', ''),
+                    'category': category,
+                    'status': vendor.get('status', ''),
+                    'vendor_id': vendor.get('id', '')  # Add ID to help identify duplicates
+                })
+    
+    return event_vendors
+
+def get_meal_choices_for_event(event_name, rsvp_data, meal_options):
+    """Get meal choice counts for a specific event from RSVP data"""
+    meal_counts = {}
+    
+    # Initialize counts for all meal options
+    for option in meal_options:
+        meal_counts[option] = 0
+    
+    # Count meal choices from RSVP data
+    for group_code, group_data in rsvp_data.items():
+        event_responses = group_data.get('event_responses', {})
+        if event_name in event_responses:
+            event_data = event_responses[event_name]
+            meal_choices = event_data.get('meal_choice', {})
+            
+            for attendee, choice in meal_choices.items():
+                if choice in meal_counts:
+                    meal_counts[choice] += 1
+    
+    return meal_counts
+
+def show_wedding_events_section(config):
+    st.markdown("## 📅 Wedding Events")
+    
+    wedding_events = config.get('wedding_events', [])
+    wedding_info = config.get('wedding_info', {})
+    
+    if not wedding_events:
+        st.info("No events configured yet. Please complete the setup to define your wedding events.")
+        return
+    
+    # Get wedding dates
+    wedding_start_str = wedding_info.get('wedding_start_date', '')
+    wedding_end_str = wedding_info.get('wedding_end_date', '')
+    
+    if wedding_start_str and wedding_end_str:
+        try:
+            wedding_start = datetime.fromisoformat(wedding_start_str).date()
+            wedding_end = datetime.fromisoformat(wedding_end_str).date()
+        except:
+            st.error("Invalid wedding date format. Please check your settings.")
+            return
+    else:
+        st.warning("Wedding dates not set. Please complete the setup.")
+        return
+    
+    # Load vendors and RSVP data
+    config_manager = ConfigManager()
+    vendors_data = config_manager.load_json_data('vendors.json')
+    rsvp_data = config_manager.load_json_data('rsvp_data.json')
+    
+    # Display events
+    st.markdown(f"### Your Wedding Events ({len(wedding_events)} total)")
+    
+    # Group events by day
+    events_by_day = {}
+    for event in wedding_events:
+        event_date = wedding_start + timedelta(days=event.get('date_offset', 0))
+        day_key = event_date.strftime('%Y-%m-%d')
+        if day_key not in events_by_day:
+            events_by_day[day_key] = []
+        events_by_day[day_key].append(event)
+    
+    # Sort days
+    sorted_days = sorted(events_by_day.keys())
+    
+    for day in sorted_days:
+        day_date = datetime.fromisoformat(day).date()
+        day_events = events_by_day[day]
+        
+        # Determine day label
+        if day_date == wedding_start:
+            day_label = "Day 1 - Wedding Start"
+        elif day_date == wedding_end:
+            day_label = "Final Day - Wedding End"
+        else:
+            days_from_start = (day_date - wedding_start).days
+            day_label = f"Day {days_from_start + 1}"
+        
+        st.markdown(f"#### {day_label} - {day_date.strftime('%B %d, %Y')}")
+        
+        for event in day_events:
+            # Simple event display
+            time_info = event.get('description', '') or 'Time TBD'
+            location = event.get('location', '') or 'Location TBD'
+            address = event.get('address', '')
+            meal_required = event.get('requires_meal_choice', False)
+            event_name = event.get('name', 'Untitled Event')
+            
+            st.markdown(f"**{event_name}**")
+            st.markdown(f"🕐 **Time:** {time_info}")
+            st.markdown(f"📍 **Location:** {location}")
+            if address:
+                st.markdown(f"🏠 **Address:** {address}")
+            st.markdown(f"🍽️ **Meal Choice:** {'Required' if meal_required else 'Not Required'}")
+            
+            # Display meal choices and counts if meal choice is required
+            if meal_required:
+                meal_options = event.get('meal_options', [])
+                if meal_options:
+                    meal_counts = get_meal_choices_for_event(event_name, rsvp_data, meal_options)
+                    st.markdown("🍽️ **Meal Choices:**")
+                    for option in meal_options:
+                        count = meal_counts.get(option, 0)
+                        st.markdown(f"   • **{option}:** {count} orders")
+                else:
+                    st.markdown("🍽️ **Meal Choices:** No options configured")
+            
+            # Display vendors for this event
+            event_vendors = get_vendors_for_event(event_name, vendors_data)
+            if event_vendors:
+                st.markdown("🏢 **Vendors:**")
+                
+                # Group vendors by name to handle multiple categories
+                vendors_by_name = {}
+                for vendor in event_vendors:
+                    vendor_name = vendor['name']
+                    if vendor_name not in vendors_by_name:
+                        vendors_by_name[vendor_name] = {
+                            'categories': [],
+                            'status': vendor['status']
+                        }
+                    vendors_by_name[vendor_name]['categories'].append(vendor['category'])
+                
+                # Display grouped vendors
+                for vendor_name, vendor_info in vendors_by_name.items():
+                    status_emoji = "✅" if vendor_info['status'] == "Booked" else "⏳" if vendor_info['status'] == "Researching" else "📋"
+                    categories_text = ", ".join(vendor_info['categories'])
+                    st.markdown(f"   • {status_emoji} **{categories_text}:** {vendor_name}")
+            else:
+                st.markdown("🏢 **Vendors:** None assigned")
+            
+            st.markdown("---")
+    
+    # Event summary
+    st.markdown("### Event Summary")
+    
+    col1, col2, col3 = st.columns(3)
+    
+    with col1:
+        total_events = len(wedding_events)
+        st.metric("Total Events", total_events)
+    
+    with col2:
+        meal_events = len([e for e in wedding_events if e.get('requires_meal_choice', False)])
+        st.metric("Events with Meals", meal_events)
+    
+    with col3:
+        days_span = (wedding_end - wedding_start).days + 1
+        st.metric("Celebration Days", days_span)
+
+def show_settings_page(config):
+    st.markdown("### Settings")
+    
+    # Check demo mode status
+    is_demo_mode = st.session_state.config_manager.is_demo_mode()
+    
+    # Demo mode toggle at the top
+    st.markdown("#### Demo Mode")
+    col1, col2 = st.columns([3, 1])
+    with col1:
+        if is_demo_mode:
+            st.info("🎭 **Demo Mode is ON** - You are currently viewing sample data. This includes demo guests, vendors with complex payment schedules, tasks, and wedding party information.")
+        else:
+            st.info("📝 **Demo Mode is OFF** - You are viewing your actual wedding data.")
+    
+    with col2:
+        if st.button("Toggle Demo Mode", type="secondary"):
+            if st.session_state.config_manager.toggle_demo_mode():
+                st.success("Demo mode toggled! Please refresh the page.")
+                st.rerun()
+            else:
+                st.error("Failed to toggle demo mode.")
+    
+    # Create tabs for different settings
+    tab1, tab2, tab3, tab4, tab5, tab6 = st.tabs(["Edit Configuration", "Manage Events", "Google Drive", "Cache Management", "Current Configuration", "Reset"])
+    
+    with tab1:
+        st.markdown("#### Edit Wedding Configuration")
+        
+        # Initialize session state for editing if not exists
+        if 'edit_config' not in st.session_state:
+            st.session_state.edit_config = config.copy()
+        
+        with st.form("edit_wedding_config"):
+            st.markdown("##### Basic Wedding Information")
+            
+            col1, col2 = st.columns(2)
+            with col1:
+                partner1_name = st.text_input("Partner 1 Name", value=st.session_state.edit_config.get('wedding_info', {}).get('partner1_name', ''))
+                partner2_name = st.text_input("Partner 2 Name", value=st.session_state.edit_config.get('wedding_info', {}).get('partner2_name', ''))
+                venue_city = st.text_input("City", value=st.session_state.edit_config.get('wedding_info', {}).get('venue_city', ''))
+            
+            with col2:
+                # Get current dates
+                wedding_start_str = st.session_state.edit_config.get('wedding_info', {}).get('wedding_start_date', '')
+                wedding_end_str = st.session_state.edit_config.get('wedding_info', {}).get('wedding_end_date', '')
+                
+                try:
+                    if wedding_start_str:
+                        wedding_start = datetime.fromisoformat(wedding_start_str).date()
+                    else:
+                        wedding_start = date.today()
+                    
+                    if wedding_end_str:
+                        wedding_end = datetime.fromisoformat(wedding_end_str).date()
+                    else:
+                        wedding_end = date.today()
+                except:
+                    wedding_start = date.today()
+                    wedding_end = date.today()
+                
+                wedding_start_date = st.date_input("Wedding Start Date", value=wedding_start)
+                wedding_end_date = st.date_input("Wedding End Date", value=wedding_end)
+                
+                if wedding_end_date < wedding_start_date:
+                    st.error("End date must be after start date")
+                    wedding_end_date = wedding_start_date
+            
+            st.markdown("##### Custom Tags")
+            current_tags = st.session_state.edit_config.get('custom_settings', {}).get('custom_tags', [])
+            custom_tags_text = '\n'.join(current_tags) if current_tags else ''
+            custom_tags = st.text_area("Custom Tags (one per line)", value=custom_tags_text, placeholder="e.g.,\nUrgent\nHigh Priority\nDeposit Required")
+            
+            st.markdown("##### Task Assignees")
+            current_assignees = st.session_state.edit_config.get('custom_settings', {}).get('task_assignees', [])
+            task_assignees_text = '\n'.join(current_assignees) if current_assignees else ''
+            task_assignees = st.text_area("Task Assignees (one per line)", value=task_assignees_text, placeholder="e.g.,\nMom\nDad\nWedding Planner\nBest Friend\nCoordinator")
+            
+            submitted = st.form_submit_button("Save Changes", type="primary")
+            
+            if submitted:
+                # Update the configuration
+                updated_config = st.session_state.edit_config.copy()
+                updated_config['wedding_info'] = {
+                    'partner1_name': partner1_name,
+                    'partner2_name': partner2_name,
+                    'venue_city': venue_city,
+                    'wedding_start_date': wedding_start_date.isoformat(),
+                    'wedding_end_date': wedding_end_date.isoformat()
+                }
+                
+                # Parse custom tags and task assignees
+                custom_tags_list = [tag.strip() for tag in custom_tags.split('\n') if tag.strip()]
+                task_assignees_list = [assignee.strip() for assignee in task_assignees.split('\n') if assignee.strip()]
+                updated_config['custom_settings'] = {
+                    'custom_tags': custom_tags_list,
+                    'task_assignees': task_assignees_list
+                }
+                
+                # Save the updated configuration
+                st.session_state.config_manager.save_config(updated_config)
+                st.success("Configuration updated successfully!")
+                st.rerun()
+    
+    with tab2:
+        show_event_management_section(config)
+    
+    with tab3:
+        show_google_drive_section()
+    
+    with tab4:
+        show_cache_management_section()
+    
+    with tab5:
+        st.markdown("#### Current Configuration")
+        st.json(config)
+    
+    with tab6:
+        st.markdown("#### Reset Configuration")
+        st.warning("⚠️ This will permanently delete all your wedding configuration data. This action cannot be undone.")
+        
+        if st.button("Reset Configuration", type="secondary"):
+            if st.session_state.config_manager.reset_config():
+                st.success("Configuration reset! Please refresh the page.")
+                st.rerun()
+
+def show_cache_management_section():
+    """Show cache management section in settings"""
+    st.markdown("#### Cache Management")
+    
+    config_manager = st.session_state.config_manager
+    
+    # Get cache status
+    cache_status = config_manager.get_cache_status()
+    
+    st.markdown("**Current Cache Status:**")
+    
+    col1, col2 = st.columns(2)
+    
+    with col1:
+        st.metric("Total Cached Items", cache_status['total_cached'])
+        if cache_status['config_cached']:
+            st.success("✅ Wedding configuration cached")
+        else:
+            st.info("ℹ️ Wedding configuration not cached")
+    
+    with col2:
+        if cache_status['cached_data_files']:
+            st.success(f"✅ {len(cache_status['cached_data_files'])} data files cached")
+            with st.expander("View cached files"):
+                for filename in cache_status['cached_data_files']:
+                    st.markdown(f"• {filename}")
+        else:
+            st.info("ℹ️ No data files cached")
+    
+    st.markdown("---")
+    
+    # Cache management buttons
+    st.markdown("**Cache Actions:**")
+    
+    col1, col2, col3 = st.columns(3)
+    
+    with col1:
+        if st.button("🗑️ Clear All Cache", help="Clear all cached data to force reload from source"):
+            config_manager.clear_cache()
+            st.success("Cache cleared! Data will be reloaded from source on next access.")
+            st.rerun()
+    
+    with col2:
+        if st.button("🔄 Refresh Cache", help="Reload all data from Google Drive and update cache"):
+            if config_manager.google_drive_enabled:
+                with st.spinner("Refreshing cache from Google Drive..."):
+                    if config_manager.manual_sync_from_drive():
+                        st.success("Cache refreshed from Google Drive!")
+                        st.rerun()
+                    else:
+                        st.error("Failed to refresh cache from Google Drive")
+            else:
+                st.warning("Google Drive not enabled. Cannot refresh from Drive.")
+    
+    with col3:
+        if st.button("ℹ️ Cache Info", help="Show detailed cache information"):
+            st.info("Cache helps improve performance by storing data in memory. Data is automatically cached when first loaded and updated when modified.")
+
+def show_google_drive_status_setup():
+    """Show Google Drive status on the setup page"""
+    config_manager = st.session_state.config_manager
+    drive_status = config_manager.get_google_drive_status()
+    
+    # Create an expander for Google Drive status
+    with st.expander("🔗 Google Drive Connection Status", expanded=False):
+        # Status display
+        if drive_status['enabled']:
+            if drive_status['status'] == 'Online':
+                st.success(f"✅ {drive_status['message']}")
+            elif drive_status['status'] == 'Offline':
+                st.warning(f"⚠️ {drive_status['message']}")
+            else:
+                st.error(f"❌ {drive_status['message']}")
+        else:
+            st.info(f"ℹ️ {drive_status['message']}")
+        
+        # Show files if available
+        if drive_status['enabled'] and 'files' in drive_status:
+            st.markdown("**Files found in Google Drive:**")
+            for file_name in drive_status['files']:
+                friendly_name = get_friendly_file_name(file_name)
+                st.markdown(f"• {friendly_name}")
+        
+        # Manual sync buttons (if enabled) - only show pull and load options
+        if drive_status['enabled']:
+            st.markdown("**Manual Sync:**")
+            col1, col2 = st.columns(2)
+            
+            with col1:
+                if st.button("📥 Sync from Google Drive", help="Download latest data from Google Drive", key="setup_sync_from"):
+                    with st.spinner("Syncing from Google Drive..."):
+                        if config_manager.manual_sync_from_drive():
+                            st.success("Successfully synced from Google Drive!")
+                            st.rerun()
+                        else:
+                            st.error("Failed to sync from Google Drive")
+            
+            with col2:
+                if st.button("🔄 Load Existing Data", help="Load existing wedding data from Google Drive", key="setup_load_existing"):
+                    with st.spinner("Loading existing data from Google Drive..."):
+                        if config_manager.load_existing_data_from_drive():
+                            st.success("Successfully loaded existing data from Google Drive!")
+                            st.info("Your wedding data has been loaded. The page will refresh to show your wedding planner.")
+                            st.rerun()
+                        else:
+                            st.error("Failed to load existing data from Google Drive")
+        
+        # Configuration help
+        if not drive_status['enabled']:
+            st.markdown("**To enable Google Drive integration:**")
+            st.markdown("Set the following **secrets** in your Hugging Face Space settings:")
+            st.code("""
+GOOGLE_DRIVE_FOLDER_ID=your_folder_id
+GOOGLE_PROJECT_ID=your_project_id
+GOOGLE_PRIVATE_KEY_ID=your_private_key_id
+GOOGLE_PRIVATE_KEY=your_private_key
+GOOGLE_CLIENT_EMAIL=your_client_email
+GOOGLE_CLIENT_ID=your_client_id
+            """)
+            
+            # Debug information
+            st.markdown("**Debug Information:**")
+            folder_id = os.getenv('GOOGLE_DRIVE_FOLDER_ID')
+            if folder_id:
+                st.success(f"✅ GOOGLE_DRIVE_FOLDER_ID found: {folder_id[:10]}...")
+            else:
+                st.error("❌ GOOGLE_DRIVE_FOLDER_ID not found")
+            
+            # Check other variables
+            project_id = os.getenv('GOOGLE_PROJECT_ID')
+            client_email = os.getenv('GOOGLE_CLIENT_EMAIL')
+            private_key_id = os.getenv('GOOGLE_PRIVATE_KEY_ID')
+            private_key = os.getenv('GOOGLE_PRIVATE_KEY')
+            client_id = os.getenv('GOOGLE_CLIENT_ID')
+            
+            if project_id:
+                st.success(f"✅ GOOGLE_PROJECT_ID found: {project_id[:10]}...")
+            else:
+                st.error("❌ GOOGLE_PROJECT_ID not found")
+                
+            if client_email:
+                st.success(f"✅ GOOGLE_CLIENT_EMAIL found: {client_email}")
+            else:
+                st.error("❌ GOOGLE_CLIENT_EMAIL not found")
+                
+            if private_key_id:
+                st.success(f"✅ GOOGLE_PRIVATE_KEY_ID found: {private_key_id[:10]}...")
+            else:
+                st.error("❌ GOOGLE_PRIVATE_KEY_ID not found")
+                
+            if private_key:
+                st.success(f"✅ GOOGLE_PRIVATE_KEY found: {len(private_key)} characters")
+            else:
+                st.error("❌ GOOGLE_PRIVATE_KEY not found")
+                
+            if client_id:
+                st.success(f"✅ GOOGLE_CLIENT_ID found: {client_id[:10]}...")
+            else:
+                st.error("❌ GOOGLE_CLIENT_ID not found")
+            
+            # Check if all required variables are present
+            all_required = all([folder_id, project_id, private_key_id, private_key, client_email, client_id])
+            if all_required:
+                st.success("🎉 All required secrets are present!")
+                st.info("If Google Drive is still not working, there might be an authentication issue. Try restarting your Space.")
+                
+                # Test file writing permissions
+                st.markdown("**Testing file permissions:**")
+                try:
+                    test_file = "/tmp/test_write.txt"
+                    with open(test_file, 'w') as f:
+                        f.write("test")
+                    st.success("✅ Can write to /tmp directory")
+                    os.remove(test_file)
+                except Exception as e:
+                    st.error(f"❌ Cannot write to /tmp directory: {e}")
+                    
+                try:
+                    test_dir = "wedding_data"
+                    os.makedirs(test_dir, exist_ok=True)
+                    test_file = os.path.join(test_dir, "test.txt")
+                    with open(test_file, 'w') as f:
+                        f.write("test")
+                    st.success("✅ Can write to wedding_data directory")
+                    os.remove(test_file)
+                except Exception as e:
+                    st.error(f"❌ Cannot write to wedding_data directory: {e}")
+            else:
+                st.warning("⚠️ Some required secrets are missing. Please add all secrets and restart your Space.")
+
+def get_friendly_file_name(filename):
+    """Convert technical file names to user-friendly names"""
+    friendly_names = {
+        'wedding_config.json': 'Wedding Configuration',
+        'guest_list_data.json': 'Guest List',
+        'rsvp_data.json': 'RSVP Responses',
+        'tasks.json': 'Tasks',
+        'vendors.json': 'Vendors',
+        'wedding_party.json': 'Wedding Party'
+    }
+    return friendly_names.get(filename, filename)
+
+def show_google_drive_sync_status():
+    """Show Google Drive sync status and push button prominently in main app"""
+    config_manager = st.session_state.config_manager
+    drive_status = config_manager.get_google_drive_status()
+    
+    # Only show if Google Drive is enabled
+    if not drive_status['enabled']:
+        return
+    
+    # Get modified files
+    modified_files = config_manager.get_modified_files()
+    
+    # Create a prominent status bar with always-visible push button
+    col1, col2, col3 = st.columns([2, 1, 1])
+    
+    with col1:
+        if modified_files:
+            friendly_names = [get_friendly_file_name(f) for f in modified_files]
+            st.warning(f"📝 **{len(modified_files)} unsaved changes** - {', '.join(friendly_names)}")
+        else:
+            st.success("✅ **All changes saved** - Your data is up to date with Google Drive")
+    
+    with col2:
+        # Always show push button - it will sync all current data
+        if modified_files:
+            button_text = f"📤 Push {len(modified_files)} Changes"
+            button_help = f"Save {len(modified_files)} modified files to Google Drive"
+        else:
+            button_text = "📤 Push to Drive"
+            button_help = "Save current data to Google Drive"
+        
+        if st.button(button_text, type="primary", help=button_help):
+            with st.spinner("Pushing changes to Google Drive..."):
+                if config_manager.manual_sync_to_drive():
+                    st.success("✅ Changes saved to Google Drive!")
+                    st.rerun()
+                else:
+                    st.error("❌ Failed to save changes to Google Drive")
+    
+    with col3:
+        if st.button("🔄 Pull Latest", help="Get latest changes from Google Drive"):
+            with st.spinner("Pulling latest changes from Google Drive..."):
+                if config_manager.manual_sync_from_drive():
+                    st.success("✅ Latest changes loaded from Google Drive!")
+                    st.rerun()
+                else:
+                    st.error("❌ Failed to load changes from Google Drive")
+    
+    # Add a small separator
+    st.markdown("---")
+
+def show_google_drive_section():
+    st.markdown("#### Google Drive Integration")
+    
+    config_manager = st.session_state.config_manager
+    drive_status = config_manager.get_google_drive_status()
+    
+    # Status display
+    if drive_status['enabled']:
+        if drive_status['status'] == 'Online':
+            st.success(f"✅ {drive_status['message']}")
+        elif drive_status['status'] == 'Offline':
+            st.warning(f"⚠️ {drive_status['message']}")
+        else:
+            st.error(f"❌ {drive_status['message']}")
+    else:
+        st.info(f"ℹ️ {drive_status['message']}")
+    
+    # Show files if available
+    if drive_status['enabled'] and 'files' in drive_status:
+        st.markdown("**Files in Google Drive:**")
+        for file_name in drive_status['files']:
+            friendly_name = get_friendly_file_name(file_name)
+            st.markdown(f"• {friendly_name}")
+    
+    # Show modified files status
+    if drive_status['enabled']:
+        modified_files = config_manager.get_modified_files()
+        if modified_files:
+            st.markdown("#### 📝 Modified Files (Not Synced)")
+            st.warning(f"The following files have been modified and need to be synced to Google Drive:")
+            for file_name in modified_files:
+                friendly_name = get_friendly_file_name(file_name)
+                st.markdown(f"• {friendly_name}")
+        else:
+            st.markdown("#### ✅ All Files Synced")
+            st.success("All your data is up to date with Google Drive.")
+    
+    # Manual sync buttons
+    if drive_status['enabled']:
+        st.markdown("#### Manual Sync")
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            if st.button("📥 Sync from Google Drive", help="Download latest data from Google Drive"):
+                with st.spinner("Syncing from Google Drive..."):
+                    if config_manager.manual_sync_from_drive():
+                        st.success("Successfully synced from Google Drive!")
+                        st.rerun()
+                    else:
+                        st.error("Failed to sync from Google Drive")
+        
+        with col2:
+            # Show different button text based on whether there are modified files
+            modified_files = config_manager.get_modified_files()
+            if modified_files:
+                button_text = f"📤 Sync {len(modified_files)} Modified Files to Drive"
+                button_help = f"Upload {len(modified_files)} modified files to Google Drive"
+            else:
+                button_text = "📤 Sync to Google Drive"
+                button_help = "Upload current data to Google Drive (no changes to sync)"
+            
+            if st.button(button_text, help=button_help, disabled=not modified_files):
+                with st.spinner("Syncing to Google Drive..."):
+                    if config_manager.manual_sync_to_drive():
+                        st.success("Successfully synced to Google Drive!")
+                        st.rerun()
+                    else:
+                        st.error("Failed to sync to Google Drive")
+    
+    # Configuration info
+    st.markdown("#### Configuration")
+    st.markdown("To enable Google Drive integration, set the following environment variables:")
+    st.code("""
+GOOGLE_DRIVE_FOLDER_ID=your_folder_id
+GOOGLE_PROJECT_ID=your_project_id
+GOOGLE_PRIVATE_KEY_ID=your_private_key_id
+GOOGLE_PRIVATE_KEY=your_private_key
+GOOGLE_CLIENT_EMAIL=your_client_email
+GOOGLE_CLIENT_ID=your_client_id
+    """)
+    
+    st.markdown("**Note:** Google Drive integration is automatically enabled when running on Hugging Face Spaces with proper credentials configured.")
+
+def show_event_management_section(config):
+    st.markdown("#### Manage Wedding Events")
+    
+    # Initialize session state for event editing if not exists
+    if 'edit_events' not in st.session_state:
+        st.session_state.edit_events = config.get('wedding_events', []).copy()
+    
+    wedding_events = st.session_state.edit_events
+    wedding_info = config.get('wedding_info', {})
+    
+    # Get wedding dates for date calculations
+    wedding_start_str = wedding_info.get('wedding_start_date', '')
+    wedding_end_str = wedding_info.get('wedding_end_date', '')
+    
+    if not wedding_start_str or not wedding_end_str:
+        st.warning("Please set your wedding date range in the 'Edit Configuration' tab first.")
+        return
+    
+    try:
+        wedding_start = datetime.fromisoformat(wedding_start_str).date()
+        wedding_end = datetime.fromisoformat(wedding_end_str).date()
+    except:
+        st.error("Invalid wedding date format. Please check your configuration.")
+        return
+    
+    # Add event button
+    if st.button("➕ Add New Event"):
+        st.session_state.edit_events.append({
+            "name": "New Event",
+            "description": "",
+            "date_offset": 0,
+            "requires_meal_choice": False,
+            "meal_options": [],
+            "location": "",
+            "address": ""
+        })
+        st.rerun()
+    
+    # Display events for editing
+    if st.session_state.edit_events:
+        st.markdown("##### Edit Events")
+        
+        for i, event in enumerate(st.session_state.edit_events):
+            with st.expander(f"Event {i+1}: {event['name']}", expanded=True):
+                # Add delete button at the top right of each event
+                col_header1, col_header2 = st.columns([4, 1])
+                with col_header2:
+                    if st.button("🗑️ Delete", key=f"delete_event_{i}", help="Delete this event"):
+                        st.session_state.edit_events.pop(i)
+                        st.rerun()
+                
+                col1, col2 = st.columns(2)
+                
+                with col1:
+                    event_name = st.text_input("Event Name", value=event['name'], key=f"settings_event_name_{i}")
+                    event_description = st.text_input("Time", value=event['description'], placeholder="e.g., 2:00 PM, 6:30 PM", key=f"settings_event_desc_{i}")
+                    event_location = st.text_input("Location Name", value=event.get('location', ''), placeholder="e.g., Central Park, Grand Ballroom", key=f"settings_event_location_{i}")
+                
+                with col2:
+                    # Calculate current event date from date_offset
+                    current_event_date = wedding_start + timedelta(days=event['date_offset'])
+                    
+                    # Use date input without constraints - allow any date
+                    event_date = st.date_input(
+                        "Event Date", 
+                        value=current_event_date, 
+                        key=f"settings_event_date_{i}",
+                        help="Select any date for this event"
+                    )
+                    
+                    # Show warning if date is outside wedding range
+                    if event_date < wedding_start or event_date > wedding_end:
+                        st.warning(f"⚠️ Selected date is outside your wedding date range ({wedding_start.strftime('%B %d, %Y')} - {wedding_end.strftime('%B %d, %Y')})")
+                    
+                    requires_meal_choice = st.checkbox("Requires Meal Choice", value=event['requires_meal_choice'], key=f"settings_event_meal_{i}")
+                    
+                    # Meal options section (only show if meal choice is required)
+                    if requires_meal_choice:
+                        st.markdown("**Meal Options**")
+                        st.markdown("Enter meal options (one per line):")
+                        current_meal_options = event.get('meal_options', [])
+                        meal_options_text = '\n'.join(current_meal_options) if current_meal_options else ''
+                        meal_options = st.text_area("Meal Options", value=meal_options_text, placeholder="e.g.,\nDuck\nSurf & Turf\nRisotto (vegetarian)\nStuffed Squash (vegetarian)", key=f"settings_event_meal_options_{i}", height=100)
+                    else:
+                        meal_options = ""
+                    
+                    event_address = st.text_area("Address", value=event.get('address', ''), placeholder="Enter full address (street, city, state, zip code)", key=f"settings_event_address_{i}", height=80)
+                
+                # Calculate date_offset from the selected date
+                date_offset = (event_date - wedding_start).days
+                
+                # Parse meal options
+                meal_options_list = []
+                if requires_meal_choice and meal_options:
+                    meal_options_list = [option.strip() for option in meal_options.split('\n') if option.strip()]
+                
+                # Update session state
+                st.session_state.edit_events[i] = {
+                    "name": event_name,
+                    "description": event_description,
+                    "date_offset": date_offset,
+                    "requires_meal_choice": requires_meal_choice,
+                    "meal_options": meal_options_list,
+                    "location": event_location,
+                    "address": event_address
+                }
+        
+        # Save events button
+        st.markdown("---")
+        col1, col2, col3 = st.columns([1, 1, 1])
+        with col2:
+            if st.button("💾 Save Event Changes", type="primary"):
+                # Update the configuration with edited events
+                updated_config = config.copy()
+                updated_config['wedding_events'] = st.session_state.edit_events
+                
+                # Save the updated configuration
+                st.session_state.config_manager.save_config(updated_config)
+                st.success("Event changes saved successfully!")
+                st.rerun()
+    else:
+        st.info("No events added yet. Click 'Add New Event' to get started!")
+    
+    # Event summary
+    if st.session_state.edit_events:
+        st.markdown("##### Event Summary")
+        
+        col1, col2, col3 = st.columns(3)
+        
+        with col1:
+            total_events = len(st.session_state.edit_events)
+            st.metric("Total Events", total_events)
+        
+        with col2:
+            meal_events = len([e for e in st.session_state.edit_events if e.get('requires_meal_choice', False)])
+            st.metric("Events with Meals", meal_events)
+        
+        with col3:
+            days_span = (wedding_end - wedding_start).days + 1
+            st.metric("Celebration Days", days_span)
 
 if __name__ == "__main__":
     main()

config_manager.py

@@ -1,6 +1,5 @@
 import json
 import os
-import yaml
 from datetime import datetime
 from google_drive_manager import GoogleDriveManager
 import streamlit as st
@@ -788,66 +787,3 @@ class ConfigManager:
         except Exception as e:
             print(f"Error resetting app state: {e}")
             return False
-    
-    def create_wedding_folder_structure(self, folder_name: str, wedding_config: dict) -> bool:
-        """Create a complete wedding folder structure in Google Drive with initial files"""
-        if not self.google_drive_enabled:
-            return False
-        
-        try:
-            # Check if folder already exists
-            if self.drive_manager.check_folder_exists(folder_name):
-                print(f"Folder {folder_name} already exists")
-                return True
-            
-            # Create the folder
-            folder_id = self.drive_manager.create_folder(folder_name)
-            if not folder_id:
-                return False
-            
-            # Create initial data files for the new wedding
-            initial_files = {
-                'wedding_config.json': wedding_config,
-                'guest_list_data.json': [],
-                'rsvp_data.json': {},
-                'tasks.json': [],
-                'vendors.json': [],
-                'wedding_party.json': []
-            }
-            
-            # Upload each file to the new folder
-            for filename, content in initial_files.items():
-                full_path = f"{folder_name}/{filename}"
-                if not self.drive_manager.upload_file(full_path, content):
-                    print(f"Failed to create {filename} in {folder_name}")
-                    return False
-            
-            print(f"Successfully created wedding folder structure: {folder_name}")
-            return True
-            
-        except Exception as e:
-            print(f"Error creating wedding folder structure: {e}")
-            return False
-    
-    def load_auth_config(self):
-        """Load authentication configuration from Google Drive"""
-        if not self.google_drive_enabled:
-            return None
-        
-        try:
-            auth_config = self.drive_manager.download_file('config.yaml')
-            return auth_config
-        except Exception as e:
-            print(f"Error loading auth config: {e}")
-            return None
-    
-    def save_auth_config(self, config):
-        """Save authentication configuration to Google Drive"""
-        if not self.google_drive_enabled:
-            return False
-        
-        try:
-            return self.drive_manager.upload_file('config.yaml', config)
-        except Exception as e:
-            print(f"Error saving auth config: {e}")
-            return False

google_drive_manager.py

@@ -2,8 +2,7 @@ import os
 import json
 import tempfile
 import time
-import yaml
-from typing import Dict, List, Optional, Any, Union
+from typing import Dict, List, Optional, Any
 from google.oauth2 import service_account
 from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import build
@@ -130,7 +129,7 @@ class GoogleDriveManager:
             return []
     
     @retry_on_ssl_error(max_retries=3, delay=1)
-    def download_file(self, file_name: str) -> Optional[Union[Dict[str, Any], str]]:
+    def download_file(self, file_name: str) -> Optional[Dict[str, Any]]:
         """Download a file from Google Drive and return its content"""
         if not self.service or not self.folder_id:
             return None
@@ -146,7 +145,7 @@ class GoogleDriveManager:
                 folders = folder_results.get('files', [])
                 
                 if not folders:
-                    print(f"Folder '{folder_name}' not found in Google Drive")
+                    st.warning(f"File '{file_name}' not found in Google Drive")
                     return None
                 
                 folder_id = folders[0]['id']
@@ -157,7 +156,7 @@ class GoogleDriveManager:
                 files = results.get('files', [])
                 
                 if not files:
-                    print(f"File '{file_name}' not found in Google Drive")
+                    st.warning(f"File '{file_name}' not found in Google Drive")
                     return None
             else:
                 # Direct file search in root folder
@@ -166,7 +165,7 @@ class GoogleDriveManager:
                 files = results.get('files', [])
                 
                 if not files:
-                    print(f"File '{file_name}' not found in Google Drive")
+                    st.warning(f"File '{file_name}' not found in Google Drive")
                     return None
             
             file_id = files[0]['id']
@@ -175,27 +174,15 @@ class GoogleDriveManager:
             request = self.service.files().get_media(fileId=file_id)
             content = request.execute()
             
-            # Determine file type and parse accordingly
-            content_str = content.decode('utf-8')
-            
-            if file_name.endswith('.yaml') or file_name.endswith('.yml'):
-                # Parse as YAML
-                try:
-                    return yaml.safe_load(content_str)
-                except yaml.YAMLError:
-                    return content_str
-            elif file_name.endswith('.json'):
-                # Parse as JSON
-                try:
-                    return json.loads(content_str)
-                except json.JSONDecodeError:
-                    return content_str
-            else:
-                # Return as string
-                return content_str
+            # Try to parse as JSON
+            try:
+                return json.loads(content.decode('utf-8'))
+            except json.JSONDecodeError:
+                # If not JSON, return as string
+                return content.decode('utf-8')
                 
         except HttpError as e:
-            print(f"Error downloading file '{file_name}': {str(e)}")
+            st.error(f"Error downloading file '{file_name}': {str(e)}")
             return None
     
     @retry_on_ssl_error(max_retries=3, delay=1)
@@ -209,20 +196,13 @@ class GoogleDriveManager:
             if isinstance(content, (dict, list)):
                 if file_name.endswith('.yaml') or file_name.endswith('.yml'):
                     # For YAML files, convert to YAML string
+                    import yaml
                     content_str = yaml.dump(content, default_flow_style=False, sort_keys=False)
-                    mimetype = 'text/yaml'
                 else:
                     # For JSON files, convert to JSON string
                     content_str = json.dumps(content, indent=2)
-                    mimetype = 'application/json'
             else:
                 content_str = str(content)
-                if file_name.endswith('.yaml') or file_name.endswith('.yml'):
-                    mimetype = 'text/yaml'
-                elif file_name.endswith('.json'):
-                    mimetype = 'application/json'
-                else:
-                    mimetype = 'text/plain'
             
             # Convert string to bytes
             content_bytes = content_str.encode('utf-8')
@@ -231,6 +211,12 @@ class GoogleDriveManager:
             from io import BytesIO
             media_body = BytesIO(content_bytes)
             
+            # Determine MIME type based on file extension
+            if file_name.endswith('.yaml') or file_name.endswith('.yml'):
+                mimetype = 'text/yaml'
+            else:
+                mimetype = 'application/json'
+            
             # Handle subfolder paths like 'laraandumang/wedding_config.json'
             target_folder_id = self.folder_id
             actual_file_name = file_name
@@ -255,7 +241,6 @@ class GoogleDriveManager:
                         fields='id'
                     ).execute()
                     target_folder_id = created_folder.get('id')
-                    print(f"Created new folder: {folder_name}")
                 else:
                     target_folder_id = folders[0]['id']
             
@@ -273,7 +258,6 @@ class GoogleDriveManager:
                     fileId=file_id,
                     media_body=media
                 ).execute()
-                print(f"Updated existing file: {file_name}")
             else:
                 # Create new file
                 file_metadata = {
@@ -286,15 +270,14 @@ class GoogleDriveManager:
                     body=file_metadata,
                     media_body=media
                 ).execute()
-                print(f"Created new file: {file_name}")
             
             return True
             
         except HttpError as e:
-            print(f"Error uploading file '{file_name}': {str(e)}")
+            st.error(f"Error uploading file '{file_name}': {str(e)}")
             return False
         except Exception as e:
-            print(f"Unexpected error uploading file '{file_name}': {str(e)}")
+            st.error(f"Unexpected error uploading file '{file_name}': {str(e)}")
             return False
     
     def sync_from_drive(self, file_names: List[str]) -> Dict[str, Any]:
@@ -307,14 +290,9 @@ class GoogleDriveManager:
                 synced_files[file_name] = content
                 # Save to local temp directory
                 local_path = os.path.join(self.temp_dir, file_name)
-                os.makedirs(os.path.dirname(local_path), exist_ok=True)
-                
                 with open(local_path, 'w') as f:
                     if isinstance(content, (dict, list)):
-                        if file_name.endswith('.yaml') or file_name.endswith('.yml'):
-                            yaml.dump(content, f, default_flow_style=False, sort_keys=False)
-                        else:
-                            json.dump(content, f, indent=2)
+                        json.dump(content, f, indent=2)
                     else:
                         f.write(str(content))
         
@@ -337,23 +315,7 @@ class GoogleDriveManager:
             return None
         
         try:
-            # Handle subfolder paths
-            if '/' in file_name:
-                folder_name, actual_file_name = file_name.split('/', 1)
-                
-                # Find the subfolder first
-                folder_query = f"name='{folder_name}' and '{self.folder_id}' in parents and trashed=false and mimeType='application/vnd.google-apps.folder'"
-                folder_results = self.service.files().list(q=folder_query).execute()
-                folders = folder_results.get('files', [])
-                
-                if not folders:
-                    return None
-                
-                folder_id = folders[0]['id']
-                query = f"name='{actual_file_name}' and '{folder_id}' in parents and trashed=false"
-            else:
-                query = f"name='{file_name}' and '{self.folder_id}' in parents and trashed=false"
-            
+            query = f"name='{file_name}' and '{self.folder_id}' in parents and trashed=false"
             results = self.service.files().list(q=query).execute()
             files = results.get('files', [])
             
@@ -362,65 +324,9 @@ class GoogleDriveManager:
             return None
             
         except HttpError as e:
-            print(f"Error getting file info for '{file_name}': {str(e)}")
+            st.error(f"Error getting file info for '{file_name}': {str(e)}")
             return None
     
     def is_online(self) -> bool:
         """Check if Google Drive service is available"""
         return self.service is not None and self.folder_id is not None
-    
-    def create_folder(self, folder_name: str) -> Optional[str]:
-        """Create a new folder in Google Drive and return its ID"""
-        if not self.service or not self.folder_id:
-            return None
-        
-        try:
-            folder_metadata = {
-                'name': folder_name,
-                'mimeType': 'application/vnd.google-apps.folder',
-                'parents': [self.folder_id]
-            }
-            
-            created_folder = self.service.files().create(
-                body=folder_metadata,
-                fields='id'
-            ).execute()
-            
-            folder_id = created_folder.get('id')
-            print(f"Created folder '{folder_name}' with ID: {folder_id}")
-            return folder_id
-            
-        except HttpError as e:
-            print(f"Error creating folder '{folder_name}': {str(e)}")
-            return None
-    
-    def list_folders(self) -> List[Dict[str, Any]]:
-        """List all folders in the Google Drive directory"""
-        if not self.service or not self.folder_id:
-            return []
-        
-        try:
-            query = f"'{self.folder_id}' in parents and trashed=false and mimeType='application/vnd.google-apps.folder'"
-            results = self.service.files().list(
-                q=query,
-                fields="files(id, name, modifiedTime)"
-            ).execute()
-            
-            return results.get('files', [])
-        except HttpError as e:
-            print(f"Error listing folders: {str(e)}")
-            return []
-    
-    def check_folder_exists(self, folder_name: str) -> bool:
-        """Check if a folder exists in Google Drive"""
-        if not self.service or not self.folder_id:
-            return False
-        
-        try:
-            query = f"name='{folder_name}' and '{self.folder_id}' in parents and trashed=false and mimeType='application/vnd.google-apps.folder'"
-            results = self.service.files().list(q=query).execute()
-            files = results.get('files', [])
-            return len(files) > 0
-        except HttpError as e:
-            print(f"Error checking folder existence: {str(e)}")
-            return False

requirements.txt

@@ -1,4 +1,4 @@
-streamlit>=1.28.1
+streamlit==1.28.1
 pandas==2.1.3
 plotly==5.17.0
 datetime
@@ -8,5 +8,5 @@ google-api-python-client>=2.0.0
 google-auth-httplib2>=0.1.0
 google-auth-oauthlib>=0.5.0
 google-auth>=2.0.0
-streamlit-authenticator==0.4.2
+streamlit-authenticator>=0.2.3
 PyYAML>=6.0