sportsball 0.3.118__tar.gz → 0.3.120__tar.gz

{sportsball-0.3.118/sportsball.egg-info → sportsball-0.3.120}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.118
+Version: 0.3.120
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield

{sportsball-0.3.118 → sportsball-0.3.120}/setup.py

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

{sportsball-0.3.118 → sportsball-0.3.120}/sportsball/__init__.py

@@ -4,4 +4,4 @@
 import cchardet  # type: ignore
 import lxml  # noqa: ignore
 
-__VERSION__ = "0.3.118"
+__VERSION__ = "0.3.120"

{sportsball-0.3.118 → sportsball-0.3.120}/sportsball/data/afl/afl/afl_afl_game_model.py

@@ -1,8 +1,8 @@
 """AFL AFL game model."""
 
-# pylint: disable=too-many-statements,protected-access,too-many-arguments,bare-except
+# pylint: disable=too-many-statements,protected-access,too-many-arguments,bare-except,duplicate-code
 import datetime
-import logging
+import re
 
 import pytest_is_running
 import requests_cache
@@ -16,18 +16,29 @@ from .afl_afl_team_model import create_afl_afl_team_model
 from .afl_afl_venue_model import create_afl_afl_venue_model
 
 
-def _extract_odds(html: str) -> list[float]:
+def _extract_odds(soup: BeautifulSoup) -> list[float]:
     odds = []
-    soup = BeautifulSoup(html, "lxml")
     for span in soup.find_all("span", {"class": "betting-button__money"}):
         odds.append(float(span.get_text().strip().replace("$", "")))
     return odds
 
 
