sportsball 0.3.27__tar.gz → 0.3.29__tar.gz

{sportsball-0.3.27/sportsball.egg-info → sportsball-0.3.29}/PKG-INFO

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

{sportsball-0.3.27 → sportsball-0.3.29}/setup.py

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

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.27"
+__VERSION__ = "0.3.29"

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/data/afl/afltables/afl_afltables_league_model.py

@@ -1,7 +1,8 @@
 """AFL AFLTables league model."""
 
-# pylint: disable=too-many-statements
+# pylint: disable=too-many-statements,protected-access
 import datetime
+import logging
 import os
 import urllib.parse
 from typing import Iterator
@@ -59,9 +60,21 @@ class AFLAFLTablesLeagueModel(LeagueModel):
             for td in table.find_all("td"):
                 td_text = td.get_text().strip()
                 if "Venue:" in td_text:
-                    cleaned_text = td_text.split("Venue:")[0].split("Att:")[0].strip()
+                    cleaned_text = (
+                        td_text.split("Venue:")[0]
+                        .split("Att:")[0]
+                        .strip()
+                        .split("(")[0]
+                        .strip()
+                    )
                     cleaned_text = " ".join(cleaned_text.split()[-3:])
-                    current_dt = parser.parse(cleaned_text)
+                    try:
+                        current_dt = parser.parse(cleaned_text)
+                    except parser._parser.ParserError as exc:  # type: ignore
+                        logging.error(
+                            "Failed to parse date in season URL: %s", season_url
+                        )
+                        raise exc
             for a in table.find_all("a", href=True):
                 if a.get_text().strip().lower() == "match stats":
                     url = urllib.parse.urljoin(season_url, a.get("href"))

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/data/afl/combined/afl_combined_league_model.py

@@ -213,7 +213,7 @@ class AFLCombinedLeagueModel(CombinedLeagueModel):
                 AFLAFLTablesLeagueModel(session, position=0),
                 AFLESPNLeagueModel(session, position=1),
                 AFLAusSportsBettingLeagueModel(session, position=2),
-                AFLOddsPortalLeagueModel(session),
+                AFLOddsPortalLeagueModel(session, position=3),
             ],
         )
 

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/data/google/google_address_model.py

@@ -1387,6 +1387,60 @@ CORBETT_SPORTS_CENTER = SportsballGeocodeTuple(
     housenumber="1601",
     country="USA",
 )
+EA_DIDDLE_ARENA = SportsballGeocodeTuple(
+    city="Bowling Green",
+    state="KY",
+    postal="42101",
+    lat=36.985833,
+    lng=-86.4575,
+    housenumber="1526",
+    country="USA",
+)
+JMA_WIRELESS_DOME = SportsballGeocodeTuple(
+    city="Syracuse",
+    state="NY",
+    postal="13244",
+    lat=43.036111,
+    lng=-76.136389,
+    housenumber="900",
+    country="USA",
+)
+AG_SPANOS_CENTER = SportsballGeocodeTuple(
+    city="Stockton",
+    state="CA",
+    postal="95211",
+    lat=37.976669,
+    lng=-121.315095,
+    housenumber="1178",
+    country="USA",
+)
+WAR_MEMORIAL_GYMNASIUM = SportsballGeocodeTuple(
+    city="San Francisco",
+    state="CA",
+    postal="94118",
+    lat=37.776944,
+    lng=-122.449444,
+    housenumber="2335",
+    country="USA",
+)
+HENDERSON_CENTER = SportsballGeocodeTuple(
+    city="Huntington",
+    state="WV",
+    postal="25755",
+    lat=38.424517,
+    lng=-82.425211,
+    housenumber="",
+    country="USA",
+)
+TED_CONSTANT_CONVOCATION_CENTER = SportsballGeocodeTuple(
+    city="Norfolk",
+    state="VA",
+    postal="",
+    lat=36.884169,
+    lng=-76.301231,
+    housenumber="4320",
+    country="USA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -2306,15 +2360,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="1972",
         country="USA",
     ),
