Update app.py

app.py

@@ -240,68 +240,70 @@ def show_google_sign_in(auth_url):
     with st.sidebar:
         if st.button("Sign in with Google"):
             st.write('Please click the link below to sign in:')
-            st.markdown(f'[Google Sign-In]({auth_url})')
-
-def show_property_selection(property_choices):
-    with st.sidebar:
-        selected_property = st.selectbox("Select a property", property_choices, key='selected_property_selector', on_change=property_change)
-        st.session_state.selected_property = selected_property
-        return selected_property
-
-def show_search_type_selection():
-    with st.sidebar:
-        search_type = st.selectbox("Select Search Type", SEARCH_TYPES, index=0)
-        st.session_state.selected_search_type = search_type
-        return search_type
-
-def show_date_range_selection():
-    with st.sidebar:
-        date_range = st.selectbox("Select Date Range", DATE_RANGE_OPTIONS, index=0)
-        st.session_state.selected_date_range = date_range
-        if date_range == "Custom Range":
-            start_date = st.date_input("Start Date", st.session_state.custom_start_date)
-            end_date = st.date_input("End Date", st.session_state.custom_end_date)
-            st.session_state.start_date, st.session_state.end_date = start_date, end_date
-        else:
-            start_date, end_date = calc_date_range(date_range)
-            st.session_state.start_date, st.session_state.end_date = start_date, end_date
-        return start_date, end_date
+            st.markdown(f'[Google Sign-In]({auth_url})', unsafe_allow_html=True)
+
+def show_property_selector(properties, account):
+    selected_property = st.selectbox(
+        "Select a Search Console Property:",
+        properties,
+        index=properties.index(
+            st.session_state.selected_property) if st.session_state.selected_property in properties else 0,
+        key='selected_property_selector',
+        on_change=property_change
+    )
+    return account[selected_property]
+
+def show_search_type_selector():
+    return st.selectbox(
+        "Select Search Type:",
+        SEARCH_TYPES,
+        index=SEARCH_TYPES.index(st.session_state.selected_search_type),
+        key='search_type_selector'
+    )
 
-def show_dimension_selection():
-    with st.sidebar:
-        selected_dimensions = st.multiselect("Select Dimensions", update_dimensions(st.session_state.selected_search_type), default=BASE_DIMENSIONS)
-        st.session_state.selected_dimensions = selected_dimensions
-        return selected_dimensions
+def show_model_type_selector():
+    return st.selectbox(
+        "Select the embedding model:",
+        ["english", "multilingual"],
+        key='model_type_selector'
+    )
 
-def show_device_selection():
-    with st.sidebar:
-        selected_device = st.selectbox("Select Device", DEVICE_OPTIONS, index=0)
-        st.session_state.selected_device = selected_device
-        return selected_device
+def show_date_range_selector():
+    return st.selectbox(
+        "Select Date Range:",
+        DATE_RANGE_OPTIONS,
+        index=DATE_RANGE_OPTIONS.index(st.session_state.selected_date_range),
+        key='date_range_selector'
+    )
 
-def show_embedding_model_selection():
-    with st.sidebar:
-        selected_model = st.radio("Select Embedding Model Type", ("English", "Multilingual"), index=0)
-        return selected_model.lower()
+def show_custom_date_inputs():
+    st.session_state.custom_start_date = st.date_input("Start Date", st.session_state.custom_start_date)
+    st.session_state.custom_end_date = st.date_input("End Date", st.session_state.custom_end_date)
+
+def show_dimensions_selector(search_type):
+    available_dimensions = update_dimensions(search_type)
+    return st.multiselect(
+        "Select Dimensions:",
+        available_dimensions,
+        default=st.session_state.selected_dimensions,
+        key='dimensions_selector'
+    )
 
 def show_paginated_dataframe(report, rows_per_page=20):
     # Convert 'position' column to integer
     report['position'] = report['position'].astype(int)
     
-    # Filter for queries below position 10 and sort by impressions in descending order
-    filtered_report = report[report['position'] < 10].sort_values(by='impressions', ascending=False)
-    
     # Create a clickable URL column
     def make_clickable(url):
         return f'<a href="{url}" target="_blank">{url}</a>'
     
