Create maps of short team ids once and move schedule to stats.py

src/domain/playoffs.py

@@ -72,3 +72,6 @@ PLAYOFF_TEAM_DEF_PLAYER: list[tuple[teams.NFLTeam, str]] = [
     (teams.pittsburgh_steelers, "00-0033886"),
     (teams.green_bay_packers, "00-0034728"),
 ]
+
+SHORT_TEAM_NAMES_TO_DEFENSE_PLAYER_ID = {t.team_short_name: p for t, p in PLAYOFF_TEAM_DEF_PLAYER}
+ROSTER_TEAM_NAMES_TO_DEFENSE_PLAYER_ID = {t.rosters_short_name: p for t, p in PLAYOFF_TEAM_DEF_PLAYER}

src/pages/11_Scoreboard.py

@@ -5,11 +5,9 @@ from config import DEFAULT_ICON
 from shared_page import common_page_config
 
 from data_storage import get_all_users, get_all_rosters
-from domain.constants import SEASON
 from domain.playoffs import CURRENT_PLAYOFF_WEEK, PLAYOFF_WEEK_TO_NAME
 from load_options import get_map_week_player_id_option, PlayerOption
-from stats import get_stats_map, get_scores_map, get_yahoo_schedule, STAT_CACHE_SECONDS
-from queries.pfr.league_schedule import get_season_game_map
+from stats import get_stats_map, get_scores_map, get_schedule_with_live
 
 
 POSITION_LABELS = [
@@ -24,31 +22,6 @@ POSITION_LABELS = [
 ]
 
 
-def get_live_schedule() -> dict[int, dict[str, dict[str, str | int | pd.Timestamp]]]:
-    return get_yahoo_schedule()
-
-
-@st.cache_data(ttl=60 * 60 * 24)
-def get_daily_updated_schedule() -> dict[int, dict[str, dict[str, str | int | pd.Timestamp]]]:
-    schedule, _ = get_season_game_map(SEASON)
-    return schedule
-
-
-@st.cache_data(ttl=STAT_CACHE_SECONDS)
-def get_schedule_with_live() -> dict[int, dict[str, dict[str, str | int | pd.Timestamp]]]:
-    schedule = get_live_schedule()
-
-    for week, week_live in get_daily_updated_schedule().items():
-        if week not in schedule:
-            schedule[week] = {}
-        for team, team_live in week_live.items():
-            if team not in schedule[week]:
-                schedule[week][team] = {}
-            schedule[week][team].update(team_live)
-
-    return schedule
-
-
 def get_users_df():
     columns = ["user_id", "name"]
     all_users = pd.DataFrame(get_all_users(columns_included=columns), columns=columns)

src/stats.py

@@ -5,10 +5,14 @@ import requests
 import streamlit as st
 
 from domain.constants import SEASON
-from domain.playoffs import PLAYOFF_TEAM_DEF_PLAYER
+from domain.playoffs import (
+    SHORT_TEAM_NAMES_TO_DEFENSE_PLAYER_ID,
+    ROSTER_TEAM_NAMES_TO_DEFENSE_PLAYER_ID,
+    PLAYOFF_TEAM_DEF_PLAYER,
+)
 from login import get_stat_overrides
 from queries.nflverse.github_data import get_player_kicking_stats, get_player_stats, get_team_defense_stats
-
+from queries.pfr.league_schedule import get_season_game_map
 
 STAT_CACHE_SECONDS = 60
 
@@ -117,9 +121,11 @@ def add_stats_from_player_df_to_stat_map(df: pd.DataFrame, stat_map):
 
 
 def add_stats_from_team_def_df_to_stat_map(df: pd.DataFrame, stat_map):
-    short_team_names_to_player_id = {t.rosters_short_name: p for t, p in PLAYOFF_TEAM_DEF_PLAYER}
     df_playoffs = df[
-        (df.week.isin(NFLVERSE_STAT_WEEK_TO_PLAYOFF_WEEK.keys()) & df.team.isin(short_team_names_to_player_id.keys()))
+        (
+            df.week.isin(NFLVERSE_STAT_WEEK_TO_PLAYOFF_WEEK.keys())
+            & df.team.isin(ROSTER_TEAM_NAMES_TO_DEFENSE_PLAYER_ID.keys())
+        )
     ]
     df_playoffs.week = df_playoffs.week.apply(lambda x: NFLVERSE_STAT_WEEK_TO_PLAYOFF_WEEK[x])
 
@@ -130,7 +136,7 @@ def add_stats_from_team_def_df_to_stat_map(df: pd.DataFrame, stat_map):
             # this won't happen but makes mypy happy
             continue
         player_stats: dict[str, float] = {}
-        player_id = short_team_names_to_player_id[team]
+        player_id = ROSTER_TEAM_NAMES_TO_DEFENSE_PLAYER_ID[team]
         for k, v in row.to_dict().items():
             if k in NFLVERSE_STAT_COL_TO_ID:
                 if (mapped_k := NFLVERSE_STAT_COL_TO_ID[k]) in player_stats:
@@ -145,9 +151,11 @@ def add_stats_from_team_def_df_to_stat_map(df: pd.DataFrame, stat_map):
 
 
 def add_st_stats_to_defense(df: pd.DataFrame, stat_map):
-    short_team_names_to_player_id = {t.rosters_short_name: p for t, p in PLAYOFF_TEAM_DEF_PLAYER}
     df_playoffs = df[
-        (df.week.isin(NFLVERSE_STAT_WEEK_TO_PLAYOFF_WEEK.keys()) & df.team.isin(short_team_names_to_player_id.keys()))
+        (
+            df.week.isin(NFLVERSE_STAT_WEEK_TO_PLAYOFF_WEEK.keys())
+            & df.team.isin(ROSTER_TEAM_NAMES_TO_DEFENSE_PLAYER_ID.keys())
+        )
     ]
     df_playoffs.week = df_playoffs.week.apply(lambda x: NFLVERSE_STAT_WEEK_TO_PLAYOFF_WEEK[x])
 
@@ -157,7 +165,7 @@ def add_st_stats_to_defense(df: pd.DataFrame, stat_map):
         else:
             # this won't happen but makes mypy happy
             continue
-        player_id = short_team_names_to_player_id[team]
+        player_id = ROSTER_TEAM_NAMES_TO_DEFENSE_PLAYER_ID[team]
         player_stats: dict[str, float] = stat_map[week].get(player_id, {})
 
         # special teams td update only
@@ -266,18 +274,14 @@ def add_yahoo_stat_type_to_stat_map(
         if week not in stat_map:
             stat_map[week] = {}
 
-        # only used for defense summary
-        short_team_names_to_player_id = {}
         if yahoo_stat_type == "KICKING":
             week_leaders = week_dict["POSTSEASON"][""]["FIELD_GOALS_MADE"]["leagues"][0]["leagueWeeks"][0]["leaders"]
         elif yahoo_stat_type == "DEFENSE":
             week_leaders = week_dict["POSTSEASON"][""]["TOTAL_TACKLES"]["leagues"][0]["leagueWeeks"][0]["leaders"]
-            short_team_names_to_player_id = {t.team_short_name: p for t, p in PLAYOFF_TEAM_DEF_PLAYER}
         elif yahoo_stat_type == "RETURNING":
             week_leaders = week_dict["POSTSEASON"][""]["RETURN_YARDS_PER_KICKOFF"]["leagues"][0]["leagueWeeks"][0][
                 "leaders"
             ]
-            short_team_names_to_player_id = {t.team_short_name: p for t, p in PLAYOFF_TEAM_DEF_PLAYER}
         else:
             week_leaders = week_dict["POSTSEASON"][""][f"{yahoo_stat_type}_YARDS"]["leagues"][0]["leagueWeeks"][0][
                 "leaders"
@@ -287,11 +291,11 @@ def add_yahoo_stat_type_to_stat_map(
             def_player_id = ""
             player_id = ""
             if yahoo_stat_type == "DEFENSE":
-                def_player_id = short_team_names_to_player_id[player["player"]["team"]["abbreviation"]]
+                def_player_id = SHORT_TEAM_NAMES_TO_DEFENSE_PLAYER_ID[player["player"]["team"]["abbreviation"]]
             elif yahoo_stat_type == "RETURNING":
                 raw_player_id = player["player"]["playerId"].split(".")[-1]
                 player_id = YAHOO_PLAYER_ID_MAP.get(raw_player_id, "")
-                def_player_id = short_team_names_to_player_id[player["player"]["team"]["abbreviation"]]
+                def_player_id = SHORT_TEAM_NAMES_TO_DEFENSE_PLAYER_ID[player["player"]["team"]["abbreviation"]]
             else:
                 raw_player_id = player["player"]["playerId"].split(".")[-1]
                 player_id = YAHOO_PLAYER_ID_MAP.get(raw_player_id, "")
@@ -406,6 +410,35 @@ def get_yahoo_stats() -> dict[int, dict[str, dict[str, float]]]:
     return stat_map
 
 
+def get_live_schedule() -> dict[int, dict[str, dict[str, str | int | pd.Timestamp]]]:
+    return get_yahoo_schedule()
+
+
+@st.cache_data(ttl=60 * 60 * 24)
+def get_daily_updated_schedule() -> dict[int, dict[str, dict[str, str | int | pd.Timestamp]]]:
+    schedule, _ = get_season_game_map(SEASON)
+    return schedule
+
+
+@st.cache_data(ttl=STAT_CACHE_SECONDS)
+def get_schedule_with_live() -> dict[int, dict[str, dict[str, str | int | pd.Timestamp]]]:
+    schedule = get_live_schedule()
+
+    for week, week_live in get_daily_updated_schedule().items():
+        if week not in schedule:
+            schedule[week] = {}
+        for team, team_live in week_live.items():
+            if team not in schedule[week]:
+                schedule[week][team] = {}
+            schedule[week][team].update(team_live)
+
+    return schedule
+
+
+def add_points_against_stat(stat_map):
+    pass
+
+
 @st.cache_data(ttl=STAT_CACHE_SECONDS)
 def get_stats_map() -> dict[int, dict[str, dict[str, float]]]:
     # use live stats if available
@@ -419,6 +452,7 @@ def get_stats_map() -> dict[int, dict[str, dict[str, float]]]:
         for player_id, player_stats in week_stats.items():
             stat_map[week][player_id] = player_stats
 
+    add_points_against_stat(stat_map)
     stat_overrides = get_stat_overrides()
     # for stat overrides, override at the stat level
     for week, week_stats in stat_overrides.items():