-    "JMA Wireless Dome - Syracuse - NY - 13244": SportsballGeocodeTuple(
-        city="Syracuse",
-        state="NY",
-        postal="13244",
-        lat=43.036111,
-        lng=-76.136389,
-        housenumber="900",
-        country="USA",
-    ),
+    "JMA Wireless Dome - Syracuse - NY - 13244": JMA_WIRELESS_DOME,
     "Davis Wade Stadium - Starkville - MS - 39762": SportsballGeocodeTuple(
         city="Starkville",
         state="MS",
@@ -3474,15 +3520,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="1000",
         country="USA",
     ),
-    "Ted Constant Convocation Ctr., Norfolk, Virginia": SportsballGeocodeTuple(
-        city="Norfolk",
-        state="VA",
-        postal="",
-        lat=36.884169,
-        lng=-76.301231,
-        housenumber="4320",
-        country="USA",
-    ),
+    "Ted Constant Convocation Ctr., Norfolk, Virginia": TED_CONSTANT_CONVOCATION_CENTER,
     "Yanitelli Center, Jersey City, New Jersey": SportsballGeocodeTuple(
         city="Jersey City",
         state="NJ",
@@ -4951,15 +4989,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="18",
         country="USA",
     ),
-    "Henderson Center, Huntington, West Virginia": SportsballGeocodeTuple(
-        city="Huntington",
-        state="WV",
-        postal="25755",
-        lat=38.424517,
-        lng=-82.425211,
-        housenumber="",
-        country="USA",
-    ),
+    "Henderson Center, Huntington, West Virginia": HENDERSON_CENTER,
     "Costello Athletic Center, Lowell, Massachusetts": SportsballGeocodeTuple(
         city="Lowell",
         state="MA",
@@ -5095,15 +5125,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="1",
         country="USA",
     ),
-    "E.A. Diddle Arena, Bowling Green, Kentucky": SportsballGeocodeTuple(
-        city="Bowling Green",
-        state="KY",
-        postal="42101",
-        lat=36.985833,
-        lng=-86.4575,
-        housenumber="1526",
-        country="USA",
-    ),
+    "E.A. Diddle Arena, Bowling Green, Kentucky": EA_DIDDLE_ARENA,
     "Don Haskins Center, El Paso, Texas": SportsballGeocodeTuple(
         city="El Paso",
         state="TX",
@@ -5131,15 +5153,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="1",
         country="USA",
     ),
-    "A.G. Spanos Center, Stockton, California": SportsballGeocodeTuple(
-        city="Stockton",
-        state="CA",
-        postal="95211",
-        lat=37.976669,
-        lng=-121.315095,
-        housenumber="1178",
-        country="USA",
-    ),
+    "A.G. Spanos Center, Stockton, California": AG_SPANOS_CENTER,
     "Leavey Center, Santa Clara, California": SportsballGeocodeTuple(
         city="Santa Clara",
         state="CA",
@@ -5685,15 +5699,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         country="USA",
     ),
     "John F. Savage Hall, Toledo, Ohio": SAVAGE_ARENA,
-    "War Memorial at The Sobrato Center, San Francisco, California": SportsballGeocodeTuple(
-        city="San Francisco",
-        state="CA",
-        postal="94118",
-        lat=37.776944,
-        lng=-122.449444,
-        housenumber="2335",
-        country="USA",
-    ),
+    "War Memorial at The Sobrato Center, San Francisco, California": WAR_MEMORIAL_GYMNASIUM,
     "The Jungle, Indianapolis, Indiana": SportsballGeocodeTuple(
         city="Indianapolis",
         state="IN",
@@ -7687,6 +7693,138 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="",
         country="USA",
     ),
