Update app.py

app.py

@@ -11,6 +11,27 @@ CLIENT_SECRET_KEY = os.getenv('CLIENT_SECRET_KEY')
 AUTHORITY_URL = 'https://login.microsoftonline.com/common'
 REDIRECT_URI = 'https://huggingface.co/spaces/awacke1/MSGraphAPI'
 
+# 1. Configuration
+Site_Name = '🏠Event 📅Schedule and 📝Agenda 🔍Dashboard'
+title="🏠Event 📅Schedule and 📝Agenda 🔍Dashboard"
+helpURL='https://huggingface.co/awacke1'
+bugURL='https://huggingface.co/spaces/awacke1'
+icons='📅'
+#icons = Image.open("icons.ico")
+st.set_page_config(
+    page_title=title,
+    page_icon=icons,
+    layout="wide",
+    #initial_sidebar_state="expanded",
+    initial_sidebar_state="auto",
+    menu_items={
+        'Get Help': helpURL,
+        'Report a bug': bugURL,
+        'About': title
+    }
+)
+
+# Sticky navigation menu
 def sticky_menu():
     st.markdown(
         """
@@ -47,195 +68,7 @@ def sticky_menu():
         """,
         unsafe_allow_html=True
     )
-
-def dashboard(access_token):
-    st.subheader("1️⃣ Dashboard")
-    
-    # Timeframe selector
-    timeframe = st.selectbox("Select Timeframe", ["Day", "Week", "Month"])
-    
-    now = datetime.now()
-    
-    if timeframe == "Day":
-        start_time = now.replace(hour=0, minute=0, second=0)
-        end_time = now.replace(hour=23, minute=59, second=59)
-    elif timeframe == "Week":
-        start_time = now - timedelta(days=now.weekday())  # Start of the week (Monday)
-        end_time = start_time + timedelta(days=6)
-    elif timeframe == "Month":
-        start_time = now.replace(day=1, hour=0, minute=0, second=0)
-        next_month = (now.month % 12) + 1
-        end_time = start_time.replace(month=next_month, day=1) - timedelta(days=1)
-    
-    # Fetch and display calendar events for the selected timeframe
-    events = make_api_call(access_token, f"me/calendarView?startDateTime={start_time.isoformat()}&endDateTime={end_time.isoformat()}&$orderby=start/dateTime")
-    
-    if events and 'value' in events:
-        st.write(f"📅 Events from {start_time.date()} to {end_time.date()}")
-        for event in events['value']:
-            start_date = datetime.fromisoformat(event['start']['dateTime'][:-1])
-            st.write(f"**{event['subject']}** | {start_date.strftime('%Y-%m-%d %H:%M')}")
-            st.write("---")
-    else:
-        st.write("No events found or unable to fetch events.")
-        
-def landing_page():
-    st.subheader("🏠 Landing Page")
-    st.write("Welcome to the app! Use the menu above to navigate.")
-    
-def upcoming_events(access_token):
-    st.subheader("📅 Upcoming Events")
-    
-    # Show upcoming events from the current date
-    now = datetime.now()
-    events = make_api_call(access_token, f"me/calendar/events?$top=10&$orderby=start/dateTime&$filter=start/dateTime ge {now.isoformat()}")
-    
-    if events and 'value' in events:
-        st.write("Upcoming Events:")
-        for event in events['value']:
-            start_date = datetime.fromisoformat(event['start']['dateTime'][:-1])
-            st.write(f"**{event['subject']}** | {start_date.strftime('%Y-%m-%d %H:%M')}")
-            st.write("---")
-    else:
-        st.write("No upcoming events.")
-
-def schedule(access_token):
-    st.subheader("📆 Schedule")
-    
-    # Display a weekly or daily schedule from the current date
-    now = datetime.now()
-    week_start = now - timedelta(days=now.weekday())  # Start of the week (Monday)
-    week_end = week_start + timedelta(days=6)
-    
-    st.write(f"Schedule for the week {week_start.strftime('%Y-%m-%d')} to {week_end.strftime('%Y-%m-%d')}")
-    
-    events = make_api_call(access_token, f"me/calendarView?startDateTime={week_start.isoformat()}&endDateTime={week_end.isoformat()}&$orderby=start/dateTime")
-    
-    if events and 'value' in events:
-        for event in events['value']:
-            start_date = datetime.fromisoformat(event['start']['dateTime'][:-1])
-            st.write(f"**{event['subject']}** | {start_date.strftime('%Y-%m-%d %H:%M')}")
-            st.write("---")
-    else:
-        st.write("No events found.")
-        
-def agenda(access_token):
-    st.subheader("📝 Agenda")
-    
-    # Display a list of tasks or meetings
-    tasks = make_api_call(access_token, 'me/todo/lists')
-    if tasks and 'value' in tasks:
-        st.write("Agenda Items:")
-        for task in tasks['value']:
-            st.write(f"Task: {task['title']}")
-            st.write("---")
-    else:
-        st.write("No tasks or agenda items.")
-        
-def event_details(access_token):
-    st.subheader("🔍 Event Details")
-    
-    # Fetch and display details for a specific event
-    event_id = st.text_input("Enter Event ID")
-    
-    if event_id:
-        event = make_api_call(access_token, f'me/events/{event_id}')
-        if event:
-            st.write(f"Event: {event['subject']}")
-            st.write(f"Start: {event['start']['dateTime']}")
-            st.write(f"End: {event['end']['dateTime']}")
-            st.write(f"Description: {event.get('bodyPreview', 'No description')}")
-        else:
-            st.write("Unable to fetch event details.")
-
-def add_event(access_token):
-    st.subheader("➕ Add Event")
-    
-    # Create event
-    event_subject = st.text_input("Event Subject")
-    event_date = st.date_input("Event Date")
-    event_time = st.time_input("Event Time")
-    
-    if st.button("Add Event"):
-        event_start = datetime.combine(event_date, event_time)
-        event_end = event_start + timedelta(hours=1)
-        
-        new_event = {
-            "subject": event_subject,
-            "start": {
-                "dateTime": event_start.isoformat(),
-                "timeZone": "UTC"
-            },
-            "end": {
-                "dateTime": event_end.isoformat(),
-                "timeZone": "UTC"
-            }
-        }
-        
-        result = make_api_call(access_token, 'me/events', method='POST', data=new_event)
-        if result:
-            st.success("Event added successfully!")
-        else:
-            st.error("Failed to add event.")
-
-def filter_by(access_token):
-    st.subheader("🔎 Filter By")
-    
-    # Filter calendar events by title, date range, or organizer
-    filter_by_title = st.text_input("Event Title Contains")
-    filter_by_start_date = st.date_input("Start Date After", datetime.now() - timedelta(days=30))
-    filter_by_end_date = st.date_input("End Date Before", datetime.now() + timedelta(days=30))
-    
-    filters = []
-    if filter_by_title:
-        filters.append(f"contains(subject, '{filter_by_title}')")
-    if filter_by_start_date:
-        filters.append(f"start/dateTime ge {filter_by_start_date.isoformat()}T00:00:00Z")
-    if filter_by_end_date:
-        filters.append(f"end/dateTime le {filter_by_end_date.isoformat()}T23:59:59Z")
-    
-    filter_query = " and ".join(filters) if filters else ''
-    events_endpoint = f"me/calendarView?startDateTime={filter_by_start_date.isoformat()}&endDateTime={filter_by_end_date.isoformat()}&$orderby=start/dateTime"
-    
-    if filter_query:
-        events_endpoint += f"&$filter={filter_query}"
-    
-    events = make_api_call(access_token, events_endpoint)
     
