sportsball 0.3.60__tar.gz → 0.3.62__tar.gz

{sportsball-0.3.60/sportsball.egg-info → sportsball-0.3.62}/PKG-INFO

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

{sportsball-0.3.60 → sportsball-0.3.62}/setup.py

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

{sportsball-0.3.60 → sportsball-0.3.62}/sportsball/__init__.py

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

sportsball-0.3.62/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -0,0 +1,137 @@
+"""AFL AFL league model."""
+
+# pylint: disable=too-many-statements,protected-access,too-many-locals,bare-except,too-many-branches
+import datetime
+import logging
+import re
+from typing import Iterator
+
+import requests_cache
+from bs4 import BeautifulSoup
+from playwright.sync_api import sync_playwright
+
+from ....playwright import ensure_install
+from ...game_model import GameModel
+from ...league import League
+from ...league_model import LeagueModel
+from .afl_afl_game_model import create_afl_afl_game_model
+
+
+def _parse_game_info(
+    html: str, session: requests_cache.CachedSession, ladder: list[str]
+) -> 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(
+            "span", {"class": re.compile(".*team-lineups__team-name.*")}
+        ):
+            team_names.append(span.get_text().strip())
+        teams_players: list[list[tuple[str, str, str, str]]] = [[], []]
+        for div_positions_row in div.find_all(
+            "div", {"class": re.compile(".*team-lineups__positions-row.*")}
+        ):
+            row_players: list[list[tuple[str, str, str, str]]] = []
+            for div_team_players in div_positions_row.find_all(
+                "div",
+                {"class": re.compile(".*team-lineups__positions-players.*")},
+            ):
+                team_players: list[tuple[str, str, str, str]] = []
+                for a in div_team_players.find_all(
+                    "a", {"class": re.compile(".*js-player-profile-link.*")}
+                ):
+                    player_id = "afl:" + a.get("data-player-id")
+                    first_name = a.get("data-first-name")
+                    second_name = a.get("data-surname")
+                    player_number = None
+                    for span_player_number in a.find_all(
+                        "span",
+                        {"class": re.compile(".*team-lineups__player-number.*")},
+                    ):
+                        player_number = (
+                            span_player_number.get_text()
+                            .strip()
+                            .replace("[", "")
+                            .replace("]", "")
+                        )
+                    if player_number is None:
+                        raise ValueError("player_number is null")
+                    team_players.append(
+                        (player_id, player_number, first_name, second_name)
+                    )
+                row_players.append(team_players)
+                if len(row_players) >= 2:
+                    break
+                for count, row_players_list in enumerate(row_players):
+                    try:
+                        teams_players[count].extend(row_players_list)
+                    except IndexError as exc:
+                        # logging.error(html)
+                        logging.error(len(team_players))
+                        logging.error(count)
+                        raise exc
+        dt = None
+        for time in div.find_all(
+            "time", {"class": re.compile(".*match-list-alt__header-time.*")}
+        ):
+            dt = datetime.datetime.fromtimestamp(float(time.get("data-date")) / 1000.0)
+        venue_name: str | None = None
+        for span in div.find_all(
+            "span", {"class": re.compile(".*match-list-alt__header-venue.*")}
+        ):
+            venue_name = span.get_text().strip().replace(",", "")
+        if venue_name is None:
+            raise ValueError("venue_name is null")
+        if dt is None:
+            raise ValueError("dt is null")
+        yield create_afl_afl_game_model(
+            team_names, teams_players, dt, venue_name, session, ladder
+        )
+
+
+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)
+
+    @property
+    def _ladder(self) -> list[str]:
+        ladder = []
+        ensure_install()
+        with sync_playwright() as p:
+            browser = p.chromium.launch()
+            context = browser.new_context()
+            page = context.new_page()
+            try:
+                page.goto(
+                    "https://www.afl.com.au/ladder",
+                    wait_until="networkidle",
+                    timeout=60000.0,
+                )
+            except:  # noqa: E722
+                logging.warning("Ladder URL timed out.")
+            soup = BeautifulSoup(page.content(), "lxml")
+            for span in soup.find_all(
+                "span", {"class": re.compile(".*stats-table__club-name.*")}
+            ):
+                team_name = span.get_text().strip()
+                if team_name in ladder:
+                    continue
+                ladder.append(team_name)
+        return ladder
+
+    @property
+    def games(self) -> Iterator[GameModel]:
+        ladder = self._ladder
+        ensure_install()
+        with sync_playwright() as p:
+            browser = p.chromium.launch()
+            context = browser.new_context()
+            page = context.new_page()
+            page.goto(
+                "https://www.afl.com.au/matches/team-lineups", wait_until="networkidle"
+            )
+            yield from _parse_game_info(page.content(), self.session, ladder)

