Update app.py

app.py

@@ -2,8 +2,7 @@ import streamlit as st
 from datetime import datetime, timedelta
 import re
 import os
-import json
-from scheduler import get_calendar_service, find_meetings_with_person
+from scheduler import get_calendar_service
 from autonomous_agent import SchedulingAgent
 
 st.set_page_config(page_title="Autonomous Calendar Assistant", page_icon="📅")
@@ -39,17 +38,17 @@ def agent_page():
     st.title("Autonomous Calendar Agent")
     
     try:
-   
+        # Get the service again
         service = get_calendar_service()
         
-        
+        # Create our intelligent agent
         agent = SchedulingAgent(service)
         
-       
-        st.write("### AI Calendar Assistant")
-        
+        # User Interface
+        st.write("### Your AI Calendar Assistant")
+        st.write("I can help schedule meetings, find optimal times, and manage your calendar intelligently.")
         
-      
+        # Show user preferences
         with st.expander("Your Scheduling Preferences"):
             prefs = agent.preferences
             
@@ -71,378 +70,46 @@ def agent_page():
                 for contact in prefs['frequent_contacts'][:5]:
                     st.write(f"- {contact}")
         
- 
-
-        
-        # Example commands in tabs
-        example_tabs = st.tabs(["Scheduling", "Finding", "Managing", "Availability"])
-        
-        with example_tabs[0]:
-            st.markdown("""
-            **Example scheduling commands:**
-            - Schedule a meeting with Alex tomorrow at 2pm
-            - Set up a 30 minute call with Morgan next Friday
-            - Find a good time to meet with Taylor next week
-            - Book a 1 hour meeting with the team on Monday
-            """)
-            
-        with example_tabs[1]:
-            st.markdown("""
-            **Example finding commands:**
-            - Find all meetings with Alex
-            - Show me meetings for next Monday
-            - What meetings do I have with the team this month?
-            - Find my meetings for the week of June 10th
-            """)
-            
-        with example_tabs[2]:
-            st.markdown("""
-            **Example management commands:**
-            - Cancel my meeting with Alex on Friday
-            - Reschedule my call with Morgan to next Tuesday at 3pm
-            - Move my 2pm meeting to 4pm tomorrow
-            - Delete all meetings with Marketing team
-            """)
-            
-        with example_tabs[3]:
-            st.markdown("""
-            **Example availability commands:**
-            - When am I free tomorrow?
-            - Check my availability for next Wednesday
-            - Find a free slot for a 2 hour meeting next week
-            - What's my schedule for Monday?
-            """)
-        
-
+        # Command input
         command = st.text_area(
-            "Enter your request:",
+            "What would you like to do?", 
             height=100,
-            placeholder="Type your request here..."
+            placeholder="Examples:\n- Schedule a meeting with Alex next week\n- Find a good time to meet with Taylor\n- Set up a 30 minute call with Morgan tomorrow"
         )
         
-   
+        # Process the command
         if st.button("Process"):
             if not command:
                 st.warning("Please enter a command first.")
                 return
                 
             with st.spinner("Processing your request..."):
-               
-                command_lower = command.lower()
+                result = agent.process_command(command)
                 