+    "University Credit Union Center, Davis, California": SportsballGeocodeTuple(
+        city="Davis",
+        state="CA",
+        postal="95616",
+        lat=38.541667,
+        lng=-121.759444,
+        housenumber="1",
+        country="USA",
+    ),
+    "Buccaneer Field House, Charleston, South Carolina": SportsballGeocodeTuple(
+        city="Charleston",
+        state="SC",
+        postal="29406",
+        lat=32.980822,
+        lng=-80.067125,
+        housenumber="9200",
+        country="USA",
+    ),
+    "Credit Union 1 Arena, Chicago, Illinois": SportsballGeocodeTuple(
+        city="Chicago",
+        state="IL",
+        postal="60607",
+        lat=41.874722,
+        lng=-87.656111,
+        housenumber="525",
+        country="USA",
+    ),
+    "E. A. Diddle Arena, Bowling Green, Kentucky": EA_DIDDLE_ARENA,
+    "JMA Wireless Dome, Syracuse, New York": JMA_WIRELESS_DOME,
+    "Truist Arena, Highland Heights, Kentucky": SportsballGeocodeTuple(
+        city="Highland Heights",
+        state="KT",
+        postal="41099",
+        lat=39.032273,
+        lng=-84.458864,
+        housenumber="500",
+        country="USA",
+    ),
+    "Kress Events Center, Green Bay, Wisconsin": SportsballGeocodeTuple(
+        city="Green Bay",
+        state="WI",
+        postal="",
+        lat=44.530069,
+        lng=-87.915967,
+        housenumber="",
+        country="USA",
+    ),
+    "OceanFirst Bank Center, West Long Branch, New Jersey": SportsballGeocodeTuple(
+        city="West Long Branch",
+        state="NJ",
+        postal="07764",
+        lat=40.279475,
+        lng=-74.007583,
+        housenumber="400",
+        country="USA",
+    ),
+    "Alex G. Spanos Center, Stockton, California": AG_SPANOS_CENTER,
+    "War Memorial Gymnasium, San Francisco, California": WAR_MEMORIAL_GYMNASIUM,
+    "First National Bank Arena, Jonesboro, Arkansas": SportsballGeocodeTuple(
+        city="Jonesboro",
+        state="AR",
+        postal="72401",
+        lat=35.845422,
+        lng=-90.670319,
+        housenumber="217",
+        country="USA",
+    ),
+    "Frost Arena, Brookings, South Dakota": SportsballGeocodeTuple(
+        city="Brookings",
+        state="SD",
+        postal="57007",
+        lat=44.317984,
+        lng=-96.779058,
+        housenumber="1165",
+        country="USA",
+    ),
+    "Louisville, Kentucky": SportsballGeocodeTuple(
+        city="Louisville",
+        state="KT",
+        postal="",
+        lat=38.256111,
+        lng=-85.751389,
+        housenumber="",
+        country="USA",
+    ),
+    "Saint Charles, Missouri": SportsballGeocodeTuple(
+        city="Saint Charles",
+        state="MO",
+        postal="",
+        lat=38.789,
+        lng=-90.514,
+        housenumber="",
+        country="USA",
+    ),
+    "Cam Henderson Center, Huntington, West Virginia": HENDERSON_CENTER,
+    "Ted Constant Convocaation Center, Norfolk, Virginia": TED_CONSTANT_CONVOCATION_CENTER,
+    "Brooklyn, New York": SportsballGeocodeTuple(
+        city="Brooklyn",
+        state="NY",
+        postal="",
+        lat=40.65,
+        lng=-73.95,
+        housenumber="",
+        country="USA",
+    ),
+    "Chicago, Illinois": SportsballGeocodeTuple(
+        city="Chicago",
+        state="IL",
+        postal="",
+        lat=41.881944,
+        lng=-87.627778,
+        housenumber="",
+        country="USA",
+    ),
+    "Alabama A&M Events Center, Huntsville, Alabama": SportsballGeocodeTuple(
+        city="Huntsville",
+        state="AL",
+        postal="35810",
+        lat=34.781139,
+        lng=-86.580528,
+        housenumber="",
+        country="USA",
+    ),
+    "Vadalabene Center, Edwardsville, Illinois": SportsballGeocodeTuple(
+        city="Edwardsville",
+        state="IL",
+        postal="",
+        lat=38.795989,
+        lng=-89.999883,
+        housenumber="35",
+        country="USA",
+    ),
 }
 
 

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/data/ncaab/combined/ncaab_combined_league_model.py