{sportsball-0.3.60 → sportsball-0.3.62}/sportsball/data/afl/combined/afl_combined_league_model.py

@@ -88,6 +88,9 @@ AFL_TEAM_IDENTITY_MAP = {
     "Fremantle Dockers": FREMANTLE,
     "West Coast Eagles": WESTCOAST,
     "Gold Coast Suns": GOLDCOAST,
+    # AFL
+    "GWS GIANTS": GWS,
+    "Gold Coast SUNS": GOLDCOAST,
 }
 BRUNSWICK_ST = "brunswick_st"
 VICTORIA_PARK = "victoria_park"

{sportsball-0.3.60 → sportsball-0.3.62}/sportsball/data/google/google_address_model.py

@@ -12738,6 +12738,26 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="300",
         country="USA",
     ),
+    "Boone, North Carolina": SportsballGeocodeTuple(
+        city="Boone",
+        state="NC",
+        postal="",
+        lat=36.211111,
+        lng=-81.666944,
+        housenumber="",
+        country="USA",
+    ),
+    "FedExForum - Memphis, Tennessee - United States": FEDEX_FORUM,
+    "Kia Center, Orlando, FL, EUA": KIA_CENTER,
+    "Davis Field House, Greenville, South Carolina": SportsballGeocodeTuple(
+        city="Greenville",
+        state="SC",
+        postal="",
+        lat=34.8725,
+        lng=-82.361944,
+        housenumber="",
+        country="USA",
+    ),
 }
 
 

{sportsball-0.3.60 → sportsball-0.3.62}/sportsball/data/sportsreference/sportsreference_game_model.py

