sportsball 0.4.5__tar.gz → 0.4.7__tar.gz

{sportsball-0.4.5/sportsball.egg-info → sportsball-0.4.7}/PKG-INFO

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

{sportsball-0.4.5 → sportsball-0.4.7}/setup.py

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

{sportsball-0.4.5 → sportsball-0.4.7}/sportsball/__init__.py

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

{sportsball-0.4.5 → sportsball-0.4.7}/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
@@ -45,7 +46,10 @@ def _create_afl_afltables_coach_model(
         if "-" in year_range:
             start_year, end_year = [int(x) for x in year_range.split("-")]
         else:
-            start_year = end_year = int(year_range)
+            try:
+                start_year = end_year = int(year_range)
+            except ValueError:
+                continue
         if start_year <= year <= end_year:
             name = names[count].strip()
             break
@@ -68,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.5 → sportsball-0.4.7}/sportsball/data/hkjc/hkjc/hkjc_hkjc_game_model.py

@@ -41,6 +41,8 @@ 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
 
     o = urlparse(url)
     query = urllib.parse.parse_qs(o.query)
@@ -149,10 +151,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 +177,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 +202,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,

{sportsball-0.4.5 → sportsball-0.4.7}/sportsball/data/hkjc/hkjc/hkjc_hkjc_team_model.py

@@ -17,8 +17,8 @@ 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,
@@ -36,16 +36,22 @@ 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,
+    players = [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,
+        )
+        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 +64,7 @@ def _create_hkjc_hkjc_team_model(
         news=[],
         social=[],
         field_goals=None,
-        coaches=[coach],
+        coaches=coaches,
         lbw=lbw,
         end_dt=end_dt,
     )
@@ -68,8 +74,8 @@ 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,
@@ -98,8 +104,8 @@ 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,

{sportsball-0.4.5 → sportsball-0.4.7/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.4.5 → sportsball-0.4.7}/tests/data/afl/afltables/afl_afltables_coach_model_test.py

@@ -41,3 +41,31 @@ class TestAFLTablesCoachModel(unittest.TestCase):
                 dt=datetime.datetime(2012, 10, 10),
             )
             self.assertIsNone(coach_model)
+
+    def test_bad_year_range(self):
+        with requests_mock.Mocker() as m:
+            url = "https://afltables.com/afl/stats/coaches/collingwood.html"
+            with open(os.path.join(self.dir, "coaches_collingwood.html"), "rb") as f:
+                m.get(url, content=f.read())
+            coach_model = create_afl_afltables_coach_model(
+                url=url,
+                session=self._session,
+                year=1897,
+                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)