@@ -5,6 +5,8 @@ import requests_cache
 from ...combined.combined_league_model import CombinedLeagueModel
 from ...league import League
 from ..espn.ncaab_espn_league_model import NCAABESPNLeagueModel
+from ..oddsportal.ncaab_oddsportal_league_model import \
+    NCAABOddsPortalLeagueModel
 from ..sportsreference.ncaab_sportsreference_league_model import \
     NCAABSportsReferenceLeagueModel
 
@@ -749,8 +751,9 @@ class NCAABCombinedLeagueModel(CombinedLeagueModel):
             session,
             League.NCAAB,
             [
-                NCAABSportsReferenceLeagueModel(session),
-                NCAABESPNLeagueModel(session),
+                NCAABSportsReferenceLeagueModel(session, position=0),
+                NCAABESPNLeagueModel(session, position=1),
+                NCAABOddsPortalLeagueModel(session, position=2),
             ],
         )
 

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/data/oddsportal/oddsportal_game_model.py

@@ -10,6 +10,7 @@ import requests_cache
 from bs4 import BeautifulSoup, Tag
 
 from ...cache import MEMORY
+from ...proxy_session import X_NO_WAYBACK
 from ..game_model import GameModel
 from ..league import League
 from .oddsportal_team_model import create_oddsportal_team_model
@@ -21,14 +22,19 @@ def _create_oddsportal_game_model(
     url: str,
     league: League,
 ) -> GameModel:
-    response = session.get(url, headers={"X-No-Wayback": "1"})
+    response = session.get(url, headers={X_NO_WAYBACK: "1"})
     response.raise_for_status()
 
     soup = BeautifulSoup(response.text, "html.parser")
     event_tag = soup.find("div", id="react-event-header")
     if not isinstance(event_tag, Tag):
-        raise ValueError(f"event_tag is not a tag for URL: {url}.")
-    event = json.loads(str(event_tag["data"]))
+        soup_x = BeautifulSoup(response.text, "xml")
+        event_tag = soup_x.find("Event")
+        if not isinstance(event_tag, Tag):
+            raise ValueError(f"event_tag is not a tag for URL: {url}.")
+        event = json.loads(str(event_tag[":data"]))
+    else:
+        event = json.loads(str(event_tag["data"]))
 
     event_body = event["eventBody"]
     event_data = event["eventData"]
