sportsball 0.3.33__tar.gz → 0.3.35__tar.gz

{sportsball-0.3.33/sportsball.egg-info → sportsball-0.3.35}/PKG-INFO

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

{sportsball-0.3.33 → sportsball-0.3.35}/setup.py

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

{sportsball-0.3.33 → sportsball-0.3.35}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.33"
+__VERSION__ = "0.3.35"

sportsball-0.3.35/sportsball/cache.py

@@ -0,0 +1,5 @@
+"""Caching utilities."""
+
+from joblib import Memory  # type: ignore
+
+MEMORY = Memory(".sportsball_cache", verbose=0)

{sportsball-0.3.33 → sportsball-0.3.35}/sportsball/data/afl/afltables/afl_afltables_game_model.py

@@ -218,7 +218,7 @@ def _create_afl_afltables_game_model(
         ],
         end_dt=end_dt,
         attendance=attendance,
-        league=league,
+        league=str(league),
         year=season_year,
         season_type=season_type,
         postponed=None,

{sportsball-0.3.33 → sportsball-0.3.35}/sportsball/data/afl/afltables/afl_afltables_league_model.py

@@ -22,6 +22,23 @@ from .afl_afltables_game_model import create_afl_afltables_game_model
 _SEASON_URL = "https://afltables.com/afl/seas/season_idx.html"
 
 
+def _find_dt(td_text: str, season_url: str) -> datetime.datetime:
+    cleaned_text = (
+        td_text.split("Venue:")[0].split("Att:")[0].strip().split("(")[0].strip()
+    )
+    cleaned_text = " ".join(cleaned_text.split()[-3:])
+    try:
+        return parser.parse(cleaned_text)
+    except parser._parser.ParserError:  # type: ignore
+        # Handle text like "Richmond  Thu 13-Mar-2025 Venue: M.C.G."
+        cleaned_text = cleaned_text.split()[-1]
+        try:
+            return 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
+
+
 class AFLAFLTablesLeagueModel(LeagueModel):
     """AFL AFLTables implementation of the league model."""
 
@@ -60,21 +77,7 @@ 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()
-                        .split("(")[0]
-                        .strip()
-                    )
-                    cleaned_text = " ".join(cleaned_text.split()[-3:])
-                    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
+                    current_dt = _find_dt(td_text, season_url)
             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.33 → sportsball-0.3.35}/sportsball/data/afl/combined/afl_combined_league_model.py

@@ -138,6 +138,12 @@ BLACKTOWN = "blacktown"
 RIVERWAY = "riverway"
 NORWOOD = "norwood"
 SUMMIT = "summit"