@@ -178,28 +178,36 @@ def _find_old_dt(
         if len(df) == 2:
             test_row = df.iat[0, 0]
             test_row_2 = df.iat[1, 0]
+            if isinstance(test_row, float):
+                continue
 
-            if (
-                "Prev Game" in test_row
-                or "Next Game" in test_row
-                or "Lost" in test_row
-                or "PM," in test_row_2
-            ):
-                date_venue_split = df.iat[1, 0].split()
-                current_idx = 5
-                try:
-                    dt = parse(" ".join(date_venue_split[:current_idx]))
-                except dateutil.parser._parser.ParserError:  # type: ignore
+            try:
+                if (
+                    "Prev Game" in test_row
+                    or "Next Game" in test_row
+                    or "Lost" in test_row
+                    or "PM," in test_row_2
+                ):
+                    date_venue_split = df.iat[1, 0].split()
+                    current_idx = 5
                     try:
-                        current_idx = 3
                         dt = parse(" ".join(date_venue_split[:current_idx]))
                     except dateutil.parser._parser.ParserError:  # type: ignore
-                        dt = parse(
-                            " ".join(",".join(test_row.split(",")[1:]).split()[:3])
-                        )
-                venue_name = " ".join(date_venue_split[current_idx:])
-                _process_team_row(df)
-                break
+                        try:
+                            current_idx = 3
+                            dt = parse(" ".join(date_venue_split[:current_idx]))
+                        except dateutil.parser._parser.ParserError:  # type: ignore
+                            dt = parse(
+                                " ".join(",".join(test_row.split(",")[1:]).split()[:3])
+                            )
+                    venue_name = " ".join(date_venue_split[current_idx:])
+                    _process_team_row(df)
+                    break
+            except TypeError as exc:
+                logging.error(test_row)
+                logging.error(response.url)
+                logging.error(response.text)
+                raise exc
 
     if dt is None:
         title_tag = soup.find("title")

{sportsball-0.3.60 → sportsball-0.3.62/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.3.60 → sportsball-0.3.62}/sportsball.egg-info/SOURCES.txt

@@ -165,6 +165,8 @@ tests/data/player_model_test.py
 tests/data/social_model_test.py
 tests/data/team_model_test.py
 tests/data/afl/__init__.py
+tests/data/afl/afl/__init__.py
+tests/data/afl/afl/afl_afl_league_model_test.py
 tests/data/afl/afltables/__init__.py
 tests/data/afl/afltables/afl_afltables_game_model_test.py
 tests/data/afl/afltables/afl_afltables_league_model_test.py

sportsball-0.3.62/tests/data/afl/afl/afl_afl_league_model_test.py

@@ -0,0 +1,37 @@
+"""Tests for the afl AFL league model class."""
+import unittest
+import os
+import datetime
+
+import requests_cache
+from sportsball.data.afl.afl.afl_afl_league_model import _parse_game_info
+
+
+class TestAFLAFLLeagueModel(unittest.TestCase):
+
+    def setUp(self):
+        self.dir = os.path.dirname(__file__)
+        self._session = requests_cache.CachedSession(backend="memory")
+
+    def test_parse_game_info(self):
+        with open(os.path.join(self.dir, "team-lineups.html")) as handle:
+            list(_parse_game_info(handle.read(), self._session, [
+                "Melbourne",
+                "Richmond",
+                "Collingwood",
+                "Essendon",
+                "Fremantle",
+                "Adelaide Crows",
+                "St Kilda",
+                "Brisbane Lions",
+                "Port Adelaide",
+                "North Melbourne",
+                "GWS GIANTS",
+                "Western Bulldogs",
+                "Gold Coast SUNS",
+                "Sydney Swans",
+                "Carlton",
+                "Geelong Cats",
+                "Hawthorn",
+                "West Coast Eagles",
+            ]))

{sportsball-0.3.60 → sportsball-0.3.62}/tests/data/sportsreference/sportsreference_game_model_test.py

@@ -1019,3 +1019,17 @@ class TestSportsReferenceGameModel(unittest.TestCase):
                 datetime.datetime(2010, 10, 10, 10, 10, 0),
             )
             self.assertEqual(game_model.dt, datetime.datetime(2016, 2, 23, 0, 0))
+
+    def test_dt_old_style_21(self):
+        url = "https://www.sports-reference.com/cbb/boxscores/2015-11-23-detroit-mercy.html"
+        with requests_mock.Mocker() as m:
+            with open(os.path.join(self.dir, "2015-11-23-detroit-mercy.html"), "rb") as f:
+                m.get(url, content=f.read())
+
+            game_model = create_sportsreference_game_model(
+                self.session,
+                url,
+                League.NBA,
+                datetime.datetime(2010, 10, 10, 10, 10, 0),
+            )
+            self.assertEqual(game_model.dt, datetime.datetime(2015, 11, 23, 0, 0))