-    if events and 'value' in events:
-        for event in events['value']:
-            start_date = datetime.fromisoformat(event['start']['dateTime'][:-1])
-            st.write(f"**{event['subject']}** | {start_date.strftime('%Y-%m-%d %H:%M')}")
-            st.write("---")
-    else:
-        st.write("No events found.")
-
-
-
-
-ProductNaming='''
-🌌🔗 Git Cosmos Glow: Graph & Mobile Flow 📱💫
-🚀📊 Cosmic Git Wit: Graph Power, Mobile Hit 📲✨
-🌠🔧 Git Galaxy Gear: Graph Magic, Mobile Clear 📱🎩
-🌌🔍 Cosmos Code Quest: Graph Zest, Mobile Best 📲🏆
-🚀💾 Git Star Suite: Graph Might, Mobile Delight 📱✨
-🌠🔗 Cosmic Link Sync: Graph Blink, Mobile Think 📲💡
-🌌🛠️ Git Nebula Tools: Graph Rules, Mobile Cools 📱❄️
-🚀🔮 Cosmos Code Charm: Graph Farm, Mobile Arm 📲💪
-🌠🔍 Git Galaxy Sight: Graph Bright, Mobile Light 📱💡
-🌌🚀 Cosmic Git Flight: Graph Insight, Mobile Might 📲💥
-
-"1️⃣ Dashboard",
-"🏠 Landing Page",
-"📅 Upcoming Events",
-"📆 Schedule",
-"📝 Agenda",
-"🔍 Event Details",
-"➕ Add Event",
-"🔎 Filter By"
-
-'''
-
 # Define product to scope mapping, links, AI capabilities, and Graph solutions
 PRODUCT_SCOPES = {
     "📧 Outlook": {
@@ -390,48 +223,10 @@ def make_api_call(access_token, endpoint, method='GET', data=None):
         st.error(f"API call failed: {response.status_code} - {response.text}")
         return None
 
-
 def handle_outlook_integration(access_token):
     st.subheader("📧 Outlook Integration")
     st.markdown(f"[Open Outlook]({PRODUCT_SCOPES['📧 Outlook']['link']})")
     
-    # Filters for emails
-    st.write("### Filter Emails:")
-    filter_by_sender = st.text_input("Sender Email")
-    filter_by_subject = st.text_input("Subject Contains")
-    filter_by_date = st.date_input("Emails received after", datetime.now() - timedelta(days=30))
-    
-    # Create query filters
-    filters = []
-    if filter_by_sender:
-        filters.append(f"from/emailAddress/address eq '{filter_by_sender}'")
-    if filter_by_subject:
-        filters.append(f"contains(subject, '{filter_by_subject}')")
-    if filter_by_date:
-        filters.append(f"receivedDateTime ge {filter_by_date.isoformat()}T00:00:00Z")
-    
-    filter_query = " and ".join(filters) if filters else ''
-    
-    # Fetch emails with applied filters
-    emails_endpoint = 'me/messages?$top=10'
-    if filter_query:
-        emails_endpoint += f"&$filter={filter_query}&$orderby=receivedDateTime desc"
-    
-    emails = make_api_call(access_token, emails_endpoint)
-    if emails and 'value' in emails:
-        for email in emails['value']:
-            with st.expander(f"From: {email['from']['emailAddress']['name']} - Subject: {email['subject']}"):
-                st.write(f"Received: {email['receivedDateTime']}")
-                st.write(f"Body: {email['bodyPreview']}")
-    else:
-        st.write("No emails found or unable to fetch emails.")
-
-
-
-def handle_outlook_integration_old(access_token):
-    st.subheader("📧 Outlook Integration")
-    st.markdown(f"[Open Outlook]({PRODUCT_SCOPES['📧 Outlook']['link']})")
-    
     # Read emails
     emails = make_api_call(access_token, 'me/messages?$top=10&$orderby=receivedDateTime desc')
     if emails and 'value' in emails:
@@ -493,46 +288,8 @@ def handle_outlook_integration_old(access_token):
         else:
             st.error("Failed to delete email.")
 
-def handle_calendar_integration(access_token):
-    st.subheader("📅 Calendar Integration")
-    st.markdown(f"[Open Calendar]({PRODUCT_SCOPES['📅 Calendar']['link']})")
-    
-    # Filters for calendar events
-    st.write("### Filter Calendar Events:")
-    filter_by_title = st.text_input("Event Title Contains")
-    filter_by_start_date = st.date_input("Start Date After", datetime.now() - timedelta(days=30))
-    filter_by_end_date = st.date_input("End Date Before", datetime.now() + timedelta(days=30))
-    
-    # Create query filters
-    filters = []
-    if filter_by_title:
-        filters.append(f"contains(subject, '{filter_by_title}')")
-    if filter_by_start_date:
-        filters.append(f"start/dateTime ge {filter_by_start_date.isoformat()}T00:00:00Z")
-    if filter_by_end_date:
-        filters.append(f"end/dateTime le {filter_by_end_date.isoformat()}T23:59:59Z")
-    
-    filter_query = " and ".join(filters) if filters else ''
-    
-    # Fetch events with applied filters
-    events_endpoint = f"me/calendarView?startDateTime={filter_by_start_date.isoformat()}T00:00:00&endDateTime={filter_by_end_date.isoformat()}T23:59:59"
-    if filter_query:
-        events_endpoint += f"&$filter={filter_query}&$orderby=start/dateTime"
-    
-    events = make_api_call(access_token, events_endpoint)
-    
-    if events and 'value' in events:
-        st.write("### Upcoming Events")
-        for event in events['value']:
-            start_date = datetime.fromisoformat(event['start']['dateTime'][:-1])  # Remove 'Z' from the end
-            st.write(f"**{event['subject']}** | {start_date.strftime('%Y-%m-%d %H:%M')}")
-            st.write("---")
-    else:
-        st.write("No events found or unable to fetch events.")
-
-
 
-def handle_calendar_integration_old(access_token):
+def handle_calendar_integration(access_token):
     st.subheader("📅 Calendar Integration")
     st.markdown(f"[Open Calendar]({PRODUCT_SCOPES['📅 Calendar']['link']})")
     
@@ -731,13 +488,15 @@ def handle_onedrive_integration(access_token):
         else:
             st.error("Failed to delete file.")
 
+
+
+
 def main():
     st.title("🦄 MS Graph API with AI & Cloud Integration for M365")
 
     # Sticky Menu
     sticky_menu()
-
-    # Sidebar Menu for Product Selection
+    
     st.sidebar.title("📝 M365 Products")
     st.sidebar.write("Select products to integrate:")
     
@@ -749,17 +508,6 @@ def main():
             st.sidebar.write(f"AI Capabilities: {details['ai_capabilities']}")
             st.sidebar.write(f"Graph Solution: {details['graph_solution']}")
 
-    # Handle query parameters via session_state
-    if 'section' not in st.session_state:
-        st.session_state['section'] = 'dashboard'  # Default section is the dashboard
-
-    selected_section = st.session_state['section']
-    
-    # Example of re-running based on interaction (you can change sections)
-    if st.button("Go to Landing Page"):
-        st.session_state['section'] = 'landing-page'
-
-    # Request scopes and authentication management
     request_scopes = BASE_SCOPES.copy()
     for product in selected_products:
         request_scopes.extend(PRODUCT_SCOPES[product]['scopes'])
@@ -775,7 +523,7 @@ def main():
         )
         st.write('👋 Please [click here]({}) to log in and authorize the app.'.format(auth_url))
         
-        query_params = st.session_state.get('query_params', {})
+        query_params = st.query_params
         if 'code' in query_params:
             code = query_params.get('code')
             st.write('🔑 Authorization Code Obtained:', code[:10] + '...')
@@ -784,8 +532,7 @@ def main():
                 access_token = get_access_token(code)
                 st.session_state['access_token'] = access_token
                 st.success("Access token acquired successfully!")
-                # No need for st.experimental_rerun; changing session state triggers rerun
-                st.session_state['section'] = 'dashboard'
+                st.rerun()
             except Exception as e:
                 st.error(f"Error acquiring access token: {str(e)}")
                 st.stop()
@@ -796,6 +543,22 @@ def main():
         if user_info:
             st.sidebar.write(f"👋 Hello, {user_info.get('displayName', 'User')}!")
         
+        if selected_products:
+            for product in selected_products:
+                if product == "📧 Outlook":
+                    handle_outlook_integration(access_token)
+                elif product == "📅 Calendar":
+                    handle_calendar_integration(access_token)
+                elif product == "📋 Tasks":
+                    handle_tasks_integration(access_token)
+                elif product == "🗂️ OneDrive":
+                    handle_onedrive_integration(access_token)
+                # Add more product integrations here
+        else:
+            st.write("No products selected. Please select products from the sidebar.")
+
+
+
         # Handle navigation based on the selected section
         if selected_section == 'dashboard':
             dashboard(access_token)
@@ -814,6 +577,7 @@ def main():
         elif selected_section == 'filter-by':
             filter_by(access_token)
 
+            
 
 if __name__ == "__main__":
     main()