+ANGEL_STADIUM = "Angel Stadium of Anaheim"
+THUNDERDOME_STADIUM = "Thunderdome Stadium"
+SPOTLAND_STADIUM = "Spotland Stadium"
+GIANTS_STADIUM = "Giants Stadium"
+TIPOS_ARENA = "Ondrej Nepela Arena"
+BAROSSA_PARK = "Barossa Park"
 AFL_VENUE_IDENTITY_MAP = {
     "brunswick_st": BRUNSWICK_ST,
     "victoria_park": VICTORIA_PARK,
@@ -189,6 +195,7 @@ AFL_VENUE_IDENTITY_MAP = {
     "riverway": RIVERWAY,
     "norwood": NORWOOD,
     "summit": SUMMIT,
+    # Aus Sports Betting
     "MCG": MCG,
     "SCG": SCG,
     "ENGIE Stadium": STADIUM_AUSTRALIA,
@@ -217,6 +224,21 @@ AFL_VENUE_IDENTITY_MAP = {
     "Blacktown Park": BLACKTOWN,
     # OddsPortal
     "Melbourne Cricket Ground": MCG,
+    "Angel Stadium of Anaheim": ANGEL_STADIUM,
+    "The Gabba": GABBA,
+    "Sydney Cricket Ground": SCG,
+    "Subiaco Oval": SUBIACO,
+    "Thunderdome Stadium": THUNDERDOME_STADIUM,
+    "University of Tasmania Stadium": YORK_PARK,
+    "Spotland Stadium": SPOTLAND_STADIUM,
+    "Engie Stadium": STADIUM_AUSTRALIA,
+    "Cazaly's Stadium": CAZALYS_STADIUM,
+    "Jiangwan Stadium": JIANGWAN,
+    "TIO Traeger Park": TRAEGER,
+    "Marrara Oval": MARRARA_OVAL,
+    "Giants Stadium": GIANTS_STADIUM,
+    "Ondrej Nepela Arena": TIPOS_ARENA,
+    "Barossa Park": BAROSSA_PARK,
 }
 
 

{sportsball-0.3.33 → sportsball-0.3.35}/sportsball/data/aussportsbetting/aussportsbetting_game_model.py

@@ -43,7 +43,7 @@ def _create_aussportsbetting_game_model(
         teams=[home_team_model, away_team_model],  # pyright: ignore
         end_dt=None,
         attendance=None,
-        league=league,
+        league=str(league),
         year=None,
         season_type=None,
         postponed=None,

{sportsball-0.3.33 → sportsball-0.3.35}/sportsball/data/combined/combined_game_model.py

@@ -112,7 +112,7 @@ def create_combined_game_model(
         teams=full_team_models,
         end_dt=end_dt,
         attendance=attendance,
-        league=game_models[0].league,
+        league=str(game_models[0].league),
         year=year,
         season_type=season_type,
         postponed=postponed,

{sportsball-0.3.33 → sportsball-0.3.35}/sportsball/data/combined/combined_league_model.py

@@ -3,13 +3,11 @@
 # pylint: disable=raise-missing-from
 import logging
 import multiprocessing
-import traceback
-from multiprocessing import Pool
+from concurrent.futures import ThreadPoolExecutor
 from typing import Any, Iterator
 
 import requests_cache
 
-from ...logger import setup_logger
 from ..game_model import GameModel
 from ..league import League
 from ..league_model import LeagueModel
@@ -17,13 +15,7 @@ from .combined_game_model import create_combined_game_model
 
 
 def _produce_league_games(league_model: LeagueModel) -> list[dict[str, Any]]:
-    setup_logger()
-    try:
-        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))
+    return [x.model_dump() for x in league_model.games]
 
 
 class CombinedLeagueModel(LeagueModel):
@@ -58,21 +50,18 @@ class CombinedLeagueModel(LeagueModel):
         team_identity_map = self.team_identity_map()
         for league_model in self._league_models:
             league_model.clear_session()
-        with Pool(min(multiprocessing.cpu_count(), len(self._league_models))) as p:
+        with ThreadPoolExecutor(
+            min(multiprocessing.cpu_count(), len(self._league_models))
+        ) as p:
             # We want to terminate immediately if any of our runners runs into trouble.
-            def _error_callback(exc: BaseException) -> None:
-                p.terminate()
-                raise ValueError(str(exc))
 
-            results = [
-                p.apply_async(
-                    _produce_league_games, args=(x,), error_callback=_error_callback
+            results = list(
+                p.map(
+                    _produce_league_games,
+                    self._league_models,
                 )
-                for x in self._league_models
-            ]
-            game_lists = [
-                [GameModel.model_validate(y) for y in x.get()] for x in results
-            ]
+            )
+        game_lists = [[GameModel.model_validate(y) for y in x] for x in results]
 
         for game_list in game_lists:
             for game_model in game_list:

{sportsball-0.3.33 → sportsball-0.3.35}/sportsball/data/espn/espn_game_model.py

@@ -140,7 +140,7 @@ def _create_espn_game_model(
         teams=teams,
         end_dt=end_dt,
         attendance=attendance,
-        league=league,
+        league=str(league),
         year=year,
         season_type=season_type,
         postponed=None,

{sportsball-0.3.33 → sportsball-0.3.35}/sportsball/data/game_model.py

@@ -7,7 +7,6 @@ import pytz
 from pydantic import BaseModel, Field
 
 from .field_type import TYPE_KEY, FieldType
-from .league import League
 from .season_type import SeasonType
 from .team_model import TeamModel
 from .venue_model import VenueModel
@@ -54,7 +53,7 @@ class GameModel(BaseModel):
         ..., json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD}, alias=END_DT_COLUMN
     )
     attendance: int | None = Field(..., alias=GAME_ATTENDANCE_COLUMN)
-    league: League = Field(..., alias=LEAGUE_COLUMN)
+    league: str = Field(..., alias=LEAGUE_COLUMN)
     year: int | None
     season_type: SeasonType | None
     postponed: bool | None = Field(