+def _extract_dt(soup: BeautifulSoup) -> datetime.datetime:
+    for div in soup.find_all("div", {"class": re.compile(".*js-match-start-time.*")}):
+        start_time = div.get("data-start-time")
+        return datetime.datetime.fromisoformat(start_time)
+    raise ValueError("Unable to find datetime")
+
+
+def _parse(html: str) -> tuple[list[float], datetime.datetime]:
+    soup = BeautifulSoup(html, "lxml")
+    return _extract_odds(soup), _extract_dt(soup)
+
+
 def create_afl_afl_game_model(
     team_names: list[str],
     players: list[list[tuple[str, str, str, str]]],
-    dt: datetime.datetime,
+    dt: datetime.datetime | None,
     venue_name: str,
     session: requests_cache.CachedSession,
     ladder: list[str],
@@ -35,7 +46,7 @@ def create_afl_afl_game_model(
     playwright: Playwright,
 ) -> GameModel:
     """Create a game model from AFL Tables."""
-    odds = []
+    odds: list[float] = []
     if url is not None and not pytest_is_running.is_running():
         ensure_install()
         browser = playwright.chromium.launch()
@@ -44,8 +55,10 @@ def create_afl_afl_game_model(
         try:
             page.goto(url, wait_until="networkidle")
         except:  # noqa: E722
-            logging.warning("Ladder URL timed out.")
-        odds = _extract_odds(page.content())
+            pass
+        odds, dt = _parse(page.content())
+    if dt is None:
+        raise ValueError("dt is null")
 
     venue_model = create_afl_afl_venue_model(venue_name, session, dt)
     teams = [

{sportsball-0.3.118 → sportsball-0.3.120}/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -8,7 +8,7 @@ import urllib.parse
 from typing import Iterator
 
 import requests_cache
-from bs4 import BeautifulSoup
+from bs4 import BeautifulSoup, Tag
 from dateutil.parser import parse
 from playwright.sync_api import Playwright, sync_playwright
 
@@ -19,14 +19,13 @@ from ...league_model import LeagueModel
 from .afl_afl_game_model import create_afl_afl_game_model
 
 
-def _parse_game_info(
-    html: str,
+def _parse_v1(
+    soup: BeautifulSoup,
     session: requests_cache.CachedSession,
     ladder: list[str],
     html_url: str,
     playwright: Playwright,
 ) -> Iterator[GameModel]:
-    soup = BeautifulSoup(html, "lxml")
     for div in soup.find_all("div", {"class": re.compile(".*js-match-list-item.*")}):
         team_names = []
         for span in div.find_all(
@@ -110,13 +109,97 @@ def _parse_game_info(
         )
 
 
+def _parse_v2(
+    soup: BeautifulSoup,
+    session: requests_cache.CachedSession,
+    ladder: list[str],
+    html_url: str,
+    playwright: Playwright,
+) -> Iterator[GameModel]:
+    for div in soup.find_all("div", {"class": "team-lineups__item"}):
+        team_names = []
+        for span in div.find_all(
+            "span", {"class": re.compile(".*team-lineups-header__name.*")}
+        ):
+            team_names = [x.strip() for x in span.get_text().strip().split(" v ")]
+        team_players: list[list[tuple[str, str, str, str]]] = [[], []]
+
+        def process_a_player(
+            a: Tag, idx: int, team_players: list[list[tuple[str, str, str, str]]]
+        ) -> list[list[tuple[str, str, str, str]]]:
+            href = a.get("href")
+            if not isinstance(href, str):
+                raise ValueError("href is not a str")
+            player_id = "afl:" + href.split("/")[2]
+            name = a.get("title")
+            if not isinstance(name, str):
+                raise ValueError("name is not a str")
+            first_name, sur_name = name.split()
+            jersey = None
+            for div_shirt in a.find_all(
+                "div", {"class": re.compile(".*team-lineups__player-entry--shirt.*")}
+            ):
+                jersey = div_shirt.get_text().strip()
+            if jersey is None:
+                raise ValueError("jersey is null")
+            team_players[idx].append((player_id, first_name, sur_name, jersey))
+            return team_players
+
+        for a in div.find_all(
+            "a", {"class": re.compile(".*team-lineups__player-entry--home-team.*")}
+        ):
+            team_players = process_a_player(a, 0, team_players)
+        for a in div.find_all(
+            "a", {"class": re.compile(".*team-lineups__player-entry--away-team.*")}
+        ):
+            team_players = process_a_player(a, 1, team_players)
+
+        venue_name = None
+        for div_info in div.find_all("div", {"class": "team-lineups-header__info"}):
+            header_info = div_info.get_text().strip()
+            venue_name = header_info.split("･")[1].strip()
+        if venue_name is None:
+            raise ValueError("venue_name is null")
+
+        url = None
+        for a in div.find_all("a", {"class": "team-lineups-header"}):
+            url = urllib.parse.urljoin(html_url, a.get("href"))
+
+        yield create_afl_afl_game_model(
+            team_names,
+            team_players,
+            None,
+            venue_name,
+            session,
+            ladder,
+            url,
+            playwright,
+        )
+
+
+def _parse_game_info(
+    html: str,
+    session: requests_cache.CachedSession,
+    ladder: list[str],
+    html_url: str,
+    playwright: Playwright,
+) -> Iterator[GameModel]:
+    soup = BeautifulSoup(html, "lxml")
+    found = False
+    for game_model in _parse_v1(soup, session, ladder, html_url, playwright):
+        found = True
+        yield game_model
+    if not found:
+        yield from _parse_v2(soup, session, ladder, html_url, playwright)
+
+
 class AFLAFLLeagueModel(LeagueModel):
     """AFL AFL implementation of the league model."""
 
     def __init__(
         self, session: requests_cache.CachedSession, position: int | None = None
     ) -> None:
-        super().__init__(League.AFL, session)
+        super().__init__(League.AFL, session, position=position)
 
     @classmethod
     def name(cls) -> str:
@@ -137,7 +220,7 @@ class AFLAFLLeagueModel(LeagueModel):
                     timeout=60000.0,
                 )
             except:  # noqa: E722
-                logging.warning("Ladder URL timed out.")
+                pass
             soup = BeautifulSoup(page.content(), "lxml")
             for span in soup.find_all(
                 "span", {"class": re.compile(".*stats-table__club-name.*")}
@@ -146,6 +229,7 @@ class AFLAFLLeagueModel(LeagueModel):
                 if team_name in ladder:
                     continue
                 ladder.append(team_name)
+            logging.info("Found ladder: %s", ",".join(ladder))
         return ladder
 
     @property

{sportsball-0.3.118 → sportsball-0.3.120}/sportsball/data/afl/afl/afl_afl_player_model.py

@@ -1,5 +1,6 @@
 """AFL AFL player model."""
 
+# pylint: disable=duplicate-code
 from ...player_model import PlayerModel
 
 

sportsball-0.3.120/sportsball/data/afl/afl/afl_afl_venue_model.py

@@ -0,0 +1,25 @@
+"""AFL AFL venue model."""
+
+# pylint: disable=too-many-statements,protected-access,duplicate-code
+import datetime
+
+import requests_cache
+
+from ...google.google_address_model import create_google_address_model
+from ...venue_model import VenueModel
+
+
+def create_afl_afl_venue_model(
+    venue_name: str,
+    session: requests_cache.CachedSession,
+    dt: datetime.datetime,
+) -> VenueModel:
+    """Create a game model from AFL Tables."""
+    address_model = create_google_address_model(venue_name, session, dt)
+    return VenueModel(
+        identifier=venue_name,
+        name=venue_name,
+        address=address_model,
+        is_grass=None,
+        is_indoor=None,
+    )

{sportsball-0.3.118 → sportsball-0.3.120}/sportsball/data/afl/combined/afl_combined_league_model.py

@@ -251,6 +251,15 @@ AFL_VENUE_IDENTITY_MAP = {
     "Ondrej Nepela Arena": TIPOS_ARENA,
     "Barossa Park": BAROSSA_PARK,
     "Ninja Stadium": BELLERIVE_OVAL,
+    # AFL
+    "TIO Stadium, Darwin": MARRARA_OVAL,
+    "SCG, Sydney": SCG,
+    "MCG, Melbourne": MCG,
+    "Adelaide Oval, Adelaide": ADELAIDE_OVAL,
+    "ENGIE Stadium, Sydney": STADIUM_AUSTRALIA,
+    "Marvel Stadium, Melbourne": DOCKLANDS,
+    "Gabba, Brisbane": GABBA,
+    "Optus Stadium, Perth": PERTH,
 }
 
 

{sportsball-0.3.118 → sportsball-0.3.120}/sportsball/data/google/google_address_model.py

@@ -2611,6 +2611,15 @@ OMNI_COLISEUM = SportsballGeocodeTuple(
     housenumber="100",
     country="USA",
 )
+MCCAMISH_PAVILION = SportsballGeocodeTuple(
+    city="Atlanta",
+    state="GA",
+    postal="",
+    lat=33.780833,
+    lng=-84.392778,
+    housenumber="965",
+    country="USA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -5558,15 +5567,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="701",
         country="USA",
     ),
-    "McCamish Pavilion, Atlanta, Georgia": SportsballGeocodeTuple(
-        city="Atlanta",
-        state="GA",
-        postal="",
-        lat=33.780833,
-        lng=-84.392778,
-        housenumber="965",
-        country="USA",
-    ),
+    "McCamish Pavilion, Atlanta, Georgia": MCCAMISH_PAVILION,
     "Maravich Assembly Center, Baton Rouge, Louisiana": PETE_MARAVICH_ASSEMBLY_CENTER,
     "Viejas Arena, San Diego, California": VIEJAS_ARENA,
     "Reitz Arena, Baltimore, Maryland": SportsballGeocodeTuple(
@@ -13864,6 +13865,45 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Cox Arena, San Diego, California": VIEJAS_ARENA,
     "The Omni, Atlanta, Georgia": OMNI_COLISEUM,
+    "TD Banknorth Sports Center, Hamden, Connecticut": TD_BANK_SPORTS_CENTER,
+    "The Event Center, San Jose, California": SportsballGeocodeTuple(
+        city="San Jose",
+        state="CA",
+        postal="95192",
+        lat=37.33536,
+        lng=-121.87985,
+        housenumber="290",
+        country="USA",
+    ),
+    "TIO Stadium, Darwin": TIO_STADIUM,
+    "SCG, Sydney": SCG,
+    "MCG, Melbourne": MCG,
+    "Adelaide Oval, Adelaide": ADELAIDE_OVAL,
+    "ENGIE Stadium, Sydney": ENGIE_STADIUM,
+    "Marvel Stadium, Melbourne": MARVEL_STADIUM,
+    "Gabba, Brisbane": GABBA,
+    "Optus Stadium, Perth": OPTUS_STADIUM,
+    "Ball Arena - Denver, Colorado, USA - United States": PEPSI_CENTRE,
+    "Alexander Memorial Coliseum, Atlanta, Georgia": MCCAMISH_PAVILION,
+    "Alltell Arena, North Little Rock, Arkansas": SIMMONS_BANK_ARENA,
+    "Auburn Hills, Michigan": SportsballGeocodeTuple(
+        city="Auburn Hills",
+        state="MI",
+        postal="",
+        lat=42.6875,
+        lng=-83.234167,
+        housenumber="",
+        country="USA",
+    ),
+    "Guaynabo": SportsballGeocodeTuple(
+        city="Guaynabo",
+        state="PR",
+        postal="",
+        lat=18.366667,
+        lng=-66.1,
+        housenumber="",
+        country="USA",
+    ),
 }
 
 

{sportsball-0.3.118 → sportsball-0.3.120}/sportsball/data/nba/combined/nba_combined_league_model.py

@@ -8,6 +8,7 @@ from ...combined.combined_league_model import CombinedLeagueModel
 from ...league import League
 from ..espn.nba_espn_league_model import NBAESPNLeagueModel
 from ..nba.nba_nba_league_model import NBANBALeagueModel
+from ..nbacom.nba_nbacom_league_model import NBANBAComLeagueModel
 from ..oddsportal.nba_oddsportal_league_model import NBAOddsPortalLeagueModel
 from ..sportsdb.nba_sportsdb_league_model import NBASportsDBLeagueModel
 from ..sportsreference.nba_sportsreference_league_model import \
@@ -903,6 +904,7 @@ class NBACombinedLeagueModel(CombinedLeagueModel):
                 NBASportsDBLeagueModel(session, position=2),
                 NBASportsReferenceLeagueModel(session, position=3),
                 NBAOddsPortalLeagueModel(session, position=4),
+                NBANBAComLeagueModel(session, position=5),
             ],
             league_filter,
         )

sportsball-0.3.120/sportsball/data/nba/nbacom/nba_nbacom_game_model.py

@@ -0,0 +1,56 @@
+"""NBA NBA.com game model."""
+
+# pylint: disable=too-many-statements,protected-access,too-many-arguments,bare-except
+import datetime
+from typing import Any
+
+import extruct  # type: ignore
+import requests_cache
+
+from ...game_model import GameModel
+from ...league import League
+from .nba_nbacom_team_model import create_nba_nbacom_team_model
+from .nba_nbacom_venue_model import create_nba_nbacom_venue_model
+
+
+def create_nba_nbacom_game_model(
+    game: dict[str, Any], session: requests_cache.CachedSession
+) -> GameModel:
+    """Create a game model from AFL Tables."""
+    game_id = game["gameId"]
+    venue_name: str | None = None
+    dt = None
+    with session.cache_disabled():
+        response = session.get(f"https://www.nba.com/game/{game_id}")
+        response.raise_for_status()
+        data = extruct.extract(response.text, base_url=response.url)
+        for jsonld in data["json-ld"]:
+            location = jsonld.get("location")
+            if location is not None:
+                venue_name = location["name"]
+            start_date = jsonld.get("startDate")
+            if start_date is not None:
+                dt = datetime.datetime.fromisoformat(start_date)
+
+    if venue_name is None:
+        raise ValueError("venue_name is null")
+    if dt is None:
+        raise ValueError("dt is null")
+    venue_model = create_nba_nbacom_venue_model(venue_name, session, dt)
+    return GameModel(
+        dt=dt,
+        week=None,
+        game_number=None,
+        venue=venue_model,
+        teams=[
+            create_nba_nbacom_team_model(game["homeTeam"], session, dt),
+            create_nba_nbacom_team_model(game["awayTeam"], session, dt),
+        ],
+        end_dt=None,
+        attendance=None,
+        league=League.NBA,
+        year=datetime.datetime.today().year,
+        season_type=None,
+        postponed=None,
+        play_off=None,
+    )

sportsball-0.3.120/sportsball/data/nba/nbacom/nba_nbacom_league_model.py

@@ -0,0 +1,40 @@
+"""NBA NBA.com league model."""
+
+# pylint: disable=too-many-statements,protected-access,too-many-locals,bare-except,too-many-branches,duplicate-code
+import datetime
+import logging
+from typing import Iterator
+
+import requests_cache
+
+from ...game_model import GameModel
+from ...league import League
+from ...league_model import LeagueModel
+from .nba_nbacom_game_model import create_nba_nbacom_game_model
+
+
+class NBANBAComLeagueModel(LeagueModel):
+    """NBA NBA.com implementation of the league model."""
+
+    def __init__(
+        self, session: requests_cache.CachedSession, position: int | None = None
+    ) -> None:
+        super().__init__(League.AFL, session, position=position)
+
+    @classmethod
+    def name(cls) -> str:
+        return "nba-nbacom-league-model"
+
+    @property
+    def games(self) -> Iterator[GameModel]:
+        with self.session.cache_disabled():
+            date_slug = datetime.datetime.today().date().strftime("%Y%m%d")
+            response = self.session.get(
+                f"https://stats.nba.com/js/data/leaders/00_daily_lineups_{date_slug}.json"
+            )
+            if response.ok:
+                lineup = response.json()
+                for game in lineup["games"]:
+                    yield create_nba_nbacom_game_model(game, self.session)
+            else:
+                logging.warning("Failed to fetch NBA daily lineups.")

sportsball-0.3.120/sportsball/data/nba/nbacom/nba_nbacom_player_model.py

@@ -0,0 +1,44 @@
+"""NBA NBA.com player model."""
+
+from typing import Any
+
+from ...player_model import PlayerModel
+
+
+def create_nba_nbacom_player_model(player_dict: dict[str, Any]) -> PlayerModel:
+    """Create a player model from AFL AFL."""
+    return PlayerModel(
+        identifier=str(player_dict["personId"]),
+        jersey=None,
+        kicks=None,
+        fumbles=None,
+        fumbles_lost=None,
+        field_goals=None,
+        field_goals_attempted=None,
+        offensive_rebounds=None,
+        assists=None,
+        turnovers=None,
+        name=player_dict["playerName"],
+        marks=None,
+        handballs=None,
+        disposals=None,
+        goals=None,
+        behinds=None,
+        hit_outs=None,
+        tackles=None,
+        rebounds=None,
+        insides=None,
+        clearances=None,
+        clangers=None,
+        free_kicks_for=None,
+        free_kicks_against=None,
+        brownlow_votes=None,
+        contested_possessions=None,
+        uncontested_possessions=None,
+        contested_marks=None,
+        marks_inside=None,
+        one_percenters=None,
+        bounces=None,
+        goal_assists=None,
+        percentage_played=None,
+    )

sportsball-0.3.120/sportsball/data/nba/nbacom/nba_nbacom_team_model.py

@@ -0,0 +1,38 @@
+"""NBA NBA.com team model."""
+
+# pylint: disable=duplicate-code,too-many-arguments
+import datetime
+from typing import Any
+
+import requests_cache
+
+from ...google.google_news_model import create_google_news_models
+from ...league import League
+from ...team_model import TeamModel
+from .nba_nbacom_player_model import create_nba_nbacom_player_model
+
+
+def create_nba_nbacom_team_model(
+    team: dict[str, Any],
+    session: requests_cache.CachedSession,
+    dt: datetime.datetime,
+) -> TeamModel:
+    """Create a team model from AFL AFL."""
+    team_name = team["teamAbbreviation"]
+    return TeamModel(
+        identifier=str(team["teamId"]),
+        name=team_name,
+        location=None,
+        players=[create_nba_nbacom_player_model(x) for x in team["players"]],
+        odds=[],
+        points=None,
+        ladder_rank=None,
+        kicks=None,
+        news=create_google_news_models(team_name, session, dt, League.NBA),
+        social=[],
+        field_goals=None,
+        field_goals_attempted=None,
+        offensive_rebounds=None,
+        assists=None,
+        turnovers=None,
+    )

sportsball-0.3.118/sportsball/data/afl/afl/afl_afl_venue_model.py → sportsball-0.3.120/sportsball/data/nba/nbacom/nba_nbacom_venue_model.py

@@ -1,4 +1,4 @@
-"""AFL AFL venue model."""
+"""NBA NBA.com venue model."""
 
 # pylint: disable=too-many-statements,protected-access
 import datetime
@@ -9,7 +9,7 @@ from ...google.google_address_model import create_google_address_model
 from ...venue_model import VenueModel
 
 
-def create_afl_afl_venue_model(
+def create_nba_nbacom_venue_model(
     venue_name: str,
     session: requests_cache.CachedSession,
     dt: datetime.datetime,

{sportsball-0.3.118 → sportsball-0.3.120/sportsball.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.118
+Version: 0.3.120
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield

{sportsball-0.3.118 → sportsball-0.3.120}/sportsball.egg-info/SOURCES.txt

@@ -95,6 +95,12 @@ sportsball/data/nba/nba/__init__.py
 sportsball/data/nba/nba/nba_nba_game_model.py
 sportsball/data/nba/nba/nba_nba_league_model.py
 sportsball/data/nba/nba/nba_nba_team_model.py
+sportsball/data/nba/nbacom/__init__.py
+sportsball/data/nba/nbacom/nba_nbacom_game_model.py
+sportsball/data/nba/nbacom/nba_nbacom_league_model.py
+sportsball/data/nba/nbacom/nba_nbacom_player_model.py
+sportsball/data/nba/nbacom/nba_nbacom_team_model.py
+sportsball/data/nba/nbacom/nba_nbacom_venue_model.py
 sportsball/data/nba/oddsportal/__init__.py
 sportsball/data/nba/oddsportal/nba_oddsportal_league_model.py
 sportsball/data/nba/sportsdb/__init__.py