Map defensive players and show any unmatched

src/pages/3_Draft_View.py

@@ -14,7 +14,46 @@ def load_yahoo_to_fp_id_map() -> dict[str, str]:
     df = pd.read_csv(r"https://raw.githubusercontent.com/dynastyprocess/data/master/files/db_playerids.csv")
     for id_col in ["yahoo_id", "fantasypros_id"]:
         df[id_col] = df[id_col].fillna(-9999).apply(lambda x: str(int(x)))
-    return df.set_index("yahoo_id")["fantasypros_id"].to_dict()
+
+    player_id_dict = df.set_index("yahoo_id")["fantasypros_id"].to_dict()
+    # map team DST
+    player_id_dict.update(
+        {
+            "100022": "8000",  # Arizona
+            "100001": "8010",  # Atlanta
+            "100033": "8020",  # Baltimore
+            "100002": "8030",  # Buffalo
+            "100029": "8040",  # Carolina
+            "100003": "8050",  # Chicago
+            "100004": "8060",  # Cincinnati
+            "100005": "8070",  # Cleveland
+            "100006": "8080",  # Dallas
+            "100007": "8090",  # Denver
+            "100008": "8100",  # Detroit
+            "100009": "8110",  # Green Bay
+            "100034": "8120",  # Houston
+            "100011": "8130",  # Indianapolis
+            "100030": "8140",  # Jacksonville
+            "100012": "8150",  # Kansas City
+            "100013": "8220",  # Las Vegas
+            "100014": "8280",  # Los Angeles Rams
+            "100024": "8250",  # Los Angeles Chargers
+            "100015": "8160",  # Miami
+            "100016": "8170",  # Minnesota
+            "100017": "8180",  # New England
+            "100018": "8190",  # New Orleans
+            "100019": "8200",  # New York Giants
+            "100020": "8210",  # New York Jets
+            "100021": "8230",  # Philadelphia
+            "100023": "8240",  # Pittsburgh
+            "100025": "8270",  # San Francisco
+            "100026": "8260",  # Seattle
+            "100027": "8290",  # Tampa Bay
+            "100010": "8300",  # Tennessee
+            "100028": "8310",  # Washington
+        }
+    )
+    return player_id_dict
 
 
 def extract_ecr_var_data(request_text_str, var_name: str):
@@ -111,31 +150,40 @@ def get_page():
                 pd.DataFrame(league_settings.roster_positions).set_index("position")["count"],
             )
 
-        draft_result = pd.DataFrame(st.session_state.yahoo_client.get_draft(selected_league))
+        draft_result = st.session_state.yahoo_client.get_draft(selected_league)
         if st.button("Load / Refresh"):
-            draft_result = pd.DataFrame(st.session_state.yahoo_client.get_draft(selected_league))
+            draft_result = st.session_state.yahoo_client.get_draft(selected_league)
         if "player_key" in draft_result:
             draft_result["player_id"] = draft_result["player_key"].apply(lambda x: x.rsplit(".", 1)[-1] if x else x)
         else:
             draft_result["player_id"] = ""
-        draft_result["fp_id"] = draft_result["player_id"].apply(lambda x: load_yahoo_to_fp_id_map().get(x))
-
-        if "team_key" not in draft_result:
-            draft_result["team_key"] = ""
+        draft_result["fp_id"] = draft_result["player_id"].apply(lambda x: load_yahoo_to_fp_id_map().get(x, x))
 
-        with st.expander("Show Draft Results"):
-            st.dataframe(draft_result)
-
-        st.header("ECR Tiers")
         ecr_data = load_ecr_data()
         draft_result_merge_cols = [
             "fp_id",
             "team_key",
+            "round",
+            "pick",
         ]
+        for col in draft_result_merge_cols:
+            if col not in draft_result:
+                draft_result[col] = ""
         ecr_with_draft = ecr_data.merge(
-            draft_result[draft_result_merge_cols], how="left", left_on="player_id", right_on="fp_id"
+            draft_result[draft_result_merge_cols], how="outer", left_on="player_id", right_on="fp_id"
         )
         ecr_with_draft["is_drafted"] = ecr_with_draft["fp_id"].notna()
+
+        if ("round" in ecr_with_draft) and ("pick" in ecr_with_draft):
+            draft_picks_only = ecr_with_draft[ecr_with_draft.is_drafted].sort_values(["round", "pick"])
+
+        with st.expander("Show Draft Results"):
+            st.dataframe(draft_picks_only)
+
+        with st.expander("Unmatched"):
+            st.dataframe(ecr_with_draft[ecr_with_draft.player_name.isna()])
+
+        st.header("ECR Tiers")
         with st.expander("Filters"):
             filtered_data = filter_dataframe(
                 ecr_with_draft, force_on=True, force_on_columns=["is_drafted", "player_position_id"]

src/yahoo_client.py

@@ -130,7 +130,11 @@ class YahooFantasyClient:
             }
             for x in draft_results_xml.findall("./league/draft_results/*")
         ]
-        return parsed_draft
+        df = pd.DataFrame(parsed_draft)
+        for col in ["round", "pick"]:
+            if col in df:
+                df[col] = df[col].astype(int)
+        return df
 
     def parse_weeks_matchups(self, week: str, league_key: str) -> List[Mapping[str, Union[str, float]]]:
         url = f"https://fantasysports.yahooapis.com/fantasy/v2/leagues;league_keys={league_key}/scoreboard;week={week}"