sportsball 0.4.1__tar.gz → 0.4.3__tar.gz

{sportsball-0.4.1/sportsball.egg-info → sportsball-0.4.3}/PKG-INFO

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

{sportsball-0.4.1 → sportsball-0.4.3}/setup.py

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

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/__init__.py

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

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/data/afl/afltables/afl_afltables_coach_model.py

@@ -47,7 +47,7 @@ def _create_afl_afltables_coach_model(
             start_year, end_year = [int(x) for x in year_range.split("-")]
         else:
             start_year = end_year = int(year_range)
-        if start_year <= year >= end_year:
+        if start_year <= year <= end_year:
             name = names[count].strip()
             break
     if name is None:

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/data/espn/espn_game_model.py

@@ -198,7 +198,7 @@ def create_espn_game_model(
     dt = parse(event["date"])
     if (
         not pytest_is_running.is_running()
-        and dt < datetime.datetime.now() - datetime.timedelta(days=7)
+        and dt < datetime.datetime.now().date() - datetime.timedelta(days=7)
     ):
         return _cached_create_espn_game_model(
             event,

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/data/google/google_address_model.py

@@ -3196,6 +3196,24 @@ MONROE = SportsballGeocodeTuple(
     housenumber="",
     country="USA",
 )
+YOKOHAMA_ARENA = SportsballGeocodeTuple(
+    city="Kanagawa",
+    state="",
+    postal="",
+    lat=35.512389,
+    lng=139.620056,
+    housenumber="",
+    country="Japan",
+)
+BELL_CENTRE = SportsballGeocodeTuple(
+    city="Montreal",
+    state="QC",
+    postal="",
+    lat=45.496111,
+    lng=-73.569444,
+    housenumber="1909",
+    country="CA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -7990,15 +8008,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": DELTA_CENTER,
-    "Yokohama Arena": SportsballGeocodeTuple(
-        city="Kanagawa",
-        state="",
-        postal="",
-        lat=35.512389,
-        lng=139.620056,
-        housenumber="",
-        country="Japan",
-    ),
+    "Yokohama Arena": YOKOHAMA_ARENA,
     "Anaheim Convention Center": ANAHEIM_CONVENTION_CENTER,
     "TD Banknorth Garden": TD_GARDEN,
     "Amway Arena": ORLANDO_ARENA,
@@ -8875,15 +8885,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     "Climate Pledge Arena - Seattle, Washington - United States": CLIMATE_PLEDGE_ARENA,
     "Wells Fargo Center - Philadelphia, PA - United States": SPECTRUM,
     "State Farm Arena - Atlanta, Georgia - United States": STATE_FARM_ARENA,
-    "Bell Centre": SportsballGeocodeTuple(
-        city="Montreal",
-        state="QC",
-        postal="",
-        lat=45.496111,
-        lng=-73.569444,
-        housenumber="1909",
-        country="CA",
-    ),
+    "Bell Centre": BELL_CENTRE,
     "Footprint Center - Phoenix, Arizona - United States": AMERICA_WEST_ARENA,
     "Smoothie King Center - New Orleans, Louisiana, USA - United States": CAESARS_SUPERDOME,
     "Kaseya Center - Miami, Florida - United States": KASEYA_CENTER,
@@ -15525,6 +15527,10 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="",
         country="Italy",
     ),
+    "TIO Traeger Park, Alice Springs": TIO_STADIUM,
+    "Hard Rock Stadium, Miami Gardens, FL, USA": HARD_ROCK_STADIUM,
+    "Yokohama Arena - Yokohama, Kanagawa - Japan": YOKOHAMA_ARENA,
+    "Centre Bell - Montreal, Quebec, Canada - Canada": BELL_CENTRE,
 }
 
 

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/data/hkjc/hkjc/hkjc_hkjc_coach_model.py

@@ -32,6 +32,8 @@ def _create_hkjc_hkjc_coach_model(
             age_str = df.iat[1, 0].strip().split(":")[-1].strip().split(",")[0].strip()
             if "–" in age_str:
                 age_str = age_str.split("–")[-1].strip()
+            if "-" in age_str:
+                age_str = age_str.split("-")[-1].strip()
             age = int(age_str)
 
     if name is None:

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/data/hkjc/hkjc/hkjc_hkjc_game_model.py

@@ -3,6 +3,7 @@
 # pylint: disable=too-many-nested-blocks,too-many-statements,too-many-branches,too-many-locals
 import datetime
 import io
+import logging
 import urllib.parse
 from urllib.parse import urlparse
 
@@ -36,6 +37,10 @@ def _create_hkjc_hkjc_game_model(
         div_text = div.get_text().strip()
         if div_text.lower() == "no information.":
             return None
+    for div in soup.find_all("div"):
+        div_text = div.get_text().strip()
+        if "this race is declared abandoned" in div_text.lower():
+            return None
 
     o = urlparse(url)
     query = urllib.parse.parse_qs(o.query)
@@ -55,7 +60,13 @@ def _create_hkjc_hkjc_game_model(
     for count, df in enumerate(dfs):
         if count == 1:
             race_track = df.iat[2, 2].split("-")[0].strip()
-            distance = float(df.iat[1, 0].split("-")[1].strip().replace("M", ""))
+            distance = 0.0
+            try:
+                distance = float(df.iat[1, 0].split("-")[1].strip().replace("M", ""))
+            except IndexError:
+                logging.error(html)
+                logging.error(url)
+                raise
             pot = float(df.iat[3, 0].split()[-1].strip().replace(",", ""))
         elif count == 2:
             for _, row in df.iterrows():
@@ -80,7 +91,7 @@ def _create_hkjc_hkjc_game_model(
                 if starting_position_str.strip() != "---":
                     starting_position = position_from_str(starting_position_str.strip())
 
-                lbw = 0.0
+                lbw: float | None = 0.0
                 lbw_str = row["LBW"].strip()
                 if lbw_str == "HD":
                     lbw = 2.4 * 0.2
@@ -88,14 +99,17 @@ def _create_hkjc_hkjc_game_model(
                     lbw = 2.4 * 0.2 * 0.5
                 elif lbw_str in {"NOSE", "N"}:
                     lbw = 2.4 * 0.05
+                elif lbw_str == "ML":
+                    lbw = None
                 elif lbw_str and lbw_str != "-" and lbw_str != "---":
-                    if "-" in lbw_str:
-                        lbw_horses, lbw_str = lbw_str.split("-")
-                        lbw += 2.4 * int(lbw_horses)
-                    if "/" in lbw_str:
-                        lbw += 2.4 * (1.0 / int(lbw_str.split("/")[-1]))
-                    else:
-                        lbw += 2.4 * int(lbw_str)
+                    if lbw is not None:
+                        if "-" in lbw_str:
+                            lbw_horses, lbw_str = lbw_str.split("-")
+                            lbw += 2.4 * int(lbw_horses)
+                        if "/" in lbw_str:
+                            lbw += 2.4 * (1.0 / int(lbw_str.split("/")[-1]))
+                        else:
+                            lbw += 2.4 * int(lbw_str)
 
                 finish_time_str = row["Finish Time"].strip()
                 end_dt = None
@@ -165,6 +179,7 @@ def _create_hkjc_hkjc_game_model(
                 dividend_str = str(row_df.iat[2, 0]).strip().lower()
                 if dividend_str == "details":
                     continue
+                dividend_str = dividend_str.split("/", maxsplit=1)[0].replace(",", "")
                 dividend = float(dividend_str)
 
                 combination = None

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/data/hkjc/hkjc/hkjc_hkjc_player_model.py

@@ -32,6 +32,10 @@ def _create_hkjc_hkjc_player_model(
     headers = {X_NO_WAYBACK: "1"}
     response = session.get(url, headers=headers)
     response.raise_for_status()
+
+    o = urlparse(url)
+    is_sire = o.path.endswith("Horse/SameSire.aspx")
+
     handle = io.StringIO()
     handle.write(response.text)
     handle.seek(0)
@@ -40,7 +44,12 @@ def _create_hkjc_hkjc_player_model(
         dfs = pd.read_html(handle)
     except AttributeError as exc:
         logging.warning(str(exc))
-    o = urlparse(url)
+    except ValueError:
+        if not is_sire:
+            logging.error(response.text)
+            logging.error(url)
+            raise
+
     soup = BeautifulSoup(response.text, "lxml")
 
     name = None

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/data/hkjc/hkjc/hkjc_hkjc_team_model.py

@@ -24,7 +24,7 @@ def _create_hkjc_hkjc_team_model(
     handicap_weight: float,
     horse_weight: float | None,
     starting_position: Position | None,
-    lbw: float,
+    lbw: float | None,
     end_dt: datetime.datetime | None,
     odds: list[OddsModel],
 ) -> TeamModel:
@@ -75,7 +75,7 @@ def _cached_create_hkjc_hkjc_team_model(
     handicap_weight: float,
     horse_weight: float | None,
     starting_position: Position | None,
-    lbw: float,
+    lbw: float | None,
     end_dt: datetime.datetime | None,
     odds: list[OddsModel],
 ) -> TeamModel:
@@ -105,7 +105,7 @@ def create_hkjc_hkjc_team_model(
     handicap_weight: float,
     horse_weight: float | None,
     starting_position: Position | None,
-    lbw: float,
+    lbw: float | None,
     end_dt: datetime.datetime | None,
     odds: list[OddsModel],
 ) -> TeamModel:

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball/data/sportsreference/sportsreference_team_model.py

@@ -41,6 +41,7 @@ _NON_WAYBACK_URLS: set[str] = {
     "https://www.sports-reference.com/cbb/schools/rice/women/2019.html",
     "https://www.sports-reference.com/cbb/schools/north-carolina/women/2018.html",
     "https://www.sports-reference.com/cbb/schools/minnesota/women/2009.html",
+    "https://www.basketball-reference.com/teams/GSW/2016.html",
 }
 _BAD_TEAM_URLS = {
     "https://www.sports-reference.com/cbb/schools/mid-atlantic-christian/2016.html",
@@ -173,10 +174,6 @@ def _create_sportsreference_team_model(
         if entity_identifier == "coaches":
             coach_url = a_url
             break
-    if coach_url is None:
-        logging.error(response.text)
-        logging.error(response.url)
-        raise ValueError("coach_url is null")
 
     o = urlparse(url)
     sex_id = o.path.split("/")[-2]
@@ -226,7 +223,9 @@ def _create_sportsreference_team_model(
         location=None,
         news=create_google_news_models(name, session, dt, league),
         social=create_x_social_model(name, session, dt),
-        coaches=[create_sportsreference_coach_model(session, coach_url, dt)],
+        coaches=[create_sportsreference_coach_model(session, coach_url, dt)]
+        if coach_url is not None
+        else [],
         lbw=None,
         end_dt=None,
     )

{sportsball-0.4.1 → sportsball-0.4.3/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.4.1 → sportsball-0.4.3}/sportsball.egg-info/SOURCES.txt

@@ -204,6 +204,7 @@ tests/data/afl/afl/__init__.py
 tests/data/afl/afl/afl_afl_game_model_test.py
 tests/data/afl/afl/afl_afl_league_model_test.py
 tests/data/afl/afltables/__init__.py
+tests/data/afl/afltables/afl_afltables_coach_model_test.py
 tests/data/afl/afltables/afl_afltables_game_model_test.py
 tests/data/afl/afltables/afl_afltables_league_model_test.py
 tests/data/afl/afltables/afl_afltables_player_model_test.py
@@ -222,6 +223,7 @@ tests/data/google/google_news_model_test.py
 tests/data/hkjc/__init__.py
 tests/data/hkjc/hkjc/__init__.py
 tests/data/hkjc/hkjc/hkjc_hkjc_game_model_test.py
+tests/data/hkjc/hkjc/hkjc_hkjc_player_model_test.py
 tests/data/nba/__init__.py
 tests/data/nba/nba/__init__.py
 tests/data/nba/nba/nba_nba_game_model_test.py

sportsball-0.4.3/tests/data/afl/afltables/afl_afltables_coach_model_test.py

@@ -0,0 +1,30 @@
+"""Tests for the afltables coach model class."""
+import os
+import unittest
+import datetime
+
+import requests_mock
+import requests_cache
+from sportsball.data.afl.afltables.afl_afltables_coach_model import create_afl_afltables_coach_model
+
+
+class TestAFLTablesCoachModel(unittest.TestCase):
+
+    def setUp(self):
+        self._session = requests_cache.CachedSession(backend="memory")
+        self.dir = os.path.dirname(__file__)
+
+    def test_dt(self):
+        with requests_mock.Mocker() as m:
+            url = "https://afltables.com/afl/stats/coaches/goldcoast.html"
+            with open(os.path.join(self.dir, "coaches_goldcoast.html"), "rb") as f:
+                m.get(url, content=f.read())
+            with open(os.path.join(self.dir, "Guy_McKenna.html"), "rb") as f:
+                m.get("https://afltables.com/afl/stats/coaches/Guy_McKenna.html", content=f.read())
+            coach_model = create_afl_afltables_coach_model(
+                url=url,
+                session=self._session,
+                year=2012,
+                dt=datetime.datetime(2012, 10, 10),
+            )
+            self.assertEqual(coach_model.name, "McKenna, Guy")

{sportsball-0.4.1 → sportsball-0.4.3}/tests/data/afl/afltables/afl_afltables_game_model_test.py

@@ -126,6 +126,10 @@ class TestAFLTablesGameModel(unittest.TestCase):
                 m.get("https://afltables.com/afl/stats/coaches/John_Worsfold.html", content=f.read())
             with open(os.path.join(self.dir, "Ross_Lyon.html"), "rb") as f:
                 m.get("https://afltables.com/afl/stats/coaches/Ross_Lyon.html", content=f.read())
+            with open(os.path.join(self.dir, "Andrew_McQualter.html"), "rb") as f:
+                m.get("https://afltables.com/afl/stats/coaches/Andrew_McQualter.html", content=f.read())
+            with open(os.path.join(self.dir, "Justin_Longmuir.html"), "rb") as f:
+                m.get("https://afltables.com/afl/stats/coaches/Justin_Longmuir.html", content=f.read())
             m.get("https://historical-forecast-api.open-meteo.com/v1/forecast?latitude=-31.9511597&longitude=115.884175&start_date=2025-03-29&end_date=2025-03-30&hourly=temperature_2m&hourly=relative_humidity_2m&hourly=dew_point_2m&hourly=apparent_temperature&hourly=precipitation&hourly=rain&hourly=snowfall&hourly=snow_depth&hourly=weather_code&hourly=pressure_msl&hourly=surface_pressure&hourly=cloud_cover&hourly=cloud_cover_low&hourly=cloud_cover_mid&hourly=cloud_cover_high&hourly=et0_fao_evapotranspiration&hourly=vapour_pressure_deficit&hourly=wind_speed_10m&hourly=wind_speed_100m&hourly=wind_direction_10m&hourly=wind_direction_100m&hourly=wind_gusts_10m&hourly=soil_temperature_0_to_7cm&hourly=soil_temperature_7_to_28cm&hourly=soil_temperature_28_to_100cm&hourly=soil_temperature_100_to_255cm&hourly=soil_moisture_0_to_7cm&hourly=soil_moisture_7_to_28cm&hourly=soil_moisture_28_to_100cm&hourly=soil_moisture_100_to_255cm&daily=weather_code&daily=temperature_2m_max&daily=temperature_2m_min&daily=temperature_2m_mean&daily=apparent_temperature_max&daily=apparent_temperature_min&daily=apparent_temperature_mean&daily=sunrise&daily=sunset&daily=daylight_duration&daily=sunshine_duration&daily=precipitation_sum&daily=rain_sum&daily=snowfall_sum&daily=precipitation_hours&daily=wind_speed_10m_max&daily=wind_gusts_10m_max&daily=wind_direction_10m_dominant&daily=shortwave_radiation_sum&daily=et0_fao_evapotranspiration&timezone=Australia%2FPerth&format=flatbuffers")
 
             game_model = _create_afl_afltables_game_model(

{sportsball-0.4.1 → sportsball-0.4.3}/tests/data/hkjc/hkjc/hkjc_hkjc_game_model_test.py

@@ -118,3 +118,15 @@ class TestHKJCHKJCGameModel(unittest.TestCase):
                 url="https://racing.hkjc.com/racing/information/English/Racing/LocalResults.aspx?RaceDate=2025/05/26&Racecourse=HV&RaceNo=1",
             )
             self.assertIsNone(game_model)
+
+    def test_race_declared_abandoned(self):
+        with requests_mock.Mocker() as m:
+            html = ""
+            with open(os.path.join(self.dir, "game3.html"), "r") as f:
+                html = f.read()
+            game_model = create_hkjc_hkjc_game_model(
+                session=self._session,
+                html=html,
+                url="https://racing.hkjc.com/racing/information/English/Racing/LocalResults.aspx?RaceDate=2024%2F11%2F13&RaceNo=7&Racecourse=HV",
+            )
+            self.assertIsNone(game_model)

sportsball-0.4.3/tests/data/hkjc/hkjc/hkjc_hkjc_player_model_test.py

@@ -0,0 +1,29 @@
+"""Tests for the HKJC HKJC player model class."""
+import os
+import unittest
+
+import requests_mock
+import requests_cache
+from sportsball.data.hkjc.hkjc.hkjc_hkjc_player_model import create_hkjc_hkjc_player_model
+
+
+class TestHKJCHKJCPlayerModel(unittest.TestCase):
+
+    def setUp(self):
+        self._session = requests_cache.CachedSession(backend="memory")
+        self.dir = os.path.dirname(__file__)
+
+    def test_no_table_for_sire(self):
+        with requests_mock.Mocker() as m:
+            url = "https://racing.hkjc.com/racing/information/english/Horse/SameSire.aspx?HorseSire=Nyquist"
+            with open(os.path.join(self.dir, "sire_nyquist_2.html"), "rb") as f:
+                m.get(url, content=f.read())
+            player_model = create_hkjc_hkjc_player_model(
+                session=self._session,
+                url=url,
+                jersey=None,
+                handicap_weight=None,
+                starting_position=None,
+                weight=None,
+            )
+            self.assertEqual(player_model.name, "Nyquist")

{sportsball-0.4.1 → sportsball-0.4.3}/tests/data/sportsreference/sportsreference_team_model_test.py

@@ -218,3 +218,27 @@ class TestSportsReferenceTeamModel(unittest.TestCase):
                 {},
             )
             self.assertEqual(team_model.name, "Boston Celtics")
+
+    def test_coach_url_null(self):
+        url = "https://www.basketball-reference.com/teams/GSW/2016.html"
+        with requests_mock.Mocker() as m:
+            with open(os.path.join(self.dir, "GSW_2016_2.html"), "rb") as f:
+                m.get(url, content=f.read())
+            with open(os.path.join(self.dir, "kerrst01c.html"), "rb") as f:
+                m.get("https://www.basketball-reference.com/coaches/kerrst01c.html", content=f.read())
+            team_model = create_sportsreference_team_model(
+                session=self.session,
+                url=url,
+                dt=datetime.datetime(2010, 10, 10, 10, 10, 00),
+                league=League.NBA,
+                player_urls=set(),
+                points=10.0,
+                fg={},
+                fga={},
+                offensive_rebounds={},
+                assists={},
+                turnovers={},
+                team_name="",
+                positions_validator={},
+            )
+            self.assertListEqual(team_model.coaches, [])