sportsball 0.3.21__tar.gz → 0.3.23__tar.gz

{sportsball-0.3.21/sportsball.egg-info → sportsball-0.3.23}/PKG-INFO

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

{sportsball-0.3.21 → sportsball-0.3.23}/setup.py

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

{sportsball-0.3.21 → sportsball-0.3.23}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.21"
+__VERSION__ = "0.3.23"

{sportsball-0.3.21 → sportsball-0.3.23}/sportsball/data/afl/afltables/afl_afltables_league_model.py

@@ -56,8 +56,10 @@ class AFLAFLTablesLeagueModel(LeagueModel):
             current_dt = None
             for td in table.find_all("td"):
                 td_text = td.get_text().strip()
-                if "(" in td_text:
-                    current_dt = parser.parse(td_text.split("(")[0].strip())
+                if "Venue:" in td_text:
+                    cleaned_text = td_text.split("Venue:")[0].split("Att:")[0].strip()
+                    cleaned_text = " ".join(cleaned_text.split()[-3:])
+                    current_dt = parser.parse(cleaned_text)
             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.21 → sportsball-0.3.23}/sportsball/data/combined/combined_league_model.py

@@ -3,6 +3,7 @@
 # pylint: disable=raise-missing-from
 import logging
 import multiprocessing
+import traceback
 from multiprocessing import Pool
 from typing import Any, Iterator
 
@@ -21,6 +22,7 @@ def _produce_league_games(league_model: LeagueModel) -> list[dict[str, Any]]:
         return [x.model_dump() for x in league_model.games]
     except Exception as exc:
         logging.error("Exception: %s", str(exc))
+        logging.error(traceback.format_exc())
         raise ValueError(str(exc))
 
 

{sportsball-0.3.21 → sportsball-0.3.23}/sportsball/data/google/google_address_model.py

@@ -1108,6 +1108,15 @@ TEXAS_AM_COMMERCE_FIELD_HOUSE = SportsballGeocodeTuple(
     housenumber="2600",
     country="USA",
 )
+WISDOM_GYM = SportsballGeocodeTuple(
+    city="Stephenville",
+    state="TX",
+    postal="",
+    lat=32.215438,
+    lng=-98.220617,
+    housenumber="",
+    country="USA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -3528,15 +3537,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="8600",
         country="USA",
     ),
-    "Wisdom Gym, Stephenville, Texas": SportsballGeocodeTuple(
-        city="Stephenville",
-        state="TX",
-        postal="",
-        lat=32.215438,
-        lng=-98.220617,
-        housenumber="",
-        country="USA",
-    ),
+    "Wisdom Gym, Stephenville, Texas": WISDOM_GYM,
     "Skyhawk Arena, Martin, Tennessee": SportsballGeocodeTuple(
         city="Martin",
         state="TN",
@@ -7075,6 +7076,25 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="",
         country="USA",
     ),
+    "The Gabba, Brisbane, Australia": GABBA,
+    "Sydney Cricket Ground, Sydney, Australia": SCG,
+    "People First Stadium, Gold Coast, Australia": PEOPLE_FIRST_STADIUM,
+    "Engie Stadium, Sydney, Australia": ENGIE_STADIUM,
+    "Melbourne Cricket Ground, Melbourne, Australia": MCG,
+    "GMHBA Stadium, Geelong, Australia": GMHBA_STADIUM,
+    "Marvel Stadium, Melbourne, Australia": MARVEL_STADIUM,
+    "Adelaide Oval, Adelaide, Australia": ADELAIDE_OVAL,
+    "Optus Stadium, Perth, Australia": OPTUS_STADIUM,
+    "Wisdom Gymnasium, Stephenville, Texas": WISDOM_GYM,
+    "Charlotte, North Carolina": SportsballGeocodeTuple(
+        city="Charlotte",
+        state="NC",
+        postal="",
+        lat=35.227222,
+        lng=-80.843056,
+        housenumber="",
+        country="USA",
+    ),
 }
 
 

sportsball-0.3.23/sportsball/data/ncaaf/__init__.py

@@ -0,0 +1,5 @@
+"""The ncaaf data sportsball module."""
+
+# ruff: noqa: F401
+from .combined.ncaaf_combined_league_model import \
+    NCAAFCombinedLeagueModel as NCAAFLeagueModel

