sportsball 0.4.2__tar.gz → 0.4.4__tar.gz

{sportsball-0.4.2/sportsball.egg-info → sportsball-0.4.4}/PKG-INFO

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

{sportsball-0.4.2 → sportsball-0.4.4}/setup.py

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

{sportsball-0.4.2 → sportsball-0.4.4}/sportsball/__init__.py

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

{sportsball-0.4.2 → sportsball-0.4.4}/sportsball/data/afl/afltables/afl_afltables_player_model.py

@@ -66,7 +66,11 @@ def _create_afl_afltables_player_model(
     except IndexError:
         logging.warning("Couldn't find birth date from %s", response.url)
 
-    weight = float(player_page_text.split("Weight:")[1].strip().split()[0].strip())
+    weight = None
+    try:
+        weight = float(player_page_text.split("Weight:")[1].strip().split()[0].strip())
+    except IndexError:
+        logging.warning("Couldn't find weight from %s", response.url)
 
     return PlayerModel(
         identifier=identifier,

{sportsball-0.4.2 → sportsball-0.4.4}/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.2 → sportsball-0.4.4}/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,
@@ -15527,6 +15529,8 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "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.2 → sportsball-0.4.4}/sportsball/data/hkjc/hkjc/hkjc_hkjc_game_model.py

@@ -91,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
@@ -99,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

{sportsball-0.4.2 → sportsball-0.4.4}/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)
@@ -41,10 +45,11 @@ def _create_hkjc_hkjc_player_model(
     except AttributeError as exc:
         logging.warning(str(exc))
     except ValueError:
-        logging.error(response.text)
-        logging.error(url)
-        raise
-    o = urlparse(url)
+        if not is_sire:
+            logging.error(response.text)
+            logging.error(url)
+            raise
+
     soup = BeautifulSoup(response.text, "lxml")
 
     name = None

{sportsball-0.4.2 → sportsball-0.4.4}/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.2 → sportsball-0.4.4/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.4.2 → sportsball-0.4.4}/sportsball.egg-info/SOURCES.txt

@@ -223,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.2 → sportsball-0.4.4}/tests/data/afl/afltables/afl_afltables_player_model_test.py

@@ -85,3 +85,40 @@ class TestAFLTablesPlayerModel(unittest.TestCase):
                 dt=datetime.datetime(2022, 10, 10),
             )
             self.assertIsNone(player_model.birth_date)
+
+    def test_null_weight(self):
+        with requests_mock.Mocker() as m:
+            url = "https://afltables.com/afl/stats/players/I/Ivan_Astruc.html"
+            with open(os.path.join(self.dir, "Ivan_Astruc.html"), "rb") as f:
+                m.get(url, content=f.read())
+            player_model = create_afl_afltables_player_model(
+                player_url=url,
+                jersey="35",
+                kicks=10,
+                session=self._session,
+                name="Dennis Armfield",
+                marks=0,
+                handballs=0,
+                disposals=0,
+                goals=0,
+                behinds=0,
+                hit_outs=0,
+                tackles=0,
+                rebounds=0,
+                insides=0,
+                clearances=0,
+                clangers=0,
+                free_kicks_for=0,
+                free_kicks_against=0,
+                brownlow_votes=0,
+                contested_possessions=0,
+                uncontested_possessions=0,
+                contested_marks=0,
+                marks_inside=0,
+                one_percenters=0,
+                bounces=0,
+                goal_assists=0,
+                percentage_played=0.0,
+                dt=datetime.datetime(2022, 10, 10),
+            )
+            self.assertIsNone(player_model.weight)

sportsball-0.4.4/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")