sportsball-0.3.60/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -1,132 +0,0 @@
-"""AFL AFL league model."""
-
-# pylint: disable=too-many-statements,protected-access,too-many-locals,bare-except
-import datetime
-import logging
-import re
-from typing import Iterator
-
-import requests_cache
-from bs4 import BeautifulSoup
-from playwright.sync_api import sync_playwright
-
-from ....playwright import ensure_install
-from ...game_model import GameModel
-from ...league import League
-from ...league_model import LeagueModel
-from .afl_afl_game_model import create_afl_afl_game_model
-
-
-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)
-
-    @property
-    def _ladder(self) -> list[str]:
-        ladder = []
-        ensure_install()
-        with sync_playwright() as p:
-            browser = p.chromium.launch()
-            context = browser.new_context()
-            page = context.new_page()
-            try:
-                page.goto(
-                    "https://www.afl.com.au/ladder",
-                    wait_until="networkidle",
-                    timeout=60000.0,
-                )
-            except:  # noqa: E722
-                logging.warning("Ladder URL timed out.")
-            soup = BeautifulSoup(page.content(), "lxml")
-            for span in soup.find_all(
-                "span", {"class": re.compile(".*stats-table__club-name.*")}
-            ):
-                team_name = span.get_text().strip()
-                if team_name in ladder:
-                    continue
-                ladder.append(team_name)
-        return ladder
-
-    @property
-    def games(self) -> Iterator[GameModel]:
-        # https://www.afl.com.au/matches/team-lineups
-        ladder = self._ladder
-        ensure_install()
-        with sync_playwright() as p:
-            browser = p.chromium.launch()
-            context = browser.new_context()
-            page = context.new_page()
-            page.goto(
-                "https://www.afl.com.au/matches/team-lineups", wait_until="networkidle"
-            )
-            soup = BeautifulSoup(page.content(), "lxml")
-            for div in soup.find_all(
-                "div", {"class": re.compile(".*js-match-list-item.*")}
-            ):
-                team_names = []
-                for span in div.find_all(
-                    "span", {"class": re.compile(".*team-lineups__team-name.*")}
-                ):
-                    team_names.append(span.get_text().strip())
-                teams_players: list[list[tuple[str, str, str, str]]] = [[], []]
-                for div_positions_row in div.find_all(
-                    "div", {"class": re.compile(".*team-lineups__positions-row.*")}
-                ):
-                    row_players: list[list[tuple[str, str, str, str]]] = []
-                    for div_team_players in div_positions_row.find_all(
-                        "div",
-                        {"class": re.compile(".*team-lineups__positions-players.*")},
-                    ):
-                        team_players: list[tuple[str, str, str, str]] = []
-                        for a in div_team_players.find_all(
-                            "a", {"class": re.compile(".*js-player-profile-link.*")}
-                        ):
-                            player_id = "afl:" + a.get("data-player-id")
-                            first_name = a.get("data-first-name")
-                            second_name = a.get("data-surname")
-                            player_number = None
-                            for span_player_number in a.find_all(
-                                "span",
-                                {
-                                    "class": re.compile(
-                                        ".*team-lineups__player-number.*"
-                                    )
-                                },
-                            ):
-                                player_number = (
-                                    span_player_number.get_text()
-                                    .strip()
-                                    .replace("[", "")
-                                    .replace("]", "")
-                                )
-                            if player_number is None:
-                                raise ValueError("player_number is null")
-                            team_players.append(
-                                (player_id, player_number, first_name, second_name)
-                            )
-                        row_players.append(team_players)
-                    for count, row_players_list in enumerate(row_players):
-                        teams_players[count].extend(row_players_list)
-                dt = None
-                for time in div.find_all(
-                    "time", {"class": re.compile(".*match-list-alt__header-time.*")}
-                ):
-                    dt = datetime.datetime.fromtimestamp(
-                        float(time.get("data-date")) / 1000.0
-                    )
-                venue_name: str | None = None
-                for span in div.find_all(
-                    "span", {"class": re.compile(".*match-list-alt__header-venue.*")}
-                ):
-                    venue_name = span.get_text().strip().replace(",", "")
-                if venue_name is None:
-                    raise ValueError("venue_name is null")
-                if dt is None:
-                    raise ValueError("dt is null")
-                yield create_afl_afl_game_model(
-                    team_names, teams_players, dt, venue_name, self.session, ladder
-                )