sportsball 0.4.8__tar.gz → 0.4.10__tar.gz

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

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

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

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

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

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

{sportsball-0.4.8 → sportsball-0.4.10}/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.8 → sportsball-0.4.10}/sportsball/data/espn/espn_player_model.py

@@ -120,7 +120,7 @@ def create_espn_player_model(
     """Create a player model based off 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_player_model(
             session=session,

{sportsball-0.4.8 → sportsball-0.4.10}/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.8 → sportsball-0.4.10}/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.8 → sportsball-0.4.10}/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.8 → sportsball-0.4.10}/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
@@ -47,6 +47,8 @@ def _create_hkjc_hkjc_game_model(
             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)
@@ -82,7 +84,13 @@ 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 = None
@@ -127,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:
@@ -240,6 +250,9 @@ def _create_hkjc_hkjc_game_model(
         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,
@@ -251,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.8 → sportsball-0.4.10}/sportsball/proxy_session.py

@@ -5,6 +5,7 @@ import datetime
 import logging
 import os
 import random
+import sqlite3
 from io import BytesIO
 from typing import Any, MutableMapping, Optional
 
@@ -178,7 +179,8 @@ class ProxySession(requests_cache.CachedSession):
         | retry_if_exception_type(requests.exceptions.ChunkedEncodingError)
         | retry_if_exception_type(ValueError)
         | retry_if_exception_type(requests.exceptions.HTTPError)
-        | retry_if_exception_type(requests.exceptions.ReadTimeout),
+        | retry_if_exception_type(requests.exceptions.ReadTimeout)
+        | retry_if_exception_type(sqlite3.OperationalError),
         reraise=True,
     )
     def _perform_retry_send(

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

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