@@ -51,7 +57,7 @@ def _create_oddsportal_game_model(
             continue
         if "/app.js" in src:
             src_url = urllib.parse.urljoin(url, src)
-            src_response = session.get(src_url)
+            src_response = session.get(src_url, headers={X_NO_WAYBACK: "1"})
             src_response.raise_for_status()
             variables = src_response.text
             sentinel = 'break}return e.next=9,g(r.data,"'
@@ -77,7 +83,11 @@ def _create_oddsportal_game_model(
         away_points = float(event_body["awayResult"])
 
     venue = None
-    if event_body["venue"] and event_body["venueTown"] and event_body["venueCountry"]:
+    if (
+        event_body.get("venue", "")
+        and event_body.get("venueTown", "")
+        and event_body.get("venueCountry", "")
+    ):
         venue = create_oddsportal_venue_model(
             session,
             dt,

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/data/oddsportal/oddsportal_league_model.py

@@ -1,6 +1,6 @@
 """Odds Portal league model."""
 
-# pylint: disable=too-many-locals,too-many-branches,too-many-statements
+# pylint: disable=too-many-locals,too-many-branches,too-many-statements,protected-access
 import http
 import json
 import logging
@@ -82,6 +82,7 @@ class OddsPortalLeagueModel(LeagueModel):
             url = queued_urls.pop()
             if url in seen_urls:
                 continue
+            logging.debug("processing url: %s", url)
             seen_urls.add(url)
 
             if url.endswith(standard_suffix):
@@ -163,5 +164,5 @@ class OddsPortalLeagueModel(LeagueModel):
     @property
     def games(self) -> Iterator[GameModel]:
         with tqdm.tqdm(position=self.position) as pbar:
-            yield from self._find_next(pbar)
+            # yield from self._find_next(pbar)
             yield from self._find_previous(pbar)

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/data/oddsportal/oddsportal_team_model.py

@@ -66,10 +66,17 @@ def _create_oddsportal_team_model(
     if end_of_json != -1:
         decrypted_data = decrypted_data[: end_of_json + 1]
     parsed_data = json.loads(decrypted_data)
-    odds_data = parsed_data["d"]["oddsdata"]["back"][
-        f"E-{default_bet_id}-{default_scope_id}-0-0-0"
-    ]
-    outcome_id = odds_data["outcomeId"][team_idx]
+    try:
+        odds_data = parsed_data["d"]["oddsdata"]["back"][
+            f"E-{default_bet_id}-{default_scope_id}-0-0-0"
+        ]
+    except KeyError:
+        back = parsed_data["d"]["oddsdata"]["back"]
+        odds_data = back[sorted(list(back.keys()))[0]]
+    try:
+        outcome_id = odds_data["outcomeId"][team_idx]
+    except KeyError:
+        outcome_id = odds_data["outcomeId"][str(team_idx)]
     history = odds_data["history"][outcome_id]
     odds_models = []
     for bookie_id, bookie_name in bookie_names.items():

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/data/weather/openmeteo/openmeteo_weather_model.py

@@ -131,7 +131,11 @@ def _create_openmeteo_weather_model(
             },
         )
         return _parse_openmeteo(responses, tz, dt)
-    except (requests.exceptions.RetryError, OpenMeteoRequestsError):
+    except (
+        requests.exceptions.RetryError,
+        OpenMeteoRequestsError,
+        requests.exceptions.ReadTimeout,
+    ):
         return None
     except Exception as e:
         e_text = str(e)

{sportsball-0.3.27 → sportsball-0.3.29}/sportsball/proxy_session.py

@@ -145,7 +145,7 @@ class ProxySession(requests_cache.CachedSession):
             logging.info("Request for %s not cached.", request.url)
 
             # Otherwise check the wayback machine
-            if not _is_fast_fail_url(request.url) and no_wayback:
+            if not _is_fast_fail_url(request.url) and not no_wayback:
                 response = self._wayback_machine_request(
                     request.method, request.url, headers=request.headers
                 )

{sportsball-0.3.27 → sportsball-0.3.29/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.3.27 → sportsball-0.3.29}/tests/data/oddsportal/oddsportal_game_model_test.py

@@ -33,3 +33,21 @@ class TestOddsPortalGameModel(unittest.TestCase):
                 True,
             )
             self.assertEqual(game_model.dt, datetime.datetime(2025, 3, 6, 3, 50))
+
+    def test_event_dt(self):
+        url = "https://www.oddsportal.com/aussie-rules/australia/afl-2013/collingwood-magpies-north-melbourne-kangaroos-6yxbPNei/"
+        with requests_mock.Mocker() as m:
+            with open(os.path.join(self.dir, "collingwood-magpies-north-melbourne-kangaroos-6yxbPNei.html"), "rb") as f:
+                m.get(url, content=f.read())
+            with open(os.path.join(self.dir, "app.js"), "rb") as f:
+                m.get("https://www.oddsportal.com/res/public/js/build/app.js?v=240917140831", content=f.read())
+            with open(os.path.join(self.dir, "1-18-6yxbPNei-3-1-yj485.dat"), "rb") as f:
+                m.get("https://www.oddsportal.com/match-event/1-18-6yxbPNei-3-1-yj485.dat", content=f.read())
+
+            game_model = create_oddsportal_game_model(
+                self.session,
+                url,
+                League.AFL,
+                True,
+            )
+            self.assertEqual(game_model.dt, datetime.datetime(2013, 9, 1, 1, 20))