-    filtered_report['clickable_url'] = filtered_report['page'].apply(make_clickable)
+    report['clickable_url'] = report['page'].apply(make_clickable)
     
     # Reorder columns to put clickable_url first
-    columns = ['clickable_url'] + [col for col in filtered_report.columns if col != 'clickable_url' and col != 'page']
-    filtered_report = filtered_report[columns]
+    columns = ['clickable_url'] + [col for col in report.columns if col != 'clickable_url' and col != 'page']
+    report = report[columns]
 
-    total_rows = len(filtered_report)
+    total_rows = len(report)
     total_pages = (total_rows - 1) // rows_per_page + 1
 
     if 'current_page' not in st.session_state:
@@ -321,41 +323,58 @@ def show_paginated_dataframe(report, rows_per_page=20):
     end_idx = start_idx + rows_per_page
     
     # Use st.markdown to display the dataframe with clickable links
-    st.markdown(filtered_report.iloc[start_idx:end_idx].to_html(escape=False, index=False), unsafe_allow_html=True)
-
+    st.markdown(report.iloc[start_idx:end_idx].to_html(escape=False, index=False), unsafe_allow_html=True)
 # -------------
-# Main Function
+# Main Streamlit App Function
 # -------------
 
 def main():
     setup_streamlit()
-    init_session_state()
-    
     client_config = load_config()
-    flow, auth_url = google_auth(client_config)
     
+    if 'auth_flow' not in st.session_state or 'auth_url' not in st.session_state:
+        st.session_state.auth_flow, st.session_state.auth_url = google_auth(client_config)
+
+    query_params = st.experimental_get_query_params()
+    auth_code = query_params.get("code", [None])[0]
+
+    if auth_code and 'credentials' not in st.session_state:
+        st.session_state.auth_flow.fetch_token(code=auth_code)
+        st.session_state.credentials = st.session_state.auth_flow.credentials
+
     if 'credentials' not in st.session_state:
-        show_google_sign_in(auth_url)
+        show_google_sign_in(st.session_state.auth_url)
     else:
-        credentials = st.session_state['credentials']
-        account = auth_search_console(client_config, credentials)
-        property_choices = list_gsc_properties(credentials)
-        selected_property = show_property_selection(property_choices)
-        search_type = show_search_type_selection()
-        start_date, end_date = show_date_range_selection()
-        selected_dimensions = show_dimension_selection()
-        selected_device = show_device_selection()
-        model_type = show_embedding_model_selection()
-        
-        if st.button("Fetch Data"):
-            webproperty = account[selected_property]
-            report = fetch_data_loading(webproperty, search_type, start_date, end_date, selected_dimensions, selected_device, model_type)
-            if not report.empty:
-                show_dataframe(report)
-                show_paginated_dataframe(report)
-                download_csv_link(report)
+        init_session_state()
+        account = auth_search_console(client_config, st.session_state.credentials)
+        properties = list_gsc_properties(st.session_state.credentials)
+
+        if properties:
+            webproperty = show_property_selector(properties, account)
+            search_type = show_search_type_selector()
+            date_range_selection = show_date_range_selector()
+            model_type = show_model_type_selector()  # Add this line
+            if date_range_selection == 'Custom Range':
+                show_custom_date_inputs()
+                start_date, end_date = st.session_state.custom_start_date, st.session_state.custom_end_date
             else:
-                st.write("No data found for the selected criteria.")
+                start_date, end_date = calc_date_range(date_range_selection)
+
+            selected_dimensions = show_dimensions_selector(search_type)
+
+            if 'report_data' not in st.session_state:
+                st.session_state.report_data = None
+
+            if st.button("Fetch Data"):
+                with st.spinner('Fetching data...'):
+                    st.session_state.report_data = fetch_data_loading(webproperty, search_type, start_date, end_date, selected_dimensions, model_type=model_type)  # Update this line
+
+            if st.session_state.report_data is not None and not st.session_state.report_data.empty:
+                show_paginated_dataframe(st.session_state.report_data)
+                download_csv_link(st.session_state.report_data)
+            elif st.session_state.report_data is not None:
+                st.warning("No data found for the selected criteria.")
 
+                
 if __name__ == "__main__":
-    main()
+    main()