-               
-                if any(x in command_lower for x in ["find", "show", "list", "what meeting", "which meeting"]):
-                 
-                    if "with" in command_lower:
-                        person_match = re.search(r'(?:with|and)\s+(\w+(?:\s+\w+)?)', command_lower)
-                        if person_match:
-                            person = person_match.group(1).strip()
-                            
-                            
-                            date_constraints = {}
-                            if "today" in command_lower:
-                                today = datetime.now()
-                                date_constraints["time_min"] = datetime.combine(today.date(), datetime.min.time()).isoformat() + "Z"
-                                date_constraints["time_max"] = datetime.combine(today.date(), datetime.max.time()).isoformat() + "Z"
-                            elif "tomorrow" in command_lower:
-                                tomorrow = datetime.now() + timedelta(days=1)
-                                date_constraints["time_min"] = datetime.combine(tomorrow.date(), datetime.min.time()).isoformat() + "Z"
-                                date_constraints["time_max"] = datetime.combine(tomorrow.date(), datetime.max.time()).isoformat() + "Z"
-                            elif "week" in command_lower:
-                                today = datetime.now()
-                                start_of_week = today - timedelta(days=today.weekday())
-                                end_of_week = start_of_week + timedelta(days=6)
-                                date_constraints["time_min"] = datetime.combine(start_of_week.date(), datetime.min.time()).isoformat() + "Z"
-                                date_constraints["time_max"] = datetime.combine(end_of_week.date(), datetime.max.time()).isoformat() + "Z"
-                            
-                            
-                            meetings = find_meetings_with_person(service, "primary", person, **date_constraints)
-                            
-                            if meetings:
-                                st.success(f"Found {len(meetings)} meetings with {person}")
-                                
-                                for i, meeting in enumerate(meetings):
-                                    start_time = meeting['start']
-                                    if 'T' in start_time:
-                                        start_dt = datetime.fromisoformat(start_time.replace('Z', '+00:00'))
-                                        formatted_time = start_dt.strftime("%A, %b %d, %Y at %I:%M %p")
-                                    else:
-                                        formatted_time = start_time
-                                        
-                                    with st.expander(f"{i+1}. {meeting['summary']} - {formatted_time}"):
-                                        st.write(f"**Time:** {formatted_time}")
-                                        st.markdown(f"[View in Calendar]({meeting['htmlLink']})")
-                                        
-                                    
-                                        if st.button(f"Cancel this meeting", key=f"cancel_{i}"):
-                                            try:
-                                                service.events().delete(calendarId="primary", eventId=meeting['id']).execute()
-                                                st.success("Meeting cancelled!")
-                                                st.rerun()
-                                            except Exception as e:
-                                                st.error(f"Error cancelling meeting: {str(e)}")
-                            else:
-                                st.info(f"No meetings found with {person} in the specified time range.")
-                            
-             
-                    elif any(x in command_lower for x in ["today", "tomorrow", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"]):
-                       
-                        date_value = None
-                        
-                        if "today" in command_lower:
-                            date_value = datetime.now().date()
-                        elif "tomorrow" in command_lower:
-                            date_value = (datetime.now() + timedelta(days=1)).date()
-                        else:
-                          
-                            day_mapping = {
-                                "monday": 0, "tuesday": 1, "wednesday": 2, 
-                                "thursday": 3, "friday": 4, "saturday": 5, "sunday": 6
-                            }
-                            
-                            for day_name, day_number in day_mapping.items():
-                                if day_name in command_lower:
-                                    today = datetime.now()
-                                    days_ahead = (day_number - today.weekday()) % 7
-                                    if days_ahead == 0:  # Today
-                                        days_ahead = 7  # Next week
-                                    date_value = (today + timedelta(days=days_ahead)).date()
-                                    break
-                        
-                        if date_value:
+                # Display results based on status
+                if result["status"] == "created":
+                    st.success(result["message"])
+                    st.markdown(f"[View in Calendar]({result['event_link']})")
                     
-                            start_dt = datetime.combine(date_value, datetime.min.time())
-                            end_dt = datetime.combine(date_value, datetime.max.time())
-                            
-                            time_min = start_dt.isoformat() + "Z"
-                            time_max = end_dt.isoformat() + "Z"
-                            
-                            try:
-                                events_result = service.events().list(
-                                    calendarId="primary",
-                                    timeMin=time_min,
-                                    timeMax=time_max,
-                                    singleEvents=True,
-                                    orderBy='startTime'
-                                ).execute()
-                                
-                                events = events_result.get('items', [])
-                                
-                                if events:
-                                    date_str = start_dt.strftime("%A, %B %d, %Y")
-                                    st.success(f"Your schedule for {date_str}:")
-                                    
-                                    for i, event in enumerate(events):
-                                        summary = event.get('summary', 'No Title')
-                                        start = event['start'].get('dateTime', event['start'].get('date'))
-                                        
-                                        if 'T' in start:
-                                            start_dt = datetime.fromisoformat(start.replace('Z', '+00:00'))
-                                            time_str = start_dt.strftime("%I:%M %p")
-                                        else:
-                                            time_str = "All day"
-                                        
-                                        with st.expander(f"{i+1}. {summary} at {time_str}"):
-                                            st.markdown(f"**Event:** {summary}")
-                                            st.markdown(f"**Time:** {time_str}")
-                                            st.markdown(f"[View in Calendar]({event.get('htmlLink', '#')})")
-                                            
-                                            
-                                            if st.button(f"Cancel this event", key=f"cancel_event_{i}"):
-                                                try:
-                                                    service.events().delete(calendarId="primary", eventId=event['id']).execute()
-                                                    st.success("Event cancelled!")
-                                                    st.rerun()
-                                                except Exception as e:
-                                                    st.error(f"Error cancelling event: {str(e)}")
-                                else:
-                                    st.info(f"You have no events scheduled for {start_dt.strftime('%A, %B %d')}.")
-                            except Exception as e:
-                                st.error(f"Error fetching events: {str(e)}")
-                    
-                   
-                    else:
-                        result = agent.process_command(command)
-                        
-                        if result["status"] == "suggestions":
-                            st.info(result["message"])
-                            for i, slot in enumerate(result["slots"]):
-                                st.write(f"{i+1}. {slot}")
-                        else:
-                            st.info("I couldn't find specific meetings. Try adding more details like a person's name or a date.")
+                    # Show alternatives if available
+                    if "alternatives" in result and result["alternatives"]:
+                        st.markdown("**Alternative times that would also work:**")
+                        for i, alt in enumerate(result["alternatives"]):
+                            if isinstance(alt, dict) and 'start' in alt:
+                                start_dt = datetime.fromisoformat(alt['start'].replace('Z', '+00:00'))
+                                st.write(f"{i+1}. {start_dt.strftime('%A, %b %d at %I:%M %p')}")
                 
-              
-                elif any(x in command_lower for x in ["schedule", "set up", "create", "book", "plan", "arrange"]):
-                   
-                    result = agent.process_command(command)
-                    
-                    if result["status"] == "created":
-                        st.success(result["message"])
-                        st.markdown(f"[View in Calendar]({result['event_link']})")
-                        
-                 
-                        if "alternatives" in result and result["alternatives"]:
-                            st.markdown("**Alternative times that would also work:**")
-                            for i, alt in enumerate(result["alternatives"]):
-                                if isinstance(alt, dict) and 'start' in alt:
-                                    start_dt = datetime.fromisoformat(alt['start'].replace('Z', '+00:00'))
-                                    st.write(f"{i+1}. {start_dt.strftime('%A, %b %d at %I:%M %p')}")
-                    
-                    elif result["status"] == "rescheduled":
-                        st.warning(result["message"])
-                        st.markdown(f"[View in Calendar]({result['event_link']})")
-                    
-                    else:
-                        st.error(result["message"])
+                elif result["status"] == "rescheduled":
+                    st.warning(result["message"])
+                    st.markdown(f"[View in Calendar]({result['event_link']})")
                 
-              
-                elif any(x in command_lower for x in ["cancel", "delete", "remove"]):
-             
-                    person_match = re.search(r'(?:with|and)\s+(\w+(?:\s+\w+)?)', command_lower)
-                    if person_match:
-                        person = person_match.group(1).strip()
-                        
-                    
-                        meetings = find_meetings_with_person(service, "primary", person)
-                        
-                        if meetings:
-                            st.warning(f"Found {len(meetings)} meetings with {person}. Which one would you like to cancel?")
-                            
-                            for i, meeting in enumerate(meetings):
-                                start_time = meeting['start']
-                                if 'T' in start_time:
-                                    start_dt = datetime.fromisoformat(start_time.replace('Z', '+00:00'))
-                                    formatted_time = start_dt.strftime("%A, %b %d, %Y at %I:%M %p")
-                                else:
-                                    formatted_time = start_time
-                                    
-                                col1, col2 = st.columns([3, 1])
-                                with col1:
-                                    st.write(f"**{i+1}. {meeting['summary']}** - {formatted_time}")
-                                with col2:
-                                    if st.button(f"Cancel", key=f"cancel_meeting_{i}"):
-                                        try:
-                                            service.events().delete(calendarId="primary", eventId=meeting['id']).execute()
-                                            st.success(f"Meeting '{meeting['summary']}' cancelled!")
-                                            st.rerun()
-                                        except Exception as e:
-                                            st.error(f"Error cancelling meeting: {str(e)}")
-                        else:
-                            st.info(f"No upcoming meetings found with {person}.")
-                    else:
-                        st.warning("Please specify whose meeting you want to cancel (e.g., 'Cancel meeting with Alex')")
+                elif result["status"] == "suggestions":
+                    st.info(result["message"])
+                    for i, slot in enumerate(result["slots"]):
+                        st.write(f"{i+1}. {slot}")
                 
-       
-                elif any(x in command_lower for x in ["free", "available", "when can i", "availability"]):
-               
-                    date_value = None
-                    
-                    if "today" in command_lower:
-                        date_value = datetime.now().date()
-                    elif "tomorrow" in command_lower:
-                        date_value = (datetime.now() + timedelta(days=1)).date()
-                    else:
-                    
-                        day_mapping = {
-                            "monday": 0, "tuesday": 1, "wednesday": 2, 
-                            "thursday": 3, "friday": 4, "saturday": 5, "sunday": 6
-                        }
-                        
-                        for day_name, day_number in day_mapping.items():
-                            if day_name in command_lower:
-                                today = datetime.now()
-                                days_ahead = (day_number - today.weekday()) % 7
-                                if days_ahead == 0:  # Today
-                                    days_ahead = 7  # Next week
-                                date_value = (today + timedelta(days=days_ahead)).date()
-                                break
-                    
-                   
-                    if not date_value:
-                        date_value = (datetime.now() + timedelta(days=1)).date()
-                    
-                   
-                    start_dt = datetime.combine(date_value, datetime.min.time().replace(hour=9))  # 9 AM
-                    end_dt = datetime.combine(date_value, datetime.min.time().replace(hour=17))   # 5 PM
-                    
-                    time_min = start_dt.isoformat() + "Z"
-                    time_max = end_dt.isoformat() + "Z"
-                    
-                  
-                    freebusy_query = {
-                        "timeMin": time_min,
-                        "timeMax": time_max,
-                        "items": [{"id": "primary"}]
-                    }
-                    
-                    try:
-                        freebusy_result = service.freebusy().query(body=freebusy_query).execute()
-                        busy_slots = freebusy_result['calendars']['primary']['busy']
-                        
-                        date_str = start_dt.strftime("%A, %B %d")
-                        
-                        if busy_slots:
-                            st.info(f"Your availability for {date_str}:")
-                            
-                            # Create a timeline from 9 AM to 5 PM
-                            hour_slots = []
-                            for hour in range(9, 18):
-                                slot_start = datetime.combine(date_value, datetime.min.time().replace(hour=hour))
-                                slot_end = slot_start + timedelta(hours=1)
-                                
-                                # Check if this slot overlaps with any busy time
-                                is_busy = False
-                                for busy in busy_slots:
-                                    busy_start = datetime.fromisoformat(busy['start'].replace('Z', '+00:00'))
-                                    busy_end = datetime.fromisoformat(busy['end'].replace('Z', '+00:00'))
-                                    
-                                    if (slot_start < busy_end and slot_end > busy_start):
-                                        is_busy = True
-                                        break
-                                
-                                hour_slots.append({
-                                    "hour": hour,
-                                    "is_busy": is_busy,
-                                    "time_str": slot_start.strftime("%I:%M %p")
-                                })
-                            
-                            # Display timeline
-                            col1, col2 = st.columns([1, 3])
-                            with col1:
-                                st.markdown("**Time**")
-                                for slot in hour_slots:
-                                    st.write(slot["time_str"])
-                            
-
-                            with col2:
-                                st.markdown("**Status**")
-                                for slot in hour_slots:
-                                    if slot["is_busy"]:
-                                        st.markdown("🔴 Busy")
-                                    else:
-                                        st.markdown("🟢 Available")
-                                        
-                        else:
-                            st.success(f"You're completely free on {date_str} from 9 AM to 5 PM!")
-                    except Exception as e:
-                        st.error(f"Error checking availability: {str(e)}")
-                
-
                 else:
-                    result = agent.process_command(command)
-                    
-                    if result["status"] == "created":
-                        st.success(result["message"])
-                        st.markdown(f"[View in Calendar]({result['event_link']})")
-                    elif result["status"] == "rescheduled":
-                        st.warning(result["message"])
-                        st.markdown(f"[View in Calendar]({result['event_link']})")
-                    elif result["status"] == "suggestions":
-                        st.info(result["message"])
-                        for i, slot in enumerate(result["slots"]):
-                            st.write(f"{i+1}. {slot}")
-                    else:
-                        st.error(result["message"])
+                    st.error(result["message"])
     
     except Exception as e:
         st.error(f"Error: {str(e)}")
@@ -450,11 +117,11 @@ def agent_page():
         st.session_state['authenticated'] = False
         st.rerun()
 
-
+# Main app logic
 if 'authenticated' not in st.session_state:
     st.session_state['authenticated'] = False
 
-
+# Add logout button in sidebar
 if st.session_state['authenticated']:
     if st.sidebar.button("Logout"):
         st.session_state['authenticated'] = False
@@ -462,7 +129,7 @@ if st.session_state['authenticated']:
             del st.session_state['user_token']
         st.rerun()
 
-
+# Show appropriate page
 if st.session_state['authenticated']:
     agent_page()
 else: