sportsball 0.4.6__tar.gz → 0.4.8__tar.gz

{sportsball-0.4.6/sportsball.egg-info → sportsball-0.4.8}/PKG-INFO

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

{sportsball-0.4.6 → sportsball-0.4.8}/setup.py

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

{sportsball-0.4.6 → sportsball-0.4.8}/sportsball/__init__.py

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

{sportsball-0.4.6 → sportsball-0.4.8}/sportsball/data/afl/afltables/afl_afltables_coach_model.py

@@ -3,6 +3,7 @@
 # pylint: disable=too-many-locals
 import datetime
 import io
+import logging
 import os
 import urllib.parse
 from urllib.parse import urlparse
@@ -71,13 +72,18 @@ def _create_afl_afltables_coach_model(
     response = session.get(coach_url)
     response.raise_for_status()
     soup = BeautifulSoup(response.text, "lxml")
-    birth_date = parse(soup.get_text().split("Born:")[1].strip().split()[0])
+
+    birth_date = None
+    try:
+        birth_date = parse(soup.get_text().split("Born:")[1].strip().split()[0])
+    except IndexError:
+        logging.warning("Failed to find birth date from %s", response.url)
 
     return CoachModel(
         identifier=identifier,
         name=name,
         birth_date=birth_date,
-        age=relativedelta(birth_date, dt).years,
+        age=relativedelta(birth_date, dt).years if birth_date is not None else None,
     )
 
 

{sportsball-0.4.6 → sportsball-0.4.8}/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().date() - datetime.timedelta(days=7)
+        and dt.date() < datetime.datetime.now().date() - datetime.timedelta(days=7)
     ):
         return _cached_create_espn_game_model(
             event,

{sportsball-0.4.6 → sportsball-0.4.8}/sportsball/data/hkjc/hkjc/hkjc_hkjc_game_model.py

@@ -41,6 +41,12 @@ def _create_hkjc_hkjc_game_model(
         div_text = div.get_text().strip()
         if "this race is declared abandoned" in div_text.lower():
             return None
+        if "this race is declared void" in div_text.lower():
+            return None
+        if "information will be released shortly" in div_text.lower():
+            return None
+        if "unofficial dividends" in div_text.lower():
+            return None
 
     o = urlparse(url)
     query = urllib.parse.parse_qs(o.query)
@@ -59,7 +65,13 @@ def _create_hkjc_hkjc_game_model(
     dividends = []
     for count, df in enumerate(dfs):
         if count == 1:
-            race_track = df.iat[2, 2].split("-")[0].strip()
+            race_track = ""
+            try:
+                race_track = df.iat[2, 2].split("-")[0].strip()
+            except IndexError:
+                logging.error(url)
+                raise
+
             distance = 0.0
             try:
                 distance = float(df.iat[1, 0].split("-")[1].strip().replace("M", ""))
@@ -72,7 +84,12 @@ def _create_hkjc_hkjc_game_model(
             for _, row in df.iterrows():
                 horse_name = row["Horse"].split("(")[0].strip()
                 jockey_name = row["Jockey"].split("(")[0].strip()
-                trainer_name = row["Trainer"].split("(")[0].strip()
+
+                trainer_name = None
+                try:
+                    trainer_name = row["Trainer"].split("(")[0].strip()
+                except KeyError:
+                    logging.warning("Failed to find trainer name for %s", url)
 
                 place_str = str(row["Pla."]).strip()
                 place = None
@@ -81,10 +98,19 @@ def _create_hkjc_hkjc_game_model(
 
                 jersey = str(row["Horse No."])
 
-                handicap_weight = float(row["Act. Wt."]) * 0.453592
+                handicap_weight = None
+                try:
+                    handicap_weight = float(row["Act. Wt."]) * 0.453592
+                except KeyError:
+                    logging.warning("Failed to find handicap weight for %s", url)
+
                 horse_weight = None
-                if row["Declar. Horse Wt."] != "---":
-                    horse_weight = float(row["Declar. Horse Wt."]) * 0.453592
+                try:
+                    horse_weight_str = row["Declar. Horse Wt."]
+                    if horse_weight_str != "---":
+                        horse_weight = float(horse_weight_str) * 0.453592
+                except KeyError:
+                    logging.warning("Failed to find horse weight for %s", url)
 
                 starting_position = None
                 starting_position_str = str(row["Dr."]).strip()
@@ -141,7 +167,7 @@ def _create_hkjc_hkjc_game_model(
                         o = urlparse(a_url)
                         if o.path.endswith("/Jockey/JockeyProfile.aspx"):
                             jockey_url = a_url
-                    elif a_text == trainer_name:
+                    elif trainer_name is not None and a_text == trainer_name:
                         a_url = urllib.parse.urljoin(url, a.get("href"))
                         o = urlparse(a_url)
                         if o.path.endswith("/Trainers/TrainerProfile.aspx"):
@@ -149,10 +175,6 @@ def _create_hkjc_hkjc_game_model(
 
                 if place is None:
                     continue
-                if trainer_url is None:
-                    raise ValueError("trainer_url is null")
-                if jockey_url is None:
-                    raise ValueError("jockey_url is null")
                 if horse_url is None:
                     raise ValueError("horse_url is null")
 
@@ -179,6 +201,12 @@ def _create_hkjc_hkjc_game_model(
                 dividend_str = str(row_df.iat[2, 0]).strip().lower()
                 if dividend_str == "details":
                     continue
+                if dividend_str == "refund":
+                    continue
+                if dividend_str == "not win":
+                    continue
+                if dividend_str == "detail":
+                    continue
                 dividend_str = dividend_str.split("/", maxsplit=1)[0].replace(",", "")
                 dividend = float(dividend_str)
 
@@ -198,7 +226,7 @@ def _create_hkjc_hkjc_game_model(
                         next_td = False
 
                 if combination is None:
-                    raise ValueError("combination is null")
+                    continue
 
                 dividend_model = create_hkjc_hkjc_dividend_model(
                     pool=pool,
@@ -209,6 +237,7 @@ def _create_hkjc_hkjc_game_model(
                 dividends.append(dividend_model)
 
     if race_track is None:
+        logging.error(url)
         raise ValueError("race_track is null")
 
     return GameModel(

{sportsball-0.4.6 → sportsball-0.4.8}/sportsball/data/hkjc/hkjc/hkjc_hkjc_player_model.py

@@ -28,7 +28,7 @@ def _create_hkjc_hkjc_player_model(
     handicap_weight: float | None,
     starting_position: Position | None,
     weight: float | None,
-) -> PlayerModel:
+) -> PlayerModel | None:
     headers = {X_NO_WAYBACK: "1"}
     response = session.get(url, headers=headers)
     response.raise_for_status()
@@ -51,6 +51,12 @@ def _create_hkjc_hkjc_player_model(
             raise
 
     soup = BeautifulSoup(response.text, "lxml")
+    for noscript in soup.find_all("noscript"):
+        no_script_text = noscript.get_text().strip().lower()
+        if "javascript must be enabled in order to view this page." in no_script_text:
+            logging.error("Javascript error on %s", url)
+            session.cache.delete(urls=[url, response.url])
+            return None
 
     name = None
     species = Species.HUMAN
@@ -114,6 +120,10 @@ def _create_hkjc_hkjc_player_model(
         name = query["HorseSire"][0]
 
     if name is None:
+        logging.error(response.text)
+        logging.error(dfs)
+        logging.error(o.path)
+        logging.error(url)
         raise ValueError("name is null")
 
     return PlayerModel(
@@ -173,7 +183,7 @@ def _cached_create_hkjc_hkjc_player_model(
     handicap_weight: float | None,
     starting_position: Position | None,
     weight: float | None,
-) -> PlayerModel:
+) -> PlayerModel | None:
     return _create_hkjc_hkjc_player_model(
         session=session,
         url=url,
@@ -191,7 +201,7 @@ def create_hkjc_hkjc_player_model(
     handicap_weight: float | None,
     starting_position: Position | None,
     weight: float | None,
-) -> PlayerModel:
+) -> PlayerModel | None:
     """Create a player model based off HKJC."""
     if not pytest_is_running.is_running():
         return _cached_create_hkjc_hkjc_player_model(

{sportsball-0.4.6 → sportsball-0.4.8}/sportsball/data/hkjc/hkjc/hkjc_hkjc_team_model.py

@@ -17,17 +17,18 @@ from .hkjc_hkjc_player_model import create_hkjc_hkjc_player_model
 def _create_hkjc_hkjc_team_model(
     session: requests_cache.CachedSession,
     horse_url: str,
-    jockey_url: str,
-    trainer_url: str,
+    jockey_url: str | None,
+    trainer_url: str | None,
     points: float,
     jersey: str,
-    handicap_weight: float,
+    handicap_weight: float | None,
     horse_weight: float | None,
     starting_position: Position | None,
     lbw: float | None,
     end_dt: datetime.datetime | None,
     odds: list[OddsModel],
 ) -> TeamModel:
+    players = []
     horse_player = create_hkjc_hkjc_player_model(
         session=session,
         url=horse_url,
@@ -36,16 +37,24 @@ def _create_hkjc_hkjc_team_model(
         starting_position=starting_position,
         weight=horse_weight,
     )
-    jockey_player = create_hkjc_hkjc_player_model(
-        session=session,
-        url=jockey_url,
-        jersey=jersey,
-        handicap_weight=None,
-        starting_position=starting_position,
-        weight=None,
+    if horse_player is not None:
+        players.append(horse_player)
+    if jockey_url is not None:
+        jockey_player = create_hkjc_hkjc_player_model(
+            session=session,
+            url=jockey_url,
+            jersey=jersey,
+            handicap_weight=None,
+            starting_position=starting_position,
+            weight=None,
+        )
+        if jockey_player is not None:
+            players.append(jockey_player)
+    coaches = (
+        [create_hkjc_hkjc_coach_model(session=session, url=trainer_url)]
+        if trainer_url is not None
+        else []
     )
-    players = [horse_player, jockey_player]
-    coach = create_hkjc_hkjc_coach_model(session=session, url=trainer_url)
     name = " - ".join([x.name for x in players])
     return TeamModel(
         identifier=name,
@@ -58,7 +67,7 @@ def _create_hkjc_hkjc_team_model(
         news=[],
         social=[],
         field_goals=None,
-        coaches=[coach],
+        coaches=coaches,
         lbw=lbw,
         end_dt=end_dt,
     )
@@ -68,11 +77,11 @@ def _create_hkjc_hkjc_team_model(
 def _cached_create_hkjc_hkjc_team_model(
     session: requests_cache.CachedSession,
     horse_url: str,
-    jockey_url: str,
-    trainer_url: str,
+    jockey_url: str | None,
+    trainer_url: str | None,
     points: float,
     jersey: str,
-    handicap_weight: float,
+    handicap_weight: float | None,
     horse_weight: float | None,
     starting_position: Position | None,
     lbw: float | None,
@@ -98,11 +107,11 @@ def _cached_create_hkjc_hkjc_team_model(
 def create_hkjc_hkjc_team_model(
     session: requests_cache.CachedSession,
     horse_url: str,
-    jockey_url: str,
-    trainer_url: str,
+    jockey_url: str | None,
+    trainer_url: str | None,
     points: float,
     jersey: str,
-    handicap_weight: float,
+    handicap_weight: float | None,
     horse_weight: float | None,
     starting_position: Position | None,
     lbw: float | None,

{sportsball-0.4.6 → sportsball-0.4.8/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.4.6 → sportsball-0.4.8}/tests/data/afl/afltables/afl_afltables_coach_model_test.py

@@ -54,3 +54,18 @@ class TestAFLTablesCoachModel(unittest.TestCase):
                 dt=datetime.datetime(2012, 10, 10),
             )
             self.assertIsNone(coach_model)
+
+    def test_no_birth_date(self):
+        with requests_mock.Mocker() as m:
+            url = "https://afltables.com/afl/stats/coaches/geelong.html"
+            with open(os.path.join(self.dir, "coaches_geelong.html"), "rb") as f:
+                m.get(url, content=f.read())
+            with open(os.path.join(self.dir, "Dave_Hickinbotham.html"), "rb") as f:
+                m.get("https://afltables.com/afl/stats/coaches/Dave_Hickinbotham.html", content=f.read())
+            coach_model = create_afl_afltables_coach_model(
+                url=url,
+                session=self._session,
+                year=1910,
+                dt=datetime.datetime(2012, 10, 10),
+            )
+            self.assertIsNone(coach_model.birth_date)