sportsball 0.3.14__tar.gz → 0.3.16__tar.gz

{sportsball-0.3.14/sportsball.egg-info → sportsball-0.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.14
+Version: 0.3.16
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield
@@ -145,6 +145,7 @@ A representation of the game within a season.
 * **year** The year the game was in.
 * **season_type**: The type of the season the game was played in.
 * **postponed**: Whether the game was postponed.
+* **playoff**: Whether the game was a playoff game.
 
 #### Team
 
@@ -163,6 +164,7 @@ A representation of a team within a game.
 * **field_goals**: The sum of the field goals made by the team in the game.
 * **field_goals_attempted**: The sum of the field goals attempted by the team in the game.
 * **offensive_rebounds**: The number of rebounds during offense by the team in the game.
+* **assists**: The number of times the player on the team made a pass that resulted in a field goal in the game.
 
 #### Player
 
@@ -176,6 +178,7 @@ A representation of a player within a team within a game.
 * **field_goals**: The number of field goals the player made in the game.
 * **field_goals_attempted**: The number of field goal attempts the player made in the game.
 * **offensive_rebounds**: The number of rebounds during offense by the player made in the game.
+* **assists**: The number of times the player made a pass that resulted in a field goal in the game.
 
 #### Odds
 

{sportsball-0.3.14 → sportsball-0.3.16}/README.md

@@ -92,6 +92,7 @@ A representation of the game within a season.
 * **year** The year the game was in.
 * **season_type**: The type of the season the game was played in.
 * **postponed**: Whether the game was postponed.
+* **playoff**: Whether the game was a playoff game.
 
 #### Team
 
@@ -110,6 +111,7 @@ A representation of a team within a game.
 * **field_goals**: The sum of the field goals made by the team in the game.
 * **field_goals_attempted**: The sum of the field goals attempted by the team in the game.
 * **offensive_rebounds**: The number of rebounds during offense by the team in the game.
+* **assists**: The number of times the player on the team made a pass that resulted in a field goal in the game.
 
 #### Player
 
@@ -123,6 +125,7 @@ A representation of a player within a team within a game.
 * **field_goals**: The number of field goals the player made in the game.
 * **field_goals_attempted**: The number of field goal attempts the player made in the game.
 * **offensive_rebounds**: The number of rebounds during offense by the player made in the game.
+* **assists**: The number of times the player made a pass that resulted in a field goal in the game.
 
 #### Odds
 

{sportsball-0.3.14 → sportsball-0.3.16}/setup.py

@@ -23,7 +23,7 @@ def install_requires() -> typing.List[str]:
 
 setup(
     name='sportsball',
-    version='0.3.14',
+    version='0.3.16',
     description='A library for pulling in and normalising sports stats.',
     long_description=long_description,
     long_description_content_type='text/markdown',

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.14"
+__VERSION__ = "0.3.16"

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/afl/afltables/afl_afltables_game_model.py

@@ -222,6 +222,7 @@ def _create_afl_afltables_game_model(
         year=season_year,
         season_type=season_type,
         postponed=None,
+        play_off=None,
     )
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/afl/afltables/afl_afltables_player_model.py

@@ -28,6 +28,7 @@ def _create_afl_afltables_player_model(
         field_goals=None,
         field_goals_attempted=None,
         offensive_rebounds=None,
+        assists=None,
     )
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/aussportsbetting/aussportsbetting_game_model.py

@@ -24,6 +24,7 @@ def _create_aussportsbetting_game_model(
     home_odds: float,
     away_odds: float,
     league: League,
+    play_off: bool,
 ) -> GameModel:
     venue_model = None
     if venue is not None:
@@ -46,6 +47,7 @@ def _create_aussportsbetting_game_model(
         year=None,
         season_type=None,
         postponed=None,
+        play_off=play_off,
     )
 
 
@@ -61,6 +63,7 @@ def _cached_create_aussportsbetting_game_model(
     home_odds: float,
     away_odds: float,
     league: League,
+    play_off: bool,
 ) -> GameModel:
     return _create_aussportsbetting_game_model(
         dt,
@@ -73,6 +76,7 @@ def _cached_create_aussportsbetting_game_model(
         home_odds,
         away_odds,
         league,
+        play_off,
     )
 
 
@@ -87,6 +91,7 @@ def create_aussportsbetting_game_model(
     home_odds: float,
     away_odds: float,
     league: League,
+    play_off: bool,
 ) -> GameModel:
     """Create a game model based off aus sports betting."""
     if not pytest_is_running.is_running() and dt < datetime.datetime.now().replace(
@@ -103,6 +108,7 @@ def create_aussportsbetting_game_model(
             home_odds,
             away_odds,
             league,
+            play_off,
         )
     with session.cache_disabled():
         return _create_aussportsbetting_game_model(
@@ -116,4 +122,5 @@ def create_aussportsbetting_game_model(
             home_odds,
             away_odds,
             league,
+            play_off,
         )

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/aussportsbetting/aussportsbetting_league_model.py

@@ -57,10 +57,15 @@ class AusSportsBettingLeagueModel(LeagueModel):
         current_cell_idx += 1
         away_points = float(row[current_cell_idx].value)  # type: ignore
         current_cell_idx += 1
+
         if self.league == League.NFL:
-            current_cell_idx += 3
+            current_cell_idx += 1
+        play_off = row[current_cell_idx].value == "Y"
+
+        if self.league == League.NFL:
+            current_cell_idx += 2
         else:
-            current_cell_idx += 5
+            current_cell_idx += 4
         home_odds = float(row[current_cell_idx].value)  # type: ignore
         current_cell_idx += 1
         if self.league == League.NFL:
@@ -78,6 +83,7 @@ class AusSportsBettingLeagueModel(LeagueModel):
             home_odds,
             away_odds,
             self.league,
+            play_off,
         )
 
     @property

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/combined/combined_game_model.py

@@ -71,6 +71,7 @@ def create_combined_game_model(
     week = None
     game_number = None
     postponed = None
+    play_off = None
     for game_model in game_models:
         game_model_attendance = game_model.attendance
         if game_model_attendance is not None:
@@ -93,6 +94,9 @@ def create_combined_game_model(
         game_model_postponed = game_model.postponed
         if game_model_postponed is not None:
             postponed = game_model_postponed
+        game_model_play_off = game_model.play_off
+        if game_model_play_off is not None:
+            play_off = game_model_play_off
 
     if full_venue_identity is None and venue_models:
         for venue_model in venue_models:
@@ -112,4 +116,5 @@ def create_combined_game_model(
         year=year,
         season_type=season_type,
         postponed=postponed,
+        play_off=play_off,
     )

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/combined/combined_league_model.py

@@ -3,7 +3,7 @@
 import logging
 import multiprocessing
 from multiprocessing import Pool
-from typing import Iterator
+from typing import Any, Iterator
 
 import requests_cache
 
@@ -14,9 +14,13 @@ from ..league_model import LeagueModel
 from .combined_game_model import create_combined_game_model
 
 
-def _produce_league_games(league_model: LeagueModel) -> list[GameModel]:
+def _produce_league_games(league_model: LeagueModel) -> list[dict[str, Any]]:
     setup_logger()
-    return list(league_model.games)
+    try:
+        return [x.model_dump() for x in league_model.games]
+    except Exception as exc:
+        logging.error("Exception: %s", str(exc))
+        raise ValueError(str(exc))
 
 
 class CombinedLeagueModel(LeagueModel):
@@ -52,7 +56,20 @@ class CombinedLeagueModel(LeagueModel):
         for league_model in self._league_models:
             league_model.clear_session()
         with Pool(min(multiprocessing.cpu_count(), len(self._league_models))) as p:
-            game_lists = p.map(_produce_league_games, self._league_models)
+            # We want to terminate immediately if any of our runners runs into trouble.
+            def _error_callback(exc: BaseException) -> None:
+                p.terminate()
+                raise ValueError(str(exc))
+
+            results = [
+                p.apply_async(
+                    _produce_league_games, args=(x,), error_callback=_error_callback
+                )
+                for x in self._league_models
+            ]
+            game_lists = [
+                [GameModel.model_validate(y) for y in x.get()] for x in results
+            ]
 
         for game_list in game_lists:
             for game_model in game_list:

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/combined/combined_player_model.py

@@ -15,6 +15,7 @@ def create_combined_player_model(
     field_goals = None
     field_goals_attempted = None
     offensive_rebounds = None
+    assists = None
     for player_model in player_models:
         player_model_jersey = player_model.jersey
         if player_model_jersey is not None:
@@ -37,6 +38,9 @@ def create_combined_player_model(
         player_model_offensive_rebounds = player_model.offensive_rebounds
         if player_model_offensive_rebounds is not None:
             offensive_rebounds = player_model_offensive_rebounds
+        player_model_assists = player_model.assists
+        if player_model_assists is not None:
+            assists = player_model_assists
     return PlayerModel(
         identifier=identifier,
         jersey=jersey,
@@ -46,4 +50,5 @@ def create_combined_player_model(
         field_goals=field_goals,
         field_goals_attempted=field_goals_attempted,
         offensive_rebounds=offensive_rebounds,
+        assists=assists,
     )

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/espn/espn_game_model.py

@@ -144,6 +144,7 @@ def _create_espn_game_model(
         year=year,
         season_type=season_type,
         postponed=None,
+        play_off=None,
     )
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/espn/espn_player_model.py

@@ -37,6 +37,7 @@ def _create_espn_player_model(
         field_goals=None,
         field_goals_attempted=None,
         offensive_rebounds=None,
+        assists=None,
     )
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/game_model.py

@@ -22,6 +22,7 @@ GAME_WEEK_COLUMN: Literal["week"] = "week"
 LEAGUE_COLUMN: Literal["league"] = "league"
 END_DT_COLUMN: Literal["end_dt"] = "end_dt"
 POSTPONED_COLUMN: Literal["postponed"] = "postponed"
+PLAY_OFF_COLUMN: Literal["play_off"] = "play_off"
 
 
 def localize(venue: VenueModel | None, dt: datetime.datetime) -> datetime.datetime:
@@ -59,3 +60,4 @@ class GameModel(BaseModel):
     postponed: bool | None = Field(
         ..., json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD}, alias=POSTPONED_COLUMN
     )
+    play_off: bool | None = Field(..., alias=PLAY_OFF_COLUMN)

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/google/google_address_model.py

@@ -973,6 +973,60 @@ GOLDEN_1_CENTER = SportsballGeocodeTuple(
     housenumber="500",
     country="USA",
 )
+DELTA_CENTER = SportsballGeocodeTuple(
+    city="Salt Lake City",
+    state="UT",
+    postal="",
+    lat=40.768333,
+    lng=-111.901111,
+    housenumber="301",
+    country="USA",
+)
+ATT_CENTER = SportsballGeocodeTuple(
+    city="San Antonio",
+    state="TX",
+    postal="",
+    lat=29.426944,
+    lng=-98.4375,
+    housenumber="1",
+    country="USA",
+)
+FTX_ARENA = SportsballGeocodeTuple(
+    city="Miami",
+    state="FL",
+    postal="",
+    lat=25.781389,
+    lng=-80.188056,
+    housenumber="601",
+    country="USA",
+)
+VIVINT_ARENA = SportsballGeocodeTuple(
+    city="Salt Lake City",
+    state="UT",
+    postal="",
+    lat=40.768333,
+    lng=-111.901111,
+    housenumber="301",
+    country="USA",
+)
+CHESAPEAKE_ENERGY_ARENA = SportsballGeocodeTuple(
+    city="Oklahoma City",
+    state="OK",
+    postal="",
+    lat=35.463333,
+    lng=-97.515,
+    housenumber="100",
+    country="USA",
+)
+ESPN_WIDE_WORLD_OF_SPORTS_COMPLEX = SportsballGeocodeTuple(
+    city="Lake Buena Vista",
+    state="FL",
+    postal="32830",
+    lat=28.337083,
+    lng=-81.556,
+    housenumber="1375",
+    country="USA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -6288,15 +6342,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="200",
         country="USA",
     ),
-    "Vivint Arena, Salt Lake City, Utah": SportsballGeocodeTuple(
-        city="Salt Lake City",
-        state="UT",
-        postal="",
-        lat=40.768333,
-        lng=-111.901111,
-        housenumber="301",
-        country="USA",
-    ),
+    "Vivint Arena, Salt Lake City, Utah": VIVINT_ARENA,
     "Rock Hill Sports & Event Center, Rock Hill, South Carolina": SportsballGeocodeTuple(
         city="Rock Hill",
         state="SC",
@@ -6487,24 +6533,8 @@ _CACHED_GEOCODES: dict[str, Any] = {
     "Pepsi Center - Denver, Colorado, U.S. - United States": PEPSI_CENTRE,
     "Staples Center": STAPLES_CENTRE,
     "American Airlines Arena": AMERICAN_AIRLINES_ARENA,
-    "Chesapeake Energy Arena - Oklahoma City, Oklahoma - United States": SportsballGeocodeTuple(
-        city="Oklahoma City",
-        state="OK",
-        postal="",
-        lat=35.463333,
-        lng=-97.515,
-        housenumber="100",
-        country="USA",
-    ),
-    "AT&T Center - San Antonio, Texas - United States": SportsballGeocodeTuple(
-        city="San Antonio",
-        state="TX",
-        postal="",
-        lat=29.426944,
-        lng=-98.4375,
-        housenumber="1",
-        country="USA",
-    ),
+    "Chesapeake Energy Arena - Oklahoma City, Oklahoma - United States": CHESAPEAKE_ENERGY_ARENA,
+    "AT&T Center - San Antonio, Texas - United States": ATT_CENTER,
     "Oakland Arena - Oakland, California - United States": SportsballGeocodeTuple(
         city="Oakland",
         state="CA",
@@ -6514,15 +6544,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="7000",
         country="USA",
     ),
-    "ESPN Wide World of Sports Complex": SportsballGeocodeTuple(
-        city="Lake Buena Vista",
-        state="FL",
-        postal="32830",
-        lat=28.337083,
-        lng=-81.556,
-        housenumber="1375",
-        country="USA",
-    ),
+    "ESPN Wide World of Sports Complex": ESPN_WIDE_WORLD_OF_SPORTS_COMPLEX,
     "International Amphitheatre": SportsballGeocodeTuple(
         city="Chicago",
         state="IL",
@@ -6798,15 +6820,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Target Center - Minneapolis, Minnesota - United States": TARGET_CENTER,
     "Thomas & Mack Center - Paradise, NV - United States": THOMAS_AND_MACK_CENTER,
-    "Delta Center - Salt Lake City, Utah - United States": SportsballGeocodeTuple(
-        city="Salt Lake City",
-        state="UT",
-        postal="",
-        lat=40.768333,
-        lng=-111.901111,
-        housenumber="301",
-        country="USA",
-    ),
+    "Delta Center - Salt Lake City, Utah - United States": DELTA_CENTER,
     "Yokohama Arena": SportsballGeocodeTuple(
         city="Kanagawa",
         state="",
@@ -6829,15 +6843,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     "Amway Arena": ORLANDO_ARENA,
     "TD Garden - Boston, Massachusetts - United States": TD_GARDEN,
     "American Airlines Center - Dallas, Texas, USA - United States": AMERICAN_AIRLINES_ARENA,
-    "FTX Arena": SportsballGeocodeTuple(
-        city="Miami",
-        state="FL",
-        postal="",
-        lat=25.781389,
-        lng=-80.188056,
-        housenumber="601",
-        country="USA",
-    ),
+    "FTX Arena": FTX_ARENA,
     "Rose Garden": SportsballGeocodeTuple(
         city="Portland",
         state="OR",
@@ -6981,6 +6987,13 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="3930",
         country="USA",
     ),
+    "Delta Center, Salt Lake City, Utah": DELTA_CENTER,
+    "AT&T Center, San Antonio, Texas": ATT_CENTER,
+    "FTX Arena, Miami, Florida": FTX_ARENA,
+    "Vivint Smart Home Arena, Salt Lake City, Utah": VIVINT_ARENA,
+    "Chesapeake Energy Arena, Oklahoma City, Oklahoma": CHESAPEAKE_ENERGY_ARENA,
+    "The Arena, Bay Lake, Florida": ESPN_WIDE_WORLD_OF_SPORTS_COMPLEX,
+    "HP Field House, Bay Lake, Florida": ESPN_WIDE_WORLD_OF_SPORTS_COMPLEX,
 }
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/nba/nba/nba_nba_game_model.py

@@ -54,6 +54,7 @@ def _create_nba_nba_game_model(
         year=int(season_id[1:]),
         season_type=_SEASON_TYPE_MAP[season_id[0]],
         postponed=None,
+        play_off=None,
     )
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/nba/nba/nba_nba_player_model.py

@@ -37,6 +37,7 @@ def _create_nba_nba_player_model(
         field_goals=None,
         field_goals_attempted=None,
         offensive_rebounds=None,
+        assists=None,
     )
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/nba/nba/nba_nba_team_model.py

@@ -48,6 +48,7 @@ def _create_nba_nba_team_model(
         field_goals=row["FGM" + suffix],
         field_goals_attempted=row["FGA" + suffix],
         offensive_rebounds=row["OREB" + suffix],
+        assists=row["AST" + suffix],
     )
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/player_model.py

@@ -13,6 +13,7 @@ PLAYER_FUMBLES_LOST_COLUMN: Literal["fumbles_lost"] = "fumbles_lost"
 FIELD_GOALS_COLUMN: Literal["field_goals"] = "field_goals"
 FIELD_GOALS_ATTEMPTED_COLUMN: Literal["field_goals_attempted"] = "field_goals_attempted"
 OFFENSIVE_REBOUNDS_COLUMN: Literal["offensive_rebounds"] = "offensive_rebounds"
+ASSISTS_COLUMN: Literal["assists"] = "assists"
 
 
 class PlayerModel(BaseModel):
@@ -54,3 +55,8 @@ class PlayerModel(BaseModel):
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
         alias=OFFENSIVE_REBOUNDS_COLUMN,
     )
+    assists: int | None = Field(
+        ...,
+        json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
+        alias=ASSISTS_COLUMN,
+    )

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/sportsdb/sportsdb_game_model.py

@@ -65,6 +65,7 @@ def _create_sportsdb_game_model(
         end_dt=None,
         attendance=None,
         postponed=postponed,
+        play_off=None,
     )
 
 

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/sportsdb/sportsdb_league_model.py

@@ -103,18 +103,19 @@ class SportsDBLeagueModel(LeagueModel):
                             except ValueError:
                                 pass
                         case SeasonType.REGULAR:
-                            try:
-                                for count, round_str in enumerate(range(1, 125)):
-                                    yield from self._produce_games(
-                                        str(round_str),
-                                        count,
-                                        self._league_id,
-                                        season_year,
-                                        season_type,
-                                        pbar,
-                                    )
-                            except ValueError:
-                                pass
+                            if self.league != League.NBA:
+                                try:
+                                    for count, round_str in enumerate(range(1, 125)):
+                                        yield from self._produce_games(
+                                            str(round_str),
+                                            count,
+                                            self._league_id,
+                                            season_year,
+                                            season_type,
+                                            pbar,
+                                        )
+                                except ValueError:
+                                    pass
                         case SeasonType.POSTSEASON:
                             for count, round_str in enumerate(
                                 [125, 150, 160, 170, 180, 200]

{sportsball-0.3.14 → sportsball-0.3.16}/sportsball/data/sportsreference/sportsreference_game_model.py

@@ -1,12 +1,12 @@
 """Sports Reference game model."""
 
-# pylint: disable=too-many-locals,too-many-statements,unused-argument
+# pylint: disable=too-many-locals,too-many-statements,unused-argument,protected-access
 import datetime
 import io
 import logging
-import time
 import urllib.parse
 
+import dateutil
 import pandas as pd
 import pytest_is_running
 import requests_cache
@@ -30,18 +30,25 @@ def _create_sportsreference_game_model(
     # pylint: disable=too-many-branches
     response = session.get(url)
     response.raise_for_status()
-    if not response.from_cache:
-        time.sleep(6.0)
     soup = BeautifulSoup(response.text, "html.parser")
     scorebox_meta_div = soup.find("div", class_="scorebox_meta")
     if not isinstance(scorebox_meta_div, Tag):
         raise ValueError("scorebox_meta_div is not a Tag.")
 
     in_divs = scorebox_meta_div.find_all("div")
-    in_div = in_divs[0]
+    current_in_div_idx = 0
+    in_div = in_divs[current_in_div_idx]
     in_div_text = in_div.get_text().strip()
-    dt = parse(in_div_text)
-    venue_div = in_divs[1]
+    current_in_div_idx += 1
+    if "Tournament" in in_div_text:
+        in_div_text = in_divs[1].get_text().strip()
+        current_in_div_idx += 1
+    try:
+        dt = parse(in_div_text)
+    except dateutil.parser._parser.ParserError as exc:  # type: ignore
+        logging.error("Failed to parse date for URL: %s", url)
+        raise exc
+    venue_div = in_divs[current_in_div_idx]
     venue_name = venue_div.get_text().strip()
     scorebox_div = soup.find("div", class_="scorebox")
     if not isinstance(scorebox_div, Tag):
@@ -64,6 +71,7 @@ def _create_sportsreference_game_model(
     fg = {}
     fga = {}
     offensive_rebounds = {}
+    assists = {}
     for df in dfs:
         if df.index.nlevels > 1:
             df.columns = df.columns.get_level_values(1)
@@ -81,6 +89,10 @@ def _create_sportsreference_game_model(
                 orebs = df["OREB"].tolist()
                 for idx, player in enumerate(players):
                     offensive_rebounds[player] = orebs[idx]
+            if "AST" in df.columns.values:
+                asts = df["AST"].tolist()
+                for idx, player in enumerate(players):
+                    assists[player] = asts[idx]
 
     teams: list[TeamModel] = []
     for a in scorebox_div.find_all("a"):
@@ -97,6 +109,7 @@ def _create_sportsreference_game_model(
                     fg,
                     fga,
                     offensive_rebounds,
+                    assists,
                 )
             )
 
@@ -185,6 +198,7 @@ def _create_sportsreference_game_model(
         end_dt=None,
         attendance=None,
         postponed=None,
+        play_off=None,
     )