sportsball 0.5.13__tar.gz → 0.5.15__tar.gz

{sportsball-0.5.13/sportsball.egg-info → sportsball-0.5.15}/PKG-INFO

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

{sportsball-0.5.13 → sportsball-0.5.15}/setup.py

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

{sportsball-0.5.13 → sportsball-0.5.15}/sportsball/__init__.py

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

{sportsball-0.5.13 → sportsball-0.5.15}/sportsball/data/google/google_address_model.py

@@ -3322,6 +3322,15 @@ CHATTANOOGA = SportsballGeocodeTuple(
     housenumber="",
     country="USA",
 )
+HANDS_OVAL = SportsballGeocodeTuple(
+    city="Bunbury",
+    state="WA",
+    postal="",
+    lat=-33.346111,
+    lng=115.642778,
+    housenumber="",
+    country="Australia",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -15693,15 +15702,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         country="Zimbabwe",
     ),
     "Corroboree Group Oval Manuka, Canberra": MANUKA_OVAL,
-    "Hands Oval, Bunbury": SportsballGeocodeTuple(
-        city="Bunbury",
-        state="WA",
-        postal="",
-        lat=-33.346111,
-        lng=115.642778,
-        housenumber="",
-        country="Australia",
-    ),
+    "Hands Oval, Bunbury": HANDS_OVAL,
     "Inkster, Michigan, United States": SportsballGeocodeTuple(
         city="Inkster",
         state="MI",
@@ -15926,6 +15927,26 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Joe L. Reed Acadome, Montgomery, Alabama": DUNN_OLIVER_ACADOME,
     "Seattle Center Coliseum, Seattle, Washington": CLIMATE_PLEDGE_ARENA,
+    "Omni Coliseum, Atlanta, Georgia": OMNI_COLISEUM,
+    "Caldwell, ID, USA": SportsballGeocodeTuple(
+        city="Caldwell",
+        state="ID",
+        postal="",
+        lat=43.644444,
+        lng=-116.646944,
+        housenumber="",
+        country="USA",
+    ),
+    "Calgary, AB, Canada": SportsballGeocodeTuple(
+        city="Calgary",
+        state="AB",
+        postal="",
+        lat=51.05,
+        lng=-114.066667,
+        housenumber="",
+        country="Canada",
+    ),
+    "Hands Oval - Australia": HANDS_OVAL,
 }
 
 

{sportsball-0.5.13 → sportsball-0.5.15}/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,too-many-return-statements
+# pylint: disable=too-many-nested-blocks,too-many-statements,too-many-branches,too-many-locals,too-many-return-statements,too-many-boolean-expressions
 import datetime
 import io
 import logging
