sportsball 0.3.54__tar.gz → 0.3.56__tar.gz

{sportsball-0.3.54/sportsball.egg-info → sportsball-0.3.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.54
+Version: 0.3.56
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield
@@ -16,7 +16,7 @@ Requires-Dist: requests>=2.31.0
 Requires-Dist: requests-cache>=1.2.0
 Requires-Dist: python-dateutil>=1.16.0
 Requires-Dist: tqdm>=4.66.2
-Requires-Dist: beautifulsoup4>=4.12.3
+Requires-Dist: beautifulsoup4>=4.13.3
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: joblib>=1.4.2
 Requires-Dist: pyarrow>=18.0.0

{sportsball-0.3.54 → sportsball-0.3.56}/requirements.txt

@@ -3,7 +3,7 @@ requests>=2.31.0
 requests-cache>=1.2.0
 python-dateutil>=1.16.0
 tqdm>=4.66.2
-beautifulsoup4>=4.12.3
+beautifulsoup4>=4.13.3
 openpyxl>=3.1.5
 joblib>=1.4.2
 pyarrow>=18.0.0

{sportsball-0.3.54 → sportsball-0.3.56}/setup.py

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

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.54"
+__VERSION__ = "0.3.56"

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/afl/afl/afl_afl_player_model.py

@@ -21,4 +21,5 @@ def create_afl_afl_player_model(
         assists=None,
         turnovers=None,
         name=name,
+        marks=None,
     )

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/afl/afltables/afl_afltables_game_model.py

@@ -1,6 +1,6 @@
 """AFL AFLTables game model."""
 
-# pylint: disable=too-many-arguments
+# pylint: disable=too-many-arguments,too-many-branches
 import datetime
 import urllib.parse
 from urllib.parse import urlparse
@@ -152,7 +152,7 @@ def _create_afl_afltables_game_model(
 
     def _find_teams_metadata(
         soup: BeautifulSoup, team_infos: list[tuple[str, str, int]]
-    ) -> list[tuple[str, list[tuple[str, str, int | None, str]], int]]:
+    ) -> list[tuple[str, list[tuple[str, str, int | None, str, int | None]], int]]:
         def _is_correct_table(table: Tag, name: str) -> bool:
             for th in table.find_all("th"):
                 header_text = th.get_text().strip()
@@ -160,8 +160,10 @@ def _create_afl_afltables_game_model(
                     return True
             return False
 
-        def _find_players(table: Tag) -> list[tuple[str, str, int | None, str]]:
-            players: list[tuple[str, str, int | None, str]] = []
+        def _find_players(
+            table: Tag,
+        ) -> list[tuple[str, str, int | None, str, int | None]]:
+            players: list[tuple[str, str, int | None, str, int | None]] = []
             for tr in table.find_all("tr"):
                 player_row = False
                 player_url = None
@@ -174,6 +176,7 @@ def _create_afl_afltables_game_model(
                     jersey = None
                     name = None
                     kicks = None
+                    marks = None
                     for count, td in enumerate(tr.find_all("td")):
                         if count == 0:
                             jersey = td.get_text().strip()
@@ -188,13 +191,17 @@ def _create_afl_afltables_game_model(
                             kicks_text = td.get_text().strip()
                             if kicks_text:
                                 kicks = int(kicks_text)
+                        elif count == 3:
+                            marks_text = td.get_text().strip()
+                            if marks_text:
+                                marks = int(marks_text)
 
                     if jersey is None:
                         raise ValueError("jersey is null.")
                     if name is None:
                         raise ValueError("name is null")
 
-                    players.append((player_url, jersey, kicks, name))
+                    players.append((player_url, jersey, kicks, name, marks))
             return players
 
         team_metadata = []

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/afl/afltables/afl_afltables_player_model.py

@@ -13,7 +13,7 @@ from ...player_model import PlayerModel
 
 
 def _create_afl_afltables_player_model(
-    player_url: str, jersey: str, kicks: int | None, name: str
+    player_url: str, jersey: str, kicks: int | None, name: str, marks: int | None
 ) -> PlayerModel:
     o = urlparse(player_url)
     last_component = o.path.split("/")[-1]
@@ -31,14 +31,15 @@ def _create_afl_afltables_player_model(
         assists=None,
         turnovers=None,
         name=name,
+        marks=marks,
     )
 
 
 @MEMORY.cache
 def _cached_create_afl_afltables_player_model(
-    player_url: str, jersey: str, kicks: int | None, name: str
+    player_url: str, jersey: str, kicks: int | None, name: str, marks: int | None
 ) -> PlayerModel:
-    return _create_afl_afltables_player_model(player_url, jersey, kicks, name)
+    return _create_afl_afltables_player_model(player_url, jersey, kicks, name, marks)
 
 
 def create_afl_afltables_player_model(
@@ -48,6 +49,7 @@ def create_afl_afltables_player_model(
     dt: datetime.datetime,
     session: requests_cache.CachedSession,
     name: str,
+    marks: int | None,
 ) -> PlayerModel:
     """Create a player model from AFL Tables."""
     if (
@@ -59,6 +61,9 @@ def create_afl_afltables_player_model(
             jersey,
             kicks,
             name,  # pyright: ignore
+            marks,
         )
     with session.cache_disabled():
-        return _create_afl_afltables_player_model(player_url, jersey, kicks, name)
+        return _create_afl_afltables_player_model(
+            player_url, jersey, kicks, name, marks
+        )

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/afl/afltables/afl_afltables_team_model.py

@@ -44,7 +44,7 @@ _TEAM_NAME_MAP = {
 
 def _create_afl_afltables_team_model(
     team_url: str,
-    players: list[tuple[str, str, int | None, str]],
+    players: list[tuple[str, str, int | None, str, int | None]],
     points: float,
     session: requests_cache.CachedSession,
     last_ladder_ranks: dict[str, int] | None,
@@ -72,9 +72,9 @@ def _create_afl_afltables_team_model(
         name=name,
         players=[  # pyright: ignore
             create_afl_afltables_player_model(
-                player_url, jersey, kicks, dt, session, name
+                player_url, jersey, kicks, dt, session, name, marks
             )
-            for player_url, jersey, kicks, name in players
+            for player_url, jersey, kicks, name, marks in players
         ],
         odds=[],
         points=points,
@@ -89,7 +89,7 @@ def _create_afl_afltables_team_model(
 @MEMORY.cache(ignore=["session"])
 def _cached_create_afl_afltables_team_model(
     team_url: str,
-    players: list[tuple[str, str, int | None, str]],
+    players: list[tuple[str, str, int | None, str, int | None]],
     points: float,
     session: requests_cache.CachedSession,
     last_ladder_ranks: dict[str, int] | None,
@@ -97,13 +97,19 @@ def _cached_create_afl_afltables_team_model(
     league: League,
 ) -> TeamModel:
     return _create_afl_afltables_team_model(
-        team_url, players, points, session, last_ladder_ranks, dt, league
+        team_url,
+        players,
+        points,
+        session,
+        last_ladder_ranks,
+        dt,
+        league,
     )
 
 
 def create_afl_afltables_team_model(
     team_url: str,
-    players: list[tuple[str, str, int | None, str]],
+    players: list[tuple[str, str, int | None, str, int | None]],
     points: float,
     session: requests_cache.CachedSession,
     last_ladder_ranks: dict[str, int] | None,

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/combined/combined_player_model.py

@@ -1,6 +1,6 @@
 """Combined player model."""
 
-# pylint: disable=too-many-locals
+# pylint: disable=too-many-locals,too-many-branches
 from ..player_model import PlayerModel
 
 
@@ -18,6 +18,7 @@ def create_combined_player_model(
     assists = None
     turnovers = None
     name = None
+    marks = None
     for player_model in player_models:
         player_model_jersey = player_model.jersey
         if player_model_jersey is not None:
@@ -49,6 +50,9 @@ def create_combined_player_model(
         player_model_name = player_model.name
         if player_model_name is not None:
             name = player_model_name
+        player_model_marks = player_model.marks
+        if player_model_marks is not None:
+            marks = player_model_marks
     if name is None:
         raise ValueError("name is null.")
     return PlayerModel(
@@ -63,4 +67,5 @@ def create_combined_player_model(
         assists=assists,
         turnovers=turnovers,
         name=name,
+        marks=marks,
     )

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/espn/espn_player_model.py

@@ -45,6 +45,7 @@ def _create_espn_player_model(
         assists=None,
         turnovers=None,
         name=name,
+        marks=None,
     )
 
 

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/google/google_address_model.py

@@ -12652,6 +12652,25 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="563",
         country="USA",
     ),
+    "Mercyhurst Athletic Center, Erie, Pennsylvania": SportsballGeocodeTuple(
+        city="Erie",
+        state="PA",
+        postal="",
+        lat=42.1046,
+        lng=-80.0556,
+        housenumber="",
+        country="USA",
+    ),
+    "Monroe, Louisiana": SportsballGeocodeTuple(
+        city="Monroe",
+        state="LA",
+        postal="",
+        lat=32.509444,
+        lng=-92.118333,
+        housenumber="",
+        country="USA",
+    ),
+    "Bison Sports Arena, Fargo, North Dakota": SCHEELS_ARENA,
 }
 
 

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/player_model.py

@@ -15,6 +15,7 @@ FIELD_GOALS_ATTEMPTED_COLUMN: Literal["field_goals_attempted"] = "field_goals_at
 OFFENSIVE_REBOUNDS_COLUMN: Literal["offensive_rebounds"] = "offensive_rebounds"
 ASSISTS_COLUMN: Literal["assists"] = "assists"
 TURNOVERS_COLUMN: Literal["turnovers"] = "turnovers"
+PLAYER_MARKS_COLUMN: Literal["marks"] = "marks"
 
 
 class PlayerModel(BaseModel):
@@ -67,3 +68,8 @@ class PlayerModel(BaseModel):
         alias=TURNOVERS_COLUMN,
     )
     name: str
+    marks: int | None = Field(
+        ...,
+        json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
+        alias=PLAYER_MARKS_COLUMN,
+    )

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/sportsreference/sportsreference_game_model.py

@@ -4,6 +4,7 @@
 import datetime
 import io
 import logging
+import re
 import urllib.parse
 
 import dateutil
@@ -41,6 +42,7 @@ _MONTHS = [
     "November",
     "December",
 ]
+_NUMBER_PARENTHESIS_PATTERN = r"\(\d+\)"
 
 
 def _find_old_dt(
@@ -142,7 +144,9 @@ def _find_old_dt(
                     points = int(team_name.split()[-1].strip())
                     team_name = " ".join(team_name.split()[:-1]).strip()
                     break
-            team_name = team_name.split("(")[0].strip()
+            team_name = " ".join(
+                re.sub(_NUMBER_PARENTHESIS_PATTERN, "", team_name).split()
+            ).strip()
             team_a = soup.find("a", text=team_name, href=True)
             if not isinstance(team_a, Tag):
                 logging.error(team_name)
@@ -206,9 +210,17 @@ def _find_old_dt(
         dt = parse(date)
         for df in dfs:
             test_row = df.iat[0, 0]
-            if "Prev Game" in test_row:
-                _process_team_row(df)
-                break
+            if isinstance(test_row, float):
+                continue
+            try:
+                if "Prev Game" in test_row:
+                    _process_team_row(df)
+                    break
+            except TypeError as exc:
+                logging.error(test_row)
+                logging.error(response.url)
+                logging.error(response.text)
+                raise exc
 
     if venue_name is not None and not venue_name.replace(",", "").strip():
         venue_name = None

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/sportsreference/sportsreference_player_model.py

@@ -78,6 +78,7 @@ def _create_sportsreference_player_model(
         assists=assists.get(name),
         turnovers=turnovers.get(name),
         name=name,
+        marks=None,
     )
 
 

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball/data/sportsreference/sportsreference_team_model.py

@@ -68,6 +68,7 @@ def _find_name(response: requests.Response, soup: BeautifulSoup, url: str) -> st
             if not isinstance(name_tag, Tag):
                 name_tag = soup.find("meta", itemprop="og:title")
                 if not isinstance(name_tag, Tag):
+                    logging.error(type(name_tag))
                     logging.error(response.text)
                     raise ValueError("name_tag not a tag.") from exc
             content = name_tag.get("content")

{sportsball-0.3.54 → sportsball-0.3.56/sportsball.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.54
+Version: 0.3.56
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield
@@ -16,7 +16,7 @@ Requires-Dist: requests>=2.31.0
 Requires-Dist: requests-cache>=1.2.0
 Requires-Dist: python-dateutil>=1.16.0
 Requires-Dist: tqdm>=4.66.2
-Requires-Dist: beautifulsoup4>=4.12.3
+Requires-Dist: beautifulsoup4>=4.13.3
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: joblib>=1.4.2
 Requires-Dist: pyarrow>=18.0.0

{sportsball-0.3.54 → sportsball-0.3.56}/sportsball.egg-info/requires.txt

@@ -3,7 +3,7 @@ requests>=2.31.0
 requests-cache>=1.2.0
 python-dateutil>=1.16.0
 tqdm>=4.66.2
-beautifulsoup4>=4.12.3
+beautifulsoup4>=4.13.3
 openpyxl>=3.1.5
 joblib>=1.4.2
 pyarrow>=18.0.0

{sportsball-0.3.54 → sportsball-0.3.56}/tests/data/afl/afltables/afl_afltables_player_model_test.py

@@ -24,5 +24,6 @@ class TestAFLTablesPlayerModel(unittest.TestCase):
                 dt,
                 self._session,
                 "Dennis Armfield",
+                0,
             )
             self.assertEqual(player_model.identifier, "Dennis_Armfield")

{sportsball-0.3.54 → sportsball-0.3.56}/tests/data/combined/combined_player_model_test.py

@@ -30,6 +30,7 @@ class TestCombinedPlayerModel(unittest.TestCase):
                 assists=None,
                 turnovers=None,
                 name="James Jones",
+                marks=None,
             )
             combined_player_model = create_combined_player_model(
                 [player_model],

{sportsball-0.3.54 → sportsball-0.3.56}/tests/data/player_model_test.py

@@ -19,6 +19,7 @@ class TestPlayerModel(unittest.TestCase):
             assists=None,
             turnovers=None,
             name="James Jones",
+            marks=None,
         )
 
     def test_field_goals_attempted(self):

{sportsball-0.3.54 → sportsball-0.3.56}/tests/data/sportsreference/sportsreference_game_model_test.py

@@ -945,3 +945,77 @@ class TestSportsReferenceGameModel(unittest.TestCase):
                 datetime.datetime(2010, 10, 10, 10, 10, 0),
             )
             self.assertEqual(game_model.dt, datetime.datetime(2016, 4, 2, 0, 0))
+
+    def test_dt_old_style_19(self):
+        url = "https://www.sports-reference.com/cbb/boxscores/2016-03-24-villanova.html"
+        with requests_mock.Mocker() as m:
+            with open(os.path.join(self.dir, "2016-03-24-villanova.html"), "rb") as f:
+                m.get(url, content=f.read())
+            with open(os.path.join(self.dir, "miami-fl_2016.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/schools/miami-fl/2016.html", content=f.read())
+            with open(os.path.join(self.dir, "sheldon-mcclellan-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/sheldon-mcclellan-1.html", content=f.read())
+            with open(os.path.join(self.dir, "anthony-lawrencejr-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/anthony-lawrencejr-1.html", content=f.read())
+            with open(os.path.join(self.dir, "davon-reed-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/davon-reed-1.html", content=f.read())
+            with open(os.path.join(self.dir, "kamari-murphy-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/kamari-murphy-1.html", content=f.read())
+            with open(os.path.join(self.dir, "angel-rodriguez-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/angel-rodriguez-1.html", content=f.read())
+            with open(os.path.join(self.dir, "mike-robinson-4.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/mike-robinson-4.html", content=f.read())
+            with open(os.path.join(self.dir, "ebuka-izundu-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/ebuka-izundu-1.html", content=f.read())
+            with open(os.path.join(self.dir, "jaquan-newton-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/jaquan-newton-1.html", content=f.read())
+            with open(os.path.join(self.dir, "james-palmer-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/james-palmer-1.html", content=f.read())
+            with open(os.path.join(self.dir, "tonye-jekiri-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/tonye-jekiri-1.html", content=f.read())
+            with open(os.path.join(self.dir, "villanova_2016.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/schools/villanova/2016.html", content=f.read())
+            with open(os.path.join(self.dir, "jalen-brunson-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/jalen-brunson-1.html", content=f.read())
+            with open(os.path.join(self.dir, "ryan-arcidiacono-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/ryan-arcidiacono-1.html", content=f.read())
+            with open(os.path.join(self.dir, "kevin-rafferty-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/kevin-rafferty-1.html", content=f.read())
+            with open(os.path.join(self.dir, "mikal-bridges-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/mikal-bridges-1.html", content=f.read())
+            with open(os.path.join(self.dir, "daniel-ochefu-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/daniel-ochefu-1.html", content=f.read())
+            with open(os.path.join(self.dir, "phil-booth-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/phil-booth-1.html", content=f.read())
+            with open(os.path.join(self.dir, "darryl-reynolds-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/darryl-reynolds-1.html", content=f.read())
+            with open(os.path.join(self.dir, "kris-jenkins-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/kris-jenkins-1.html", content=f.read())
+            with open(os.path.join(self.dir, "patrick-farrell-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/patrick-farrell-1.html", content=f.read())
+            with open(os.path.join(self.dir, "josh-hart-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/josh-hart-1.html", content=f.read())
+            with open(os.path.join(self.dir, "henry-lowe-1.html"), "rb") as f:
+                m.get("https://www.sports-reference.com/cbb/players/henry-lowe-1.html", 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(2016, 3, 24, 0, 0))
+
+    def test_dt_old_style_20(self):
+        url = "https://www.sports-reference.com/cbb/boxscores/2016-02-23-savannah-state.html"
+        with requests_mock.Mocker() as m:
+            with open(os.path.join(self.dir, "2016-02-23-savannah-state.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(2016, 2, 23, 0, 0))

{sportsball-0.3.54 → sportsball-0.3.56}/tests/data/sportsreference/sportsreference_team_model_test.py

@@ -166,3 +166,23 @@ class TestSportsReferenceTeamModel(unittest.TestCase):
                 {},
             )
             self.assertEqual(team_model.name, "Los Angeles Lakers")
+
+    def test_name_3(self):
+        url = "https://www.basketball-reference.com/teams/BOS/2015.html"
+        with requests_mock.Mocker() as m:
+            with open(os.path.join(self.dir, "BOS_2015.html"), "rb") as f:
+                m.get(url, content=f.read())
+            team_model = create_sportsreference_team_model(
+                self.session,
+                url,
+                datetime.datetime(2010, 10, 10, 10, 10, 00),
+                League.NBA,
+                set(),
+                10.0,
+                {},
+                {},
+                {},
+                {},
+                {},
+            )
+            self.assertEqual(team_model.name, "Boston Celtics")