sportsball 0.6.22__tar.gz → 0.7.0__tar.gz

{sportsball-0.6.22/sportsball.egg-info → sportsball-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.6.22
+Version: 0.7.0
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield
@@ -47,7 +47,8 @@ Requires-Dist: playwright>=1.51.0
 Requires-Dist: cchardet>=2.2.0a2
 Requires-Dist: lxml>=5.3.0
 Requires-Dist: gender-guesser>=0.4.0
-Requires-Dist: scrapesession>=0.0.1
+Requires-Dist: scrapesession>=0.0.3
+Requires-Dist: pyhigh>=0.0.6
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -111,6 +112,7 @@ Python 3.11.6:
 - [lxml](https://lxml.de/)
 - [gender-guesser](https://github.com/lead-ratings/gender-guesser)
 - [scrapesession](https://github.com/8W9aG/scrapesession)
+- [pyhigh](https://github.com/sgherbst/pyhigh)
 
 ## Raison D'être :thought_balloon:
 
@@ -168,6 +170,7 @@ A representation of the game within a season.
 * **postponed**: Whether the game was postponed.
 * **playoff**: Whether the game was a playoff game.
 * **distance**: The distance the game was played over.
+* **version**: The version of the game model.
 
 #### Team
 
@@ -224,6 +227,7 @@ A representation of a team within a game.
 * **steals**: The number of steals made by the players on the team in the game.
 * **blocks**: The number of blocks made by the players on the team in the game.
 * **personal_fouls**: The number of personal fouls made by the players on the team in the game.
+* **version**: The version of the team model.
 
 #### Player
 
@@ -287,6 +291,7 @@ A representation of a player within a team within a game.
 * **points**: The points made by the player during the game.
 * **game_score**: The [John Hollinger game score](https://www.nbastuffer.com/analytics101/game-score/) of the player during the game.
 * **point_differential**: The points scored by the players team while the player was on the court minus the points scored by the opposing team when the player is off the court.
+* **version**: The version of the player model.
 
 #### Odds
 
@@ -307,6 +312,9 @@ The venue the game is played at.
 * **address**: The address of the venue.
 * **is_grass**: Whether the venue has a grass field.
 * **is_indoor**: Whether the venue is indoors.
+* **is_turf**: Whether the venue is turf.
+* **is_dirt**: Whether the venue is dirt.
+* **version**: The version of the game model.
 
 #### Address
 
@@ -321,6 +329,8 @@ The address of the venue.
 * **weather**: The weather at the address at the game start time.
 * **timezone**: The time zone at the address.
 * **country**: The country of the address.
+* **altitude**: The altitude of the address.
+* **version**: The version of the address model.
 
 #### Weather
 
@@ -421,6 +431,8 @@ The coach on the team at the time of the game.
 * **name**: The name of the coach.
 * **birth_date**: The birth date of the coach.
 * **age**: The age of the coach.
+* **sex**: The sex of the coach.
+* **version**: The version of the coach model.
 
 #### Dividend
 

{sportsball-0.6.22 → sportsball-0.7.0}/README.md

@@ -50,6 +50,7 @@ Python 3.11.6:
 - [lxml](https://lxml.de/)
 - [gender-guesser](https://github.com/lead-ratings/gender-guesser)
 - [scrapesession](https://github.com/8W9aG/scrapesession)
+- [pyhigh](https://github.com/sgherbst/pyhigh)
 
 ## Raison D'être :thought_balloon:
 
@@ -107,6 +108,7 @@ A representation of the game within a season.
 * **postponed**: Whether the game was postponed.
 * **playoff**: Whether the game was a playoff game.
 * **distance**: The distance the game was played over.
+* **version**: The version of the game model.
 
 #### Team
 
@@ -163,6 +165,7 @@ A representation of a team within a game.
 * **steals**: The number of steals made by the players on the team in the game.
 * **blocks**: The number of blocks made by the players on the team in the game.
 * **personal_fouls**: The number of personal fouls made by the players on the team in the game.
+* **version**: The version of the team model.
 
 #### Player
 
@@ -226,6 +229,7 @@ A representation of a player within a team within a game.
 * **points**: The points made by the player during the game.
 * **game_score**: The [John Hollinger game score](https://www.nbastuffer.com/analytics101/game-score/) of the player during the game.
 * **point_differential**: The points scored by the players team while the player was on the court minus the points scored by the opposing team when the player is off the court.
+* **version**: The version of the player model.
 
 #### Odds
 
@@ -246,6 +250,9 @@ The venue the game is played at.
 * **address**: The address of the venue.
 * **is_grass**: Whether the venue has a grass field.
 * **is_indoor**: Whether the venue is indoors.
+* **is_turf**: Whether the venue is turf.
+* **is_dirt**: Whether the venue is dirt.
+* **version**: The version of the game model.
 
 #### Address
 
@@ -260,6 +267,8 @@ The address of the venue.
 * **weather**: The weather at the address at the game start time.
 * **timezone**: The time zone at the address.
 * **country**: The country of the address.
+* **altitude**: The altitude of the address.
+* **version**: The version of the address model.
 
 #### Weather
 
@@ -360,6 +369,8 @@ The coach on the team at the time of the game.
 * **name**: The name of the coach.
 * **birth_date**: The birth date of the coach.
 * **age**: The age of the coach.
+* **sex**: The sex of the coach.
+* **version**: The version of the coach model.
 
 #### Dividend
 

{sportsball-0.6.22 → sportsball-0.7.0}/requirements.txt

@@ -34,4 +34,5 @@ playwright>=1.51.0
 cchardet>=2.2.0a2
 lxml>=5.3.0
 gender-guesser>=0.4.0
-scrapesession>=0.0.1
+scrapesession>=0.0.3
+pyhigh>=0.0.6

{sportsball-0.6.22 → sportsball-0.7.0}/setup.py

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

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/__init__.py

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

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/address_model.py

@@ -4,12 +4,16 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
+from .delimiter import DELIMITER
 from .field_type import TYPE_KEY, FieldType
+from .weather_model import VERSION as WEATHER_VERSION
 from .weather_model import WeatherModel
 
 ADDRESS_LATITUDE_COLUMN: Literal["latitude"] = "latitude"
 ADDRESS_LONGITUDE_COLUMN: Literal["longitude"] = "longitude"
 ADDRESS_TIMEZONE_COLUMN: Literal["timezone"] = "timezone"
+ADDRESS_ALTITUDE_COLUMN: Literal["altitude"] = "altitude"
+VERSION = DELIMITER.join(["0.0.1", WEATHER_VERSION])
 
 
 class AddressModel(BaseModel):
@@ -32,3 +36,5 @@ class AddressModel(BaseModel):
         alias=ADDRESS_TIMEZONE_COLUMN,
     )
     country: str = Field(..., json_schema_extra={TYPE_KEY: FieldType.CATEGORICAL})
+    altitude: float | None = Field(..., alias=ADDRESS_ALTITUDE_COLUMN)
+    version: str = VERSION

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afl/afl_afl_game_model.py

@@ -12,6 +12,8 @@ from playwright.sync_api import Playwright
 from ....playwright import ensure_install
 from ...game_model import GameModel
 from ...league import League
+from ...team_model import VERSION
+from ...venue_model import VERSION as VENUE_VERSION
 from ..position import Position, position_from_str
 from .afl_afl_team_model import create_afl_afl_team_model
 from .afl_afl_venue_model import create_afl_afl_venue_model
@@ -121,6 +123,7 @@ def create_afl_afl_game_model(
     ladder: list[str],
     url: str | None,
     playwright: Playwright,
+    version: str,
 ) -> GameModel:
     """Create a game model from AFL Tables."""
     odds: list[float] = []
@@ -137,15 +140,18 @@ def create_afl_afl_game_model(
     if dt is None:
         raise ValueError("dt is null")
 
-    venue_model = create_afl_afl_venue_model(venue_name, session, dt)
+    venue_model = create_afl_afl_venue_model(
+        venue_name=venue_name, session=session, dt=dt, version=VENUE_VERSION
+    )
     teams = [
         create_afl_afl_team_model(
-            x,
-            players[count],
-            session,
-            dt,
-            ladder,
-            odds[count] if count < len(odds) else None,
+            team_name=x,
+            players=players[count],
+            session=session,
+            dt=dt,
+            ladder=ladder,
+            odds=odds[count] if count < len(odds) else None,
+            version=VERSION,
         )
         for count, x in enumerate(team_names)
     ]
@@ -165,4 +171,5 @@ def create_afl_afl_game_model(
         distance=None,
         dividends=[],
         pot=None,
+        version=version,
     )

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -13,7 +13,7 @@ from playwright.sync_api import Playwright, sync_playwright
 from scrapesession.scrapesession import ScrapeSession  # type: ignore
 
 from ....playwright import ensure_install
-from ...game_model import GameModel
+from ...game_model import VERSION, GameModel
 from ...league import League
 from ...league_model import LeagueModel
 from ..position import Position, position_from_str
@@ -59,14 +59,15 @@ def _parse_v1(
         ):
             url = urllib.parse.urljoin(html_url, a.get("href"))
         yield create_afl_afl_game_model(
-            team_names,
-            teams_players,
-            dt,
-            venue_name,
-            session,
-            ladder,
-            url,
-            playwright,
+            team_names=team_names,
+            players=teams_players,
+            dt=dt,
+            venue_name=venue_name,
+            session=session,
+            ladder=ladder,
+            url=url,
+            playwright=playwright,
+            version=VERSION,
         )
 
 
@@ -150,14 +151,15 @@ def _parse_v2(
 ) -> Iterator[GameModel]:
     for team_names, team_players, venue_name, url in _parse_v2_soup(soup, html_url):
         yield create_afl_afl_game_model(
-            team_names,
-            team_players,
-            None,
-            venue_name,
-            session,
-            ladder,
-            url,
-            playwright,
+            team_names=team_names,
+            players=team_players,
+            dt=None,
+            venue_name=venue_name,
+            session=session,
+            ladder=ladder,
+            url=url,
+            playwright=playwright,
+            version=VERSION,
         )
 
 

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afl/afl_afl_player_model.py

@@ -1,7 +1,7 @@
 """AFL AFL player model."""
 
 # pylint: disable=duplicate-code
-from ...player_model import PlayerModel
+from ...player_model import VERSION, PlayerModel
 from ...sex import Sex
 from ...species import Species
 from ..position import Position
@@ -70,4 +70,5 @@ def create_afl_afl_player_model(
         points=None,
         game_score=None,
         point_differential=None,
+        version=VERSION,
     )

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afl/afl_afl_team_model.py

@@ -20,6 +20,7 @@ def create_afl_afl_team_model(
     dt: datetime.datetime,
     ladder: list[str],
     odds: float | None,
+    version: str,
 ) -> TeamModel:
     """Create a team model from AFL AFL."""
     player_models = [
@@ -52,4 +53,5 @@ def create_afl_afl_team_model(
         coaches=[],
         lbw=None,
         end_dt=None,
+        version=version,
     )

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afl/afl_afl_venue_model.py

@@ -13,6 +13,7 @@ def create_afl_afl_venue_model(
     venue_name: str,
     session: requests_cache.CachedSession,
     dt: datetime.datetime,
+    version: str,
 ) -> VenueModel:
     """Create a game model from AFL Tables."""
     address_model = create_google_address_model(venue_name, session, dt)
@@ -24,4 +25,5 @@ def create_afl_afl_venue_model(
         is_indoor=None,
         is_turf=None,
         is_dirt=None,
+        version=version,
     )

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afltables/afl_afltables_coach_model.py

@@ -16,13 +16,17 @@ from dateutil.parser import parse
 from dateutil.relativedelta import relativedelta
 
 from ....cache import MEMORY
-from ...coach_model import CoachModel
+from ...coach_model import VERSION, CoachModel
 
 _COACH_URL_CACHE: dict[str, str] = {}
 
 
 def _create_afl_afltables_coach_model(
-    url: str, session: requests_cache.CachedSession, year: int, dt: datetime.datetime
+    url: str,
+    session: requests_cache.CachedSession,
+    year: int,
+    dt: datetime.datetime,
+    version: str,
 ) -> CoachModel | None:
     html = _COACH_URL_CACHE.get(url)
     if html is None:
@@ -84,14 +88,21 @@ def _create_afl_afltables_coach_model(
         name=name,
         birth_date=birth_date,
         age=relativedelta(birth_date, dt).years if birth_date is not None else None,
+        version=version,
     )
 
 
 @MEMORY.cache(ignore=["session"])
 def _cached_create_afl_afltables_coach_model(
-    url: str, session: requests_cache.CachedSession, year: int, dt: datetime.datetime
+    url: str,
+    session: requests_cache.CachedSession,
+    year: int,
+    dt: datetime.datetime,
+    version: str,
 ) -> CoachModel | None:
-    return _create_afl_afltables_coach_model(url=url, session=session, year=year, dt=dt)
+    return _create_afl_afltables_coach_model(
+        url=url, session=session, year=year, dt=dt, version=version
+    )
 
 
 def create_afl_afltables_coach_model(
@@ -100,9 +111,9 @@ def create_afl_afltables_coach_model(
     """Create a coach model from AFL tables."""
     if not pytest_is_running.is_running():
         return _cached_create_afl_afltables_coach_model(
-            url=url, session=session, year=year, dt=dt
+            url=url, session=session, year=year, dt=dt, version=VERSION
         )
     with session.cache_disabled():
         return _create_afl_afltables_coach_model(
-            url=url, session=session, year=year, dt=dt
+            url=url, session=session, year=year, dt=dt, version=VERSION
         )

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afltables/afl_afltables_game_model.py

@@ -11,7 +11,7 @@ from bs4 import BeautifulSoup, Tag
 from dateutil.parser import parse
 
 from ....cache import MEMORY
-from ...game_model import GameModel
+from ...game_model import VERSION, GameModel
 from ...league import League
 from ...season_type import SeasonType
 from .afl_afltables_team_model import create_afl_afltables_team_model
@@ -144,6 +144,7 @@ def _create_afl_afltables_game_model(
     league: League,
     season_year: int | None,
     season_type: SeasonType | None,
+    version: str,
 ) -> GameModel:
     # pylint: disable=too-many-locals
     response = session.get(url)
@@ -472,6 +473,7 @@ def _create_afl_afltables_game_model(
         distance=None,
         dividends=[],
         pot=None,
+        version=version,
     )
 
 
@@ -485,16 +487,18 @@ def _cached_create_afl_afltables_game_model(
     league: League,
     season_year: int | None,
     season_type: SeasonType | None,
+    version: str,
 ) -> GameModel:
     return _create_afl_afltables_game_model(
-        game_number,
-        session,
-        url,
-        last_round_number,
-        last_ladder_ranks,
-        league,
-        season_year,
-        season_type,
+        game_number=game_number,
+        session=session,
+        url=url,
+        last_round_number=last_round_number,
+        last_ladder_ranks=last_ladder_ranks,
+        league=league,
+        season_year=season_year,
+        season_type=season_type,
+        version=version,
     )
 
 
@@ -511,23 +515,25 @@ def create_afl_afltables_game_model(
     """Create a game model from AFL Tables."""
     if not pytest_is_running.is_running():
         return _cached_create_afl_afltables_game_model(
-            game_number,
-            session,
-            url,
-            last_round_number,
-            last_ladder_ranks,
-            league,
-            season_year,
-            season_type,
+            game_number=game_number,
+            session=session,
+            url=url,
+            last_round_number=last_round_number,
+            last_ladder_ranks=last_ladder_ranks,
+            league=league,
+            season_year=season_year,
+            season_type=season_type,
+            version=VERSION,
         )
     with session.cache_disabled():
         return _create_afl_afltables_game_model(
-            game_number,
-            session,
-            url,
-            last_round_number,
-            last_ladder_ranks,
-            league,
-            season_year,
-            season_type,
+            game_number=game_number,
+            session=session,
+            url=url,
+            last_round_number=last_round_number,
+            last_ladder_ranks=last_ladder_ranks,
+            league=league,
+            season_year=season_year,
+            season_type=season_type,
+            version=VERSION,
         )

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afltables/afl_afltables_player_model.py

@@ -13,7 +13,7 @@ from dateutil.parser import parse
 from dateutil.relativedelta import relativedelta
 
 from ....cache import MEMORY
-from ...player_model import PlayerModel
+from ...player_model import VERSION, PlayerModel
 from ...sex import Sex
 from ...species import Species
 
@@ -47,6 +47,7 @@ def _create_afl_afltables_player_model(
     percentage_played: float | None,
     session: requests_cache.CachedSession,
     dt: datetime.datetime,
+    version: str,
 ) -> PlayerModel:
     o = urlparse(player_url)
     last_component = o.path.split("/")[-1]
@@ -128,6 +129,7 @@ def _create_afl_afltables_player_model(
         points=None,
         game_score=None,
         point_differential=None,
+        version=version,
     )
 
 
@@ -161,6 +163,7 @@ def _cached_create_afl_afltables_player_model(
     percentage_played: float | None,
     session: requests_cache.CachedSession,
     dt: datetime.datetime,
+    version: str,
 ) -> PlayerModel:
     return _create_afl_afltables_player_model(
         player_url=player_url,
@@ -191,6 +194,7 @@ def _cached_create_afl_afltables_player_model(
         percentage_played=percentage_played,
         session=session,
         dt=dt,
+        version=version,
     )
 
 
@@ -255,6 +259,7 @@ def create_afl_afltables_player_model(
             percentage_played=percentage_played,
             session=session,
             dt=dt,
+            version=VERSION,
         )
     with session.cache_disabled():
         return _create_afl_afltables_player_model(
@@ -286,4 +291,5 @@ def create_afl_afltables_player_model(
             percentage_played=percentage_played,
             session=session,
             dt=dt,
+            version=VERSION,
         )

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afltables/afl_afltables_team_model.py

@@ -13,7 +13,7 @@ from bs4 import BeautifulSoup
 from ....cache import MEMORY
 from ...google.google_news_model import create_google_news_models
 from ...league import League
-from ...team_model import TeamModel
+from ...team_model import VERSION, TeamModel
 from ...x.x_social_model import create_x_social_model
 from .afl_afltables_coach_model import create_afl_afltables_coach_model
 from .afl_afltables_player_model import create_afl_afltables_player_model
@@ -81,6 +81,7 @@ def _create_afl_afltables_team_model(
     last_ladder_ranks: dict[str, int] | None,
     dt: datetime.datetime,
     league: League,
+    version: str,
 ) -> TeamModel:
     response = session.get(team_url)
     soup = BeautifulSoup(response.text, "lxml")
@@ -157,6 +158,7 @@ def _create_afl_afltables_team_model(
         coaches=[coach_model] if coach_model is not None else [],
         lbw=None,
         end_dt=None,
+        version=version,
     )
 
 
@@ -198,15 +200,17 @@ def _cached_create_afl_afltables_team_model(
     last_ladder_ranks: dict[str, int] | None,
     dt: datetime.datetime,
     league: League,
+    version: str,
 ) -> TeamModel:
     return _create_afl_afltables_team_model(
-        team_url,
-        players,
-        points,
-        session,
-        last_ladder_ranks,
-        dt,
-        league,
+        team_url=team_url,
+        players=players,
+        points=points,
+        session=session,
+        last_ladder_ranks=last_ladder_ranks,
+        dt=dt,
+        league=league,
+        version=version,
     )
 
 
@@ -251,9 +255,23 @@ def create_afl_afltables_team_model(
     """Create a team model from AFL Tables."""
     if not pytest_is_running.is_running():
         return _cached_create_afl_afltables_team_model(
-            team_url, players, points, session, last_ladder_ranks, dt, league
+            team_url=team_url,
+            players=players,
+            points=points,
+            session=session,
+            last_ladder_ranks=last_ladder_ranks,
+            dt=dt,
+            league=league,
+            version=VERSION,
         )
     with session.cache_disabled():
         return _create_afl_afltables_team_model(
-            team_url, players, points, session, last_ladder_ranks, dt, league
+            team_url=team_url,
+            players=players,
+            points=points,
+            session=session,
+            last_ladder_ranks=last_ladder_ranks,
+            dt=dt,
+            league=league,
+            version=VERSION,
         )

{sportsball-0.6.22 → sportsball-0.7.0}/sportsball/data/afl/afltables/afl_afltables_venue_model.py

@@ -10,11 +10,14 @@ from bs4 import BeautifulSoup
 
 from ....cache import MEMORY
 from ...google.google_address_model import create_google_address_model
-from ...venue_model import VenueModel
+from ...venue_model import VERSION, VenueModel
 
 
 def _create_afl_afltables_venue_model(
-    url: str, session: requests_cache.CachedSession, dt: datetime.datetime
+    url: str,
+    session: requests_cache.CachedSession,
+    dt: datetime.datetime,
+    version: str,
 ) -> VenueModel:
     o = urlparse(url)
     last_component = o.path.split("/")[-1]
@@ -35,14 +38,17 @@ def _create_afl_afltables_venue_model(
         is_indoor=None,
         is_turf=None,
         is_dirt=None,
+        version=version,
     )
 
 
 @MEMORY.cache(ignore=["session"])
 def _cached_create_afl_afltables_venue_model(
-    url: str, session: requests_cache.CachedSession, dt: datetime.datetime
+    url: str, session: requests_cache.CachedSession, dt: datetime.datetime, version: str
 ) -> VenueModel:
-    return _create_afl_afltables_venue_model(url, session, dt)
+    return _create_afl_afltables_venue_model(
+        url=url, session=session, dt=dt, version=version
+    )
 
 
 def create_afl_afltables_venue_model(
@@ -50,6 +56,10 @@ def create_afl_afltables_venue_model(
 ) -> VenueModel:
     """Create a venue model from AFL tables."""
     if not pytest_is_running.is_running():
-        return _cached_create_afl_afltables_venue_model(url, session, dt)
+        return _cached_create_afl_afltables_venue_model(
+            url=url, session=session, dt=dt, version=VERSION
+        )
     with session.cache_disabled():
-        return _create_afl_afltables_venue_model(url, session, dt)
+        return _create_afl_afltables_venue_model(
+            url=url, session=session, dt=dt, version=VERSION
+        )