Update macro tables to fetch site-specific data and enhance filtering options for main slate matchups

src/streamlit_app.py

@@ -128,11 +128,11 @@ def init_DEM():
 @st.cache_resource(ttl = 600)
 def init_macro_tables():
 
-    json_matchups = requests.get(NBA_DATA + '?sheet=DEM%20Matchups').json()
+    json_matchups = requests.get(NBA_DATA + '?sheet=Site_Info').json()
     raw_display = pd.DataFrame(json_matchups)
     raw_display = raw_display.reset_index(drop=True)
-    matchups = raw_display[raw_display['Var'] != ""]
-    matchups_dict = dict(zip(matchups['Team'], matchups['Opp']))
+    dk_main_slate = raw_display['DK Main'].values.tolist()
+    fd_main_slate = raw_display['FD Main'].values.tolist()
 
     team_macro_json = requests.get(NBA_DATA + '?sheet=Team_Macro').json()
     team_macro_frame = pd.DataFrame(team_macro_json)
@@ -170,7 +170,7 @@ def init_macro_tables():
     team_matchup_frame = team_matchup_frame.reset_index(drop=True)
     team_matchup_frame = team_matchup_frame.apply(pd.to_numeric, errors='coerce').fillna(team_matchup_frame)
 
-    return team_off_frame, team_def_frame, team_combo_frame, team_matchup_frame, matchups, matchups_dict
+    return team_off_frame, team_def_frame, team_combo_frame, team_matchup_frame, dk_main_slate, fd_main_slate
 
 def convert_df_to_csv(df):
     return df.to_csv().encode('utf-8')
@@ -243,15 +243,17 @@ if selected_tab == 'DEM Matchups':
         )
 
 if selected_tab == 'Team Macro Tables':
-    team_off_frame, team_def_frame, team_combo_frame, team_matchup_frame, matchups, matchups_dict = init_macro_tables()
+    team_off_frame, team_def_frame, team_combo_frame, team_matchup_frame, dk_main_slate, fd_main_slate = init_macro_tables()
     col1, col2 = st.columns([1, 9])
     with col1:
         if st.button("Reset Data", key='reset2'):
                 st.cache_data.clear()
-                team_off_frame, team_def_frame, team_combo_frame, team_matchup_frame, matchups, matchups_dict = init_macro_tables()
-        macro_split_var = st.radio("View all teams or just this main slate's matchups?", ('Slate Matchups', 'All'), key='macro_split_var')
-        if macro_split_var == 'Slate Matchups':
-            macro_view_var = matchups.Opp.values.tolist()
+                team_off_frame, team_def_frame, team_combo_frame, team_matchup_frame, dk_main_slate, fd_main_slate = init_macro_tables()
+        macro_split_var = st.radio("View all teams or just this main slate's matchups?", ('DK Main Slate', 'FD Main Slate', 'All'), key='macro_split_var')
+        if macro_split_var == 'DK Main Slate':
+            macro_view_var = dk_main_slate
+        if macro_split_var == 'FD Main Slate':
+            macro_view_var = fd_main_slate
         if macro_split_var == 'All':
             macro_view_var = team_off_frame.Team.values.tolist()
         table_var2 = st.selectbox("Select Table", options=['Team Offense', 'Team Defense', 'Team Combo', 'Team Matchups'], key='table_var2')