sportsball 0.4.7__tar.gz → 0.4.9__tar.gz

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

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

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

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

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

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

{sportsball-0.4.7 → sportsball-0.4.9}/sportsball/data/bet.py

@@ -36,6 +36,7 @@ class Bet(StrEnum):
     SECOND_TREBLE = auto()
     FIFTH_DOUBLE_TRIO = auto()
     SIX_UP = auto()
+    TREBLE = auto()
 
 
 _BETS = {str(x).lower(): x for x in Bet}

{sportsball-0.4.7 → sportsball-0.4.9}/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.7 → sportsball-0.4.9}/sportsball/data/espn/espn_team_model.py

@@ -87,7 +87,7 @@ def create_espn_team_model(
     """Create team model from ESPN."""
     if (
         not pytest_is_running.is_running()
-        and dt < datetime.datetime.now() - datetime.timedelta(days=7)
+        and dt.date() < datetime.datetime.today().date() - datetime.timedelta(days=7)
     ):
         return _cached_create_espn_team_model(
             session,

{sportsball-0.4.7 → sportsball-0.4.9}/sportsball/data/google/google_address_model.py

@@ -15531,6 +15531,8 @@ _CACHED_GEOCODES: dict[str, Any] = {
     "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,
+    "Yankee Stadium - Bronx, New York, USA - United States": YANKEE_STADIUM,
+    "Allegiant Stadium, Paradise, NV, USA": ALLEGIANT_STADIUM,
 }
 
 

{sportsball-0.4.7 → sportsball-0.4.9}/sportsball/data/hkjc/hkjc/hkjc_hkjc_dividend_model.py

@@ -9,7 +9,9 @@ def create_hkjc_hkjc_dividend_model(
     pool: str, combination: list[str], team_models: list[TeamModel], dividend: float
 ) -> DividendModel:
     """Create a dividend model from HKJC."""
-    jerseys_teams = {x.players[0].jersey: x.identifier for x in team_models}
+    jerseys_teams = {
+        x.players[0].jersey: x.identifier for x in team_models if x.players
+    }
     return DividendModel(
         pool=bet_from_str(pool),
         combination=[jerseys_teams[x] for x in combination if x in jerseys_teams],

{sportsball-0.4.7 → sportsball-0.4.9}/sportsball/data/hkjc/hkjc/hkjc_hkjc_game_model.py

@@ -1,6 +1,6 @@
 """HKJC HKJC game model."""
 
-# pylint: disable=too-many-nested-blocks,too-many-statements,too-many-branches,too-many-locals
+# pylint: disable=too-many-nested-blocks,too-many-statements,too-many-branches,too-many-locals,too-many-return-statements
 import datetime
 import io
 import logging
@@ -43,6 +43,12 @@ def _create_hkjc_hkjc_game_model(
             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
+        if "this race has been abandoned" in div_text.lower():
+            return None
 
     o = urlparse(url)
     query = urllib.parse.parse_qs(o.query)
@@ -61,7 +67,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,9 +84,20 @@ def _create_hkjc_hkjc_game_model(
             pot = float(df.iat[3, 0].split()[-1].strip().replace(",", ""))
         elif count == 2:
             for _, row in df.iterrows():
-                horse_name = row["Horse"].split("(")[0].strip()
+                horse_name = None
+                try:
+                    horse_name = row["Horse"].split("(")[0].strip()
+                except KeyError:
+                    logging.error(url)
+                    raise
+
                 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
@@ -83,10 +106,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()
@@ -103,6 +135,8 @@ def _create_hkjc_hkjc_game_model(
                     lbw = 2.4 * 0.05
                 elif lbw_str == "ML":
                     lbw = None
+                elif lbw_str == "TO":
+                    lbw = 100.0
                 elif lbw_str and lbw_str != "-" and lbw_str != "---":
                     if lbw is not None:
                         if "-" in lbw_str:
@@ -143,7 +177,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"):
@@ -213,8 +247,12 @@ def _create_hkjc_hkjc_game_model(
                 dividends.append(dividend_model)
 
     if race_track is None:
+        logging.error(url)
         raise ValueError("race_track is null")
 
+    end_dts = [x.end_dt for x in teams if x.end_dt is not None]
+    end_dt = None if not end_dts else min(end_dts)
+
     return GameModel(
         dt=dt,
         week=None,
@@ -226,7 +264,7 @@ def _create_hkjc_hkjc_game_model(
             race_track=race_track,
         ),
         teams=teams,
-        end_dt=min(x.end_dt for x in teams if x.end_dt is not None),
+        end_dt=end_dt,
         attendance=None,
         league=str(League.HKJC),
         year=dt.year,

{sportsball-0.4.7 → sportsball-0.4.9}/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.7 → sportsball-0.4.9}/sportsball/data/hkjc/hkjc/hkjc_hkjc_team_model.py

@@ -21,13 +21,14 @@ def _create_hkjc_hkjc_team_model(
     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,7 +37,8 @@ def _create_hkjc_hkjc_team_model(
         starting_position=starting_position,
         weight=horse_weight,
     )
-    players = [horse_player]
+    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,
@@ -46,7 +48,8 @@ def _create_hkjc_hkjc_team_model(
             starting_position=starting_position,
             weight=None,
         )
-        players.append(jockey_player)
+        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
@@ -78,7 +81,7 @@ def _cached_create_hkjc_hkjc_team_model(
     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,
@@ -108,7 +111,7 @@ def create_hkjc_hkjc_team_model(
     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.7 → sportsball-0.4.9/sportsball.egg-info}/PKG-INFO

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