Update to fix ecr using PPR-Superflex

src/pages/1_Keepers.py

@@ -18,20 +18,29 @@ def load_player_ids() -> pd.DataFrame:
 
 
 def load_adp() -> pd.DataFrame:
-    df = pd.read_csv(r"https://raw.githubusercontent.com/dynastyprocess/data/master/files/values-players.csv")
+    df = pd.read_csv(r"https://raw.githubusercontent.com/dynastyprocess/data/master/files/db_fpecr_latest.csv")
+    df = df.loc[
+        df.fp_page == "/nfl/rankings/ppr-superflex-cheatsheets.php",
+        [
+            "yahoo_id",
+            "ecr",
+            "sd",
+        ],
+    ]
     return df
 
 
-def convert_ecr_to_round_val(ecr_float: float) -> float:
+def convert_ecr_to_round_val(ecr_float: float, round_offset: float = 1.0, pick_offset: float = -1.0) -> float:
     # As a float, store pick 1 of round 1 as 1.0
-    return 1.0 + (ecr_float - 1.0) / LEAGUE_NUMBER_TEAMS
+    return round_offset + (ecr_float + pick_offset) / LEAGUE_NUMBER_TEAMS
 
 
 def add_opinionated_keeper_value(df: pd.DataFrame):
-    for score_fmt in ["1qb", "2qb"]:
-        df[f"ecr_{score_fmt}"] = df[f"ecr_{score_fmt}"].apply(convert_ecr_to_round_val)
-        # assumes midround keeper
-        df[f"value_{score_fmt}"] = df["keeper_cost"] + 0.5 - df[f"ecr_{score_fmt}"]
+    df["ecr"] = df["ecr"].apply(convert_ecr_to_round_val)
+    # Convert sd without offset to show as pure pick diff
+    df["sd"] = df["sd"].apply(lambda x: convert_ecr_to_round_val(x, 0, 0))
+    # assumes midround keeper
+    df["value_keeper"] = df["keeper_cost"] + 0.5 - df["ecr"]
 
 
 @st.cache_data(ttl=60 * 60 * 24)
@@ -48,7 +57,7 @@ def load_data():
 
     # Merge ADP
     df_adp = load_adp()
-    data = data.merge(df_adp, how="left", left_on="fantasypros_id", right_on="fp_id", suffixes=("", "_adp"))
+    data = data.merge(df_adp, how="left", left_on="player_id", right_on="yahoo_id", suffixes=("", "_adp"))
     add_opinionated_keeper_value(data)
     return data, teams_list
 
@@ -82,11 +91,8 @@ def filtered_keeper_dataframe(data: pd.DataFrame, teams_list: list[str]):
     adp_cols: list[str] = []
 
     adp_cols_advanced = [
-        "ecr_1qb",
-        "value_1qb",
-        "ecr_2qb",
-        "value_2qb",
-        "ecr_pos",
+        "ecr",
+        "value_keeper",
     ]
 
     if is_advanced:
@@ -114,20 +120,13 @@ def filtered_keeper_dataframe(data: pd.DataFrame, teams_list: list[str]):
                 label="Years Eligible",
                 help="Number of further consecutive seasons player can be kept (subject to maximum of 2)",
             ),
-            "ecr_1qb": st.column_config.NumberColumn(
-                label="ECR 1QB", help="Player's average draft round.pick Expert Consensus Rank (ECR) for 1 QB League"
-            ),
-            "value_1qb": st.column_config.NumberColumn(
-                label="Value 1QB", help="Approx. number of draft rounds of keeper value vs ECR 1QB"
-            ),
-            "ecr_2qb": st.column_config.NumberColumn(
-                label="ECR 2QB", help="Player's average draft round.pick Expert Consensus Rank (ECR) for 2 QB League"
-            ),
-            "value_2qb": st.column_config.NumberColumn(
-                label="Value 2QB", help="Approx. number of draft rounds of keeper value vs ECR 2QB"
+            "ecr": st.column_config.NumberColumn(
+                label="ECR",
+                help="Player's average draft round.pick Expert Consensus Rank (ECR) for PPR - Superflex League",
             ),
-            "ecr_pos": st.column_config.NumberColumn(
-                label="ECR Position", help="Player's average Expert Consensus Rank (ECR) at the player's position"
+            "value_keeper": st.column_config.NumberColumn(
+                label="Value Keeper",
+                help="Approx. number of draft rounds of keeper value vs ECR PPR - Superflex League",
             ),
         },
     )