Add adp data and extra optional filters

src/pages/1_Keepers.py

@@ -3,9 +3,22 @@ import pandas as pd
 import streamlit as st
 
 from config import DEFAULT_ICON, LEAGUE_NAME
+from streamlit_filter import filter_dataframe
 
 
 KEEPER_DATA_URL = "../../tests/mocks/2023_keepers.csv"
+HEADSHOT_DATA_URL = "../../tests/mocks/2023_player_headshots.csv"
+
+
+def load_player_ids() -> pd.DataFrame:
+    df = pd.read_csv(r"https://raw.githubusercontent.com/dynastyprocess/data/master/files/db_playerids.csv")
+    df["merge_id"] = df["yahoo_id"].combine_first(df["stats_id"])
+    return df
+
+
+def load_adp() -> pd.DataFrame:
+    df = pd.read_csv(r"https://raw.githubusercontent.com/dynastyprocess/data/master/files/values-players.csv")
+    return df
 
 
 @st.cache_data
@@ -15,6 +28,15 @@ def load_data():
     data["position"] = data["eligible_positions"].apply(lambda x: eval(x)[0])
     data.columns = data.columns.str.lower()
     teams_list = sorted(list(data["team_name"].unique()))
+
+    # Merge player ids
+    df_player_ids = load_player_ids()
+    data = data.merge(df_player_ids, how="left", left_on="player_id", right_on="merge_id", suffixes=("", "_ids"))
+
+    # Merge ADP
+    df_adp = load_adp()
+    data = data.merge(df_adp, how="left", left_on="fantasypros_id", right_on="fp_id", suffixes=("", "_adp"))
+
     return data, teams_list
 
 
@@ -22,19 +44,24 @@ def filtered_keeper_dataframe(data: pd.DataFrame, teams_list: list[str]):
     teams_selected = st.multiselect("Team:", teams_list)
     teams_filter = data["team_name"].isin(teams_selected) if teams_selected else data["team_name"].isin(teams_list)
 
-    filtered_data = data.loc[teams_filter]
+    show_columns = [
+        "team_name",
+        "name",
+        "team",
+        "position",
+        "keeper_cost",
+        "years_eligible",
+        "eligible",
+        "ecr_1qb",
+        "ecr_2qb",
+        "ecr_pos",
+    ]
+
+    filtered_data = data.loc[teams_filter, show_columns]
     st.dataframe(
-        filtered_data,
+        filter_dataframe(filtered_data),
         hide_index=True,
         use_container_width=True,
-        column_order=[
-            "team_name",
-            "name",
-            "position",
-            "keeper_cost",
-            "years_eligible",
-            "eligible",
-        ],
         column_config={},
     )
 

src/streamlit_filter.py

@@ -20,7 +20,7 @@ def filter_dataframe(df: pd.DataFrame) -> pd.DataFrame:
     Returns:
         pd.DataFrame: Filtered dataframe
     """
-    modify = st.checkbox("Add filters")
+    modify = st.checkbox("Add more filters")
 
     if not modify:
         return df