fix: update session loading parameter to filter sessions older than 6 months

Author: hanhou

code/Home.py

@@ -302,7 +302,7 @@ def show_curriculums():
 
 
 # ------- Layout starts here -------- #
-def init(if_load_bpod_data_override=None, if_load_docDB_override=None, if_load_sessions_older_than_one_year_override=None):
+def init(if_load_bpod_data_override=None, if_load_docDB_override=None, if_load_sessions_older_than_6_month_override=None):
 
     # Clear specific session state and all filters
     for key in st.session_state:
@@ -319,16 +319,25 @@ def init(if_load_bpod_data_override=None, if_load_docDB_override=None, if_load_s
         if 'if_load_bpod_sessions' in st.session_state
         else False)
     st.session_state.bpod_loaded = _if_load_bpod
-    
-    _if_load_sessions_older_than_one_year = if_load_bpod_data_override if if_load_sessions_older_than_one_year_override is not None else (
-        st.query_params['if_load_sessions_older_than_one_year'].lower() == 'true'
-        if 'if_load_sessions_older_than_one_year' in st.query_params
-        else st.session_state.if_load_sessions_older_than_one_year 
-        if 'if_load_sessions_older_than_one_year' in st.session_state
-        else False)
-    
+
+    _if_load_sessions_older_than_6_month = (
+        if_load_sessions_older_than_6_month_override
+        if if_load_sessions_older_than_6_month_override is not None
+        else (
+            st.query_params["if_load_sessions_older_than_6_month"].lower() == "true"
+            if "if_load_sessions_older_than_6_month" in st.query_params
+            else (
+                st.session_state.if_load_sessions_older_than_6_month
+                if "if_load_sessions_older_than_6_month" in st.session_state
+                else False
+            )
+        )
+    )
+
     # --- Load data using aind-analysis-arch-result-access ---
-    df_han = get_session_table(if_load_bpod=_if_load_bpod, if_load_sessions_older_than_one_year=_if_load_sessions_older_than_one_year_override)
+    # Convert boolean to months: if True, load all sessions (None), if False, load only recent 6 months
+    only_recent_n_month = None if _if_load_sessions_older_than_6_month else 6
+    df_han = get_session_table(if_load_bpod=_if_load_bpod, only_recent_n_month=only_recent_n_month)
     df = {'sessions_main': df_han}  # put it in df['session_main'] for backward compatibility
 
     if not len(df):
@@ -346,7 +355,6 @@ def init(if_load_bpod_data_override=None, if_load_docDB_override=None, if_load_s
     # Some ad-hoc modifications on df_sessions
     _df = st.session_state.df['sessions_main'].copy()
 
-
     # -- overwrite the `if_stage_overriden_by_trainer`
     # Previously it was set to True if the trainer changes stage during a session.
     # But it is more informative to define it as whether the trainer has overridden the curriculum.
@@ -460,10 +468,10 @@ def app():
 
         with cols[1]:
             with st.form(key='load_settings', clear_on_submit=False):
-                if_load_sessions_older_than_one_year = checkbox_wrapper_for_url_query(
+                if_load_sessions_older_than_6_month = checkbox_wrapper_for_url_query(
                     st_prefix=st,
-                    label='Include sessions older than one year (reload after change)',
-                    key='if_load_sessions_older_than_one_year',
+                    label='Include sessions older than 6 months (reload after change)',
+                    key='if_load_sessions_older_than_6_month',
                     default=False,
                 )
                 if_load_bpod_sessions = checkbox_wrapper_for_url_query(
@@ -709,4 +717,4 @@ def add_main_tabs():
         st.markdown('####  1. Reload the page')
         st.markdown('####  2. Click this original URL https://foraging-behavior-browser.allenneuraldynamics-test.org/')
         st.markdown('####  3. Report your bug here: https://github.com/AllenNeuralDynamics/foraging-behavior-browser/issues (paste your URL and screenshoots)')
-        raise e
+        raise e

code/pages/0_Data inventory.py

@@ -559,6 +559,6 @@ def add_venn_diagrms(df_merged):
     # Share the same master df as the Home page
     if "df" not in st.session_state or "sessions_main" not in st.session_state.df.keys() or not st.session_state.bpod_loaded:
         st.spinner("Loading data from Han temp pipeline...")
-        init(if_load_docDB_override=False, if_load_bpod_data_override=True, if_load_sessions_older_than_one_year_override=True)
+        init(if_load_docDB_override=False, if_load_bpod_data_override=True, if_load_sessions_older_than_6_month_override=True)
 
     app()