@@ -132,7 +132,7 @@ def _create_hkjc_hkjc_game_model(
 
                 lbw: float | None = 0.0
                 lbw_str = str(row["LBW"]).strip()
-                if lbw_str in {"HD", "H"}:
+                if lbw_str in {"HD", "H", "HDS"}:
                     lbw = 2.4 * 0.2
                 elif lbw_str == "SH":
                     lbw = 2.4 * 0.2 * 0.5
@@ -151,7 +151,16 @@ def _create_hkjc_hkjc_game_model(
                 elif lbw_str == "NK":
                     lbw = 2.4 * 0.4
                 elif (
-                    lbw_str and lbw_str != "-" and lbw_str != "---" and lbw_str != "nan"
+                    lbw_str
+                    and lbw_str != "-"
+                    and lbw_str != "---"
+                    and lbw_str != "nan"
+                    and lbw_str != "DNF"
+                    and lbw_str != "M.L."
+                    and lbw_str != "T.O."
+                    and lbw_str != "U/R"
+                    and lbw_str != "M. L."
+                    and lbw_str != "TNP"
                 ):
                     if lbw is not None:
                         if "-" in lbw_str:
@@ -244,9 +253,7 @@ def _create_hkjc_hkjc_game_model(
                     )
                     if dividend_str == "win":
                         continue
-                except IndexError as exc:
-                    logging.warning(url)
-                    logging.warning(str(exc))
+                except IndexError:
                     continue
                 dividend = float(dividend_str)
 

{sportsball-0.5.13 → sportsball-0.5.15}/sportsball/data/hkjc/hkjc/hkjc_hkjc_owner_model.py

@@ -16,8 +16,8 @@ def create_hkjc_hkjc_owner_model(
     try:
         name = query["HorseOwner"][0]
     except KeyError as exc:
-        logging.warning(url)
-        logging.warning(str(exc))
+        logging.debug(url)
+        logging.debug(str(exc))
         return None
     return OwnerModel(
         identifier=name,

{sportsball-0.5.13 → sportsball-0.5.15}/sportsball/data/hkjc/hkjc/hkjc_hkjc_player_model.py

@@ -80,7 +80,10 @@ def _create_hkjc_hkjc_player_model(
                     elif "origin" in row_name:
                         origin_row = i
 
-                sex = sex_from_str(df.iat[sex_row, 2].strip().split("/")[-1].strip())
+                sex_str = df.iat[sex_row, 2].strip().split("/")[-1].strip()
+                sex = None
+                if sex_str:
+                    sex = sex_from_str(sex_str)
 
                 origin_str = df.iat[origin_row, 2].strip()
                 origin = None

{sportsball-0.5.13 → sportsball-0.5.15}/sportsball/data/weather/openmeteo/openmeteo_weather_model.py

@@ -66,69 +66,77 @@ def _create_openmeteo_weather_model(
     # pylint: disable=broad-exception-caught
     client = openmeteo_requests.Client(session=session)
     try:
+        params = {
+            "latitude": latitude,
+            "longitude": longitude,
+            "hourly": [
+                "temperature_2m",
+                "relative_humidity_2m",
+                "dew_point_2m",
+                "apparent_temperature",
+                "precipitation",
+                "rain",
+                "snowfall",
+                "snow_depth",
+                "weather_code",
+                "pressure_msl",
+                "surface_pressure",
+                "cloud_cover",
+                "cloud_cover_low",
+                "cloud_cover_mid",
+                "cloud_cover_high",
+                "et0_fao_evapotranspiration",
+                "vapour_pressure_deficit",
+                "wind_speed_10m",
+                "wind_speed_100m",
+                "wind_direction_10m",
+                "wind_direction_100m",
+                "wind_gusts_10m",
+                "soil_temperature_0_to_7cm",
+                "soil_temperature_7_to_28cm",
+                "soil_temperature_28_to_100cm",
+                "soil_temperature_100_to_255cm",
+                "soil_moisture_0_to_7cm",
+                "soil_moisture_7_to_28cm",
+                "soil_moisture_28_to_100cm",
+                "soil_moisture_100_to_255cm",
+            ],
+            "daily": [
+                "weather_code",
+                "temperature_2m_max",
+                "temperature_2m_min",
+                "temperature_2m_mean",
+                "apparent_temperature_max",
+                "apparent_temperature_min",
+                "apparent_temperature_mean",
+                "sunrise",
+                "sunset",
+                "daylight_duration",
+                "sunshine_duration",
+                "precipitation_sum",
+                "rain_sum",
+                "snowfall_sum",
+                "precipitation_hours",
+                "wind_speed_10m_max",
+                "wind_gusts_10m_max",
+                "wind_direction_10m_dominant",
+                "shortwave_radiation_sum",
+                "et0_fao_evapotranspiration",
+            ],
+            "timezone": tz,
+        }
+        url = "https://historical-forecast-api.open-meteo.com/v1/forecast"
+        if dt.date() > datetime.datetime.today().date():
+            url = "https://api.open-meteo.com/v1/forecast"
+            params["forecast_days"] = (
+                datetime.datetime.today().date() - dt.date()
+            ).days
+        else:
+            params["start_date"] = str((dt - datetime.timedelta(days=1.0)).date())
+            params["end_date"] = str(dt.date())
         responses = client.weather_api(
-            "https://historical-forecast-api.open-meteo.com/v1/forecast",
-            params={
-                "latitude": latitude,
-                "longitude": longitude,
-                "start_date": str((dt - datetime.timedelta(days=1.0)).date()),
-                "end_date": str(dt.date()),
-                "hourly": [
-                    "temperature_2m",
-                    "relative_humidity_2m",
-                    "dew_point_2m",
-                    "apparent_temperature",
-                    "precipitation",
-                    "rain",
-                    "snowfall",
-                    "snow_depth",
-                    "weather_code",
-                    "pressure_msl",
-                    "surface_pressure",
-                    "cloud_cover",
-                    "cloud_cover_low",
-                    "cloud_cover_mid",
-                    "cloud_cover_high",
-                    "et0_fao_evapotranspiration",
-                    "vapour_pressure_deficit",
-                    "wind_speed_10m",
-                    "wind_speed_100m",
-                    "wind_direction_10m",
-                    "wind_direction_100m",
-                    "wind_gusts_10m",
-                    "soil_temperature_0_to_7cm",
-                    "soil_temperature_7_to_28cm",
-                    "soil_temperature_28_to_100cm",
-                    "soil_temperature_100_to_255cm",
-                    "soil_moisture_0_to_7cm",
-                    "soil_moisture_7_to_28cm",
-                    "soil_moisture_28_to_100cm",
-                    "soil_moisture_100_to_255cm",
-                ],
-                "daily": [
-                    "weather_code",
-                    "temperature_2m_max",
-                    "temperature_2m_min",
-                    "temperature_2m_mean",
-                    "apparent_temperature_max",
-                    "apparent_temperature_min",
-                    "apparent_temperature_mean",
-                    "sunrise",
-                    "sunset",
-                    "daylight_duration",
-                    "sunshine_duration",
-                    "precipitation_sum",
-                    "rain_sum",
-                    "snowfall_sum",
-                    "precipitation_hours",
-                    "wind_speed_10m_max",
-                    "wind_gusts_10m_max",
-                    "wind_direction_10m_dominant",
-                    "shortwave_radiation_sum",
-                    "et0_fao_evapotranspiration",
-                ],
-                "timezone": tz,
-            },
+            url,
+            params=params,
         )
         return _parse_openmeteo(responses, tz, dt)
     except (

{sportsball-0.5.13 → sportsball-0.5.15/sportsball.egg-info}/PKG-INFO

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