sportsball-0.3.23/sportsball/data/ncaaf/combined/ncaaf_combined_league_model.py

@@ -0,0 +1,34 @@
+"""NCAAF combined league model."""
+
+import requests_cache
+
+from ...combined.combined_league_model import CombinedLeagueModel
+from ...league import League
+from ..espn.ncaaf_espn_league_model import NCAAFESPNLeagueModel
+from ..oddsportal.ncaaf_oddsportal_league_model import \
+    NCAAFOddsPortalLeagueModel
+
+NCAAF_TEAM_IDENTITY_MAP: dict[str, str] = {}
+NCAAF_VENUE_IDENTITY_MAP: dict[str, str] = {}
+
+
+class NCAAFCombinedLeagueModel(CombinedLeagueModel):
+    """NCAAF combined implementation of the league model."""
+
+    def __init__(self, session: requests_cache.CachedSession) -> None:
+        super().__init__(
+            session,
+            League.NCAAF,
+            [
+                NCAAFESPNLeagueModel(session),
+                NCAAFOddsPortalLeagueModel(session),
+            ],
+        )
+
+    @classmethod
+    def team_identity_map(cls) -> dict[str, str]:
+        return NCAAF_TEAM_IDENTITY_MAP
+
+    @classmethod
+    def venue_identity_map(cls) -> dict[str, str]:
+        return NCAAF_VENUE_IDENTITY_MAP

sportsball-0.3.23/sportsball/data/ncaaf/oddsportal/ncaaf_oddsportal_league_model.py

@@ -0,0 +1,15 @@
+"""NCAAF OddsPortal league model."""
+
+# pylint: disable=line-too-long
+
+import requests_cache
+
+from ...league import League
+from ...oddsportal.oddsportal_league_model import OddsPortalLeagueModel
+
+
+class NCAAFOddsPortalLeagueModel(OddsPortalLeagueModel):
+    """NCAAF OddsPortal implementation of the league model."""
+
+    def __init__(self, session: requests_cache.CachedSession) -> None:
+        super().__init__(League.NCAAF, session)

{sportsball-0.3.21 → sportsball-0.3.23}/sportsball/data/oddsportal/oddsportal_game_model.py

@@ -24,17 +24,17 @@ def _create_oddsportal_game_model(
     response = session.get(url)
     response.raise_for_status()
 
-    soup = BeautifulSoup(url, "html.parser")
-    event_tag = soup.find("Event")
+    soup = BeautifulSoup(response.text, "html.parser")
+    event_tag = soup.find("div", id="react-event-header")
     if not isinstance(event_tag, Tag):
-        raise ValueError("event_tag is not a tag.")
-    event = json.loads(str(event_tag[":data"]))
+        raise ValueError(f"event_tag is not a tag for URL: {url}.")
+    event = json.loads(str(event_tag["data"]))
 
     event_body = event["eventBody"]
     event_data = event["eventData"]
     dt = datetime.datetime.fromtimestamp(event_body["startDate"])
     end_dt = None
-    if event_data["endDate"] is not False:
+    if event_body.get("endDate", False) is not False:
         end_dt = datetime.datetime.fromtimestamp(event_body["endDate"])
     version_id = str(event_data["versionId"])
     sport_id = str(event_data["sportId"])
@@ -54,11 +54,12 @@ def _create_oddsportal_game_model(
             src_response = session.get(src_url)
             src_response.raise_for_status()
             variables = src_response.text
-            variables = variables[variables.find('break}return e.next=9,g(r.data,"') :]
+            sentinel = 'break}return e.next=9,g(r.data,"'
+            variables = variables[variables.find(sentinel) + len(sentinel) :]
             variables = variables[
                 : variables.find('");case 9:return s=e.sent,l=JSON.parse(s),e.abrupt')
             ]
-            salt_str, password_str = variables.split('","')
+            password_str, salt_str = variables.split('","')
             salt = str.encode(salt_str)
             password = str.encode(password_str)
             break
@@ -68,6 +69,12 @@ def _create_oddsportal_game_model(
         raise ValueError("password is null.")
 
     bookie_names = event_body["providersNames"]
+    home_points = None
+    if event_body["homeResult"] != "":
+        home_points = float(event_body["homeResult"])
+    away_points = None
+    if event_body["awayResult"] != "":
+        away_points = float(event_body["awayResult"])
 
     return GameModel(
         dt=dt,
@@ -86,7 +93,7 @@ def _create_oddsportal_game_model(
                 dt,
                 event_data["home"],
                 league,
-                float(event_body["homeResult"]),
+                home_points,
                 version_id,
                 sport_id,
                 unique_id,
@@ -103,7 +110,7 @@ def _create_oddsportal_game_model(
                 dt,
                 event_data["away"],
                 league,
-                float(event_body["awayResult"]),
+                away_points,
                 version_id,
                 sport_id,
                 unique_id,

{sportsball-0.3.21 → sportsball-0.3.23}/sportsball/data/oddsportal/oddsportal_league_model.py

@@ -13,6 +13,16 @@ from ..league import League
 from ..league_model import LeagueModel
 from .oddsportal_game_model import create_oddsportal_game_model
 
+# Sports
+AMERICAN_FOOTBALL = "american-football"
+BASKETBALL = "basketball"
+
+# Countries
+USA = "usa"
+
+# Leagues
+NCAA = "ncaa"
+
 
 class OddsPortalLeagueModel(LeagueModel):
     """Odds Portal implementation of the league model."""
@@ -23,11 +33,13 @@ class OddsPortalLeagueModel(LeagueModel):
             case League.AFL:
                 return "/".join(["aussie-rules", "australia", "afl", ""])
             case League.NBA:
-                return "/".join(["basketball", "usa", "nba", ""])
+                return "/".join([BASKETBALL, USA, "nba", ""])
             case League.NCAAB:
-                return "/".join(["basketball", "usa", "ncaa", ""])
+                return "/".join([BASKETBALL, USA, NCAA, ""])
+            case League.NCAAF:
+                return "/".join([AMERICAN_FOOTBALL, USA, NCAA, ""])
             case League.NFL:
-                return "/".join(["american-football", "usa", "nfl", ""])
+                return "/".join([AMERICAN_FOOTBALL, USA, "nfl", ""])
             case _:
                 raise ValueError(f"Unsupported league: {self.league}")
 
@@ -41,7 +53,10 @@ class OddsPortalLeagueModel(LeagueModel):
             if jsonld["@type"] != "SportsEvent":
                 continue
             game_model = create_oddsportal_game_model(
-                self.session, jsonld["url"], self.league, True
+                self.session,
+                urllib.parse.urljoin(base_url, jsonld["url"]),
+                self.league,
+                True,
             )
             pbar.update(1)
             pbar.set_description(f"OddsPortal {game_model.dt}")
@@ -56,7 +71,11 @@ class OddsPortalLeagueModel(LeagueModel):
                 continue
             seen_urls.add(url)
 
-            response = self.session.get(url)
+            if url.endswith("results/"):
+                with self.session.cache_disabled():
+                    response = self.session.get(url)
+            else:
+                response = self.session.get(url)
             response.raise_for_status()
 
             soup = BeautifulSoup(response.text, "html.parser")
@@ -73,9 +92,15 @@ class OddsPortalLeagueModel(LeagueModel):
                 if not isinstance(tournament_component, Tag):
                     raise ValueError("tournament_component is not a tag.")
                 matches = json.loads(str(tournament_component[":sport-data"]))
-                for match in matches["tournamentGamesComponent"]["rows"]:
+                component = matches.get("tournamentGamesComponent", matches.get("d"))
+                if component.get("total") == 0:
+                    break
+                for match in component.get("rows", []):
                     game_model = create_oddsportal_game_model(
-                        self.session, match["url"], self.league, False
+                        self.session,
+                        urllib.parse.urljoin(url, match["url"]),
+                        self.league,
+                        False,
                     )
                     pbar.update(1)
                     pbar.set_description(f"OddsPortal {game_model.dt}")

{sportsball-0.3.21 → sportsball-0.3.23}/sportsball/data/oddsportal/oddsportal_team_model.py

@@ -25,7 +25,7 @@ def _create_oddsportal_team_model(
     dt: datetime.datetime,
     team_name: str,
     league: League,
-    points: float,
+    points: float | None,
     version_id: str,
     sport_id: str,
     unique_id: str,
@@ -38,7 +38,10 @@ def _create_oddsportal_team_model(
     team_idx: int,
 ) -> TeamModel:
     response = session.get(
-        f"https://www.oddsportal.com/feed/match-event/{version_id}-{sport_id}-{unique_id}-{default_bet_id}-{default_scope_id}-{xhash}.dat"
+        f"https://www.oddsportal.com/match-event/{version_id}-{sport_id}-{unique_id}-{default_bet_id}-{default_scope_id}-{xhash}.dat",
+        headers={
+            "X-Requested-With": "XMLHttpRequest",
+        },
     )
     response.raise_for_status()
     decoded_data = base64.b64decode(response.content).decode()
@@ -70,7 +73,7 @@ def _create_oddsportal_team_model(
     history = odds_data["history"][outcome_id]
     odds_models = []
     for bookie_id, bookie_name in bookie_names.items():
-        for odds, _, timestamp in history[bookie_id]:
+        for odds, _, timestamp in history.get(bookie_id, []):
             odds_models.append(
                 create_oddsportal_odds_model(
                     odds,
@@ -100,7 +103,7 @@ def _cached_create_oddsportal_team_model(
     dt: datetime.datetime,
     team_name: str,
     league: League,
-    points: float,
+    points: float | None,
     version_id: str,
     sport_id: str,
     unique_id: str,
@@ -136,7 +139,7 @@ def create_oddsportal_team_model(
     dt: datetime.datetime,
     team_name: str,
     league: League,
-    points: float,
+    points: float | None,
     version_id: str,
     sport_id: str,
     unique_id: str,

{sportsball-0.3.21 → sportsball-0.3.23/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.3.21 → sportsball-0.3.23}/sportsball.egg-info/SOURCES.txt

@@ -102,8 +102,12 @@ sportsball/data/ncaab/oddsportal/ncaab_oddsportal_league_model.py
 sportsball/data/ncaab/sportsreference/__init__.py
 sportsball/data/ncaab/sportsreference/ncaab_sportsreference_league_model.py
 sportsball/data/ncaaf/__init__.py
+sportsball/data/ncaaf/combined/__init__.py
+sportsball/data/ncaaf/combined/ncaaf_combined_league_model.py
 sportsball/data/ncaaf/espn/__init__.py
 sportsball/data/ncaaf/espn/ncaaf_espn_league_model.py
+sportsball/data/ncaaf/oddsportal/__init__.py
+sportsball/data/ncaaf/oddsportal/ncaaf_oddsportal_league_model.py
 sportsball/data/nfl/__init__.py
 sportsball/data/nfl/aussportsbetting/__init__.py
 sportsball/data/nfl/aussportsbetting/nfl_aussportsbetting_league_model.py
@@ -155,6 +159,7 @@ tests/data/social_model_test.py
 tests/data/team_model_test.py
 tests/data/afl/__init__.py
 tests/data/afl/afltables/__init__.py
+tests/data/afl/afltables/afl_afltables_league_model_test.py
 tests/data/afl/afltables/afl_afltables_player_model_test.py
 tests/data/aussportsbetting/__init__.py
 tests/data/aussportsbetting/aussportsbetting_game_model_test.py
@@ -183,6 +188,8 @@ tests/data/ncaab/sportsreference/ncaab_sportsreference_league_model_test.py
 tests/data/nfl/__init__.py
 tests/data/nfl/sportsdb/__init__.py
 tests/data/nfl/sportsdb/nfl_sportsdb_league_model_test.py
+tests/data/oddsportal/__init__.py
+tests/data/oddsportal/oddsportal_game_model_test.py
 tests/data/sportsdb/__init__.py
 tests/data/sportsdb/sportsdb_game_model_test.py
 tests/data/sportsdb/sportsdb_league_model_test.py

sportsball-0.3.23/tests/data/afl/afltables/afl_afltables_league_model_test.py

@@ -0,0 +1,16 @@
+"""Tests for the afltables league model class."""
+import unittest
+
+import requests_cache
+from sportsball.data.afl.afltables.afl_afltables_league_model import AFLAFLTablesLeagueModel
+from sportsball.data.league import League
+
+
+class TestAFLTablesLeagueModel(unittest.TestCase):
+
+    def setUp(self):
+        self._session = requests_cache.CachedSession(backend="memory")
+        self._league_model = AFLAFLTablesLeagueModel(self._session)
+
+    def test_league(self):
+        self.assertEqual(self._league_model.league, League.AFL)

sportsball-0.3.23/tests/data/oddsportal/oddsportal_game_model_test.py

@@ -0,0 +1,35 @@
+"""Tests for the oddsportal game model class."""
+import datetime
+import os
+import unittest
+
+import requests_mock
+import requests_cache
+from sportsball.data.oddsportal.oddsportal_game_model import create_oddsportal_game_model
+from sportsball.data.league import League
+
+
+class TestOddsPortalGameModel(unittest.TestCase):
+
+    def setUp(self):
+        self.session = requests_cache.CachedSession(backend="memory")
+        self.dir = os.path.dirname(__file__)
+
+    def test_dt(self):
+        url = "https://www.oddsportal.com/aussie-rules/australia/afl/brisbane-lions-geelong-cats-hjaPGVek/"
+        with requests_mock.Mocker() as m:
+            with open(os.path.join(self.dir, "brisbane-lions-geelong-cats-hjaPGVek.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=250131150028", content=f.read())
+            m.get("https://historical-forecast-api.open-meteo.com/v1/forecast?latitude=-27.4858375&longitude=153.0332144&start_date=2025-03-05&end_date=2025-03-06&hourly=temperature_2m&hourly=relative_humidity_2m&hourly=dew_point_2m&hourly=apparent_temperature&hourly=precipitation&hourly=rain&hourly=snowfall&hourly=snow_depth&hourly=weather_code&hourly=pressure_msl&hourly=surface_pressure&hourly=cloud_cover&hourly=cloud_cover_low&hourly=cloud_cover_mid&hourly=cloud_cover_high&hourly=et0_fao_evapotranspiration&hourly=vapour_pressure_deficit&hourly=wind_speed_10m&hourly=wind_speed_100m&hourly=wind_direction_10m&hourly=wind_direction_100m&hourly=wind_gusts_10m&hourly=soil_temperature_0_to_7cm&hourly=soil_temperature_7_to_28cm&hourly=soil_temperature_28_to_100cm&hourly=soil_temperature_100_to_255cm&hourly=soil_moisture_0_to_7cm&hourly=soil_moisture_7_to_28cm&hourly=soil_moisture_28_to_100cm&hourly=soil_moisture_100_to_255cm&daily=weather_code&daily=temperature_2m_max&daily=temperature_2m_min&daily=temperature_2m_mean&daily=apparent_temperature_max&daily=apparent_temperature_min&daily=apparent_temperature_mean&daily=sunrise&daily=sunset&daily=daylight_duration&daily=sunshine_duration&daily=precipitation_sum&daily=rain_sum&daily=snowfall_sum&daily=precipitation_hours&daily=wind_speed_10m_max&daily=wind_gusts_10m_max&daily=wind_direction_10m_dominant&daily=shortwave_radiation_sum&daily=et0_fao_evapotranspiration&timezone=Australia%2FBrisbane&format=flatbuffers")
+            with open(os.path.join(self.dir, "1-18-hjaPGVek-3-1-yjee3.dat"), "rb") as f:
+                m.get("https://www.oddsportal.com/match-event/1-18-hjaPGVek-3-1-yjee3.dat", content=f.read())
+
+            game_model = create_oddsportal_game_model(
+                self.session,
+                url,
+                League.AFL,
+                True,
+            )
+            self.assertEqual(game_model.dt, datetime.datetime(2025, 3, 6, 3, 50))

sportsball-0.3.21/sportsball/data/ncaaf/__init__.py

@@ -1,5 +0,0 @@
-"""The ncaaf data sportsball module."""
-
-# ruff: noqa: F401
-from .espn.ncaaf_espn_league_model import \
-    NCAAFESPNLeagueModel as NCAAFLeagueModel