sportsball 0.3.124__tar.gz → 0.3.126__tar.gz

{sportsball-0.3.124/sportsball.egg-info → sportsball-0.3.126}/PKG-INFO

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

{sportsball-0.3.124 → sportsball-0.3.126}/setup.py

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

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/__init__.py

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

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/afl/afl/afl_afl_player_model.py

@@ -44,4 +44,5 @@ def create_afl_afl_player_model(
         bounces=None,
         goal_assists=None,
         percentage_played=None,
+        birth_date=None,
     )

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/afl/afltables/afl_afltables_player_model.py

@@ -1,12 +1,13 @@
 """AFL AFLTables player model."""
 
 # pylint: disable=line-too-long,duplicate-code,too-many-arguments,too-many-locals
-import datetime
 import os
 from urllib.parse import urlparse
 
 import pytest_is_running
 import requests_cache
+from bs4 import BeautifulSoup
+from dateutil.parser import parse
 
 from ....cache import MEMORY
 from ...player_model import PlayerModel
@@ -39,11 +40,16 @@ def _create_afl_afltables_player_model(
     bounces: int | None,
     goal_assists: int | None,
     percentage_played: float | None,
+    session: requests_cache.CachedSession,
 ) -> PlayerModel:
     o = urlparse(player_url)
     last_component = o.path.split("/")[-1]
     identifier, _ = os.path.splitext(last_component)
     jersey = "".join(filter(str.isdigit, jersey))
+    response = session.get(player_url)
+    response.raise_for_status()
+    soup = BeautifulSoup(response.text, "lxml")
+    birth_date = parse(soup.get_text().split("Born:")[1].strip().split()[0].strip())
     return PlayerModel(
         identifier=identifier,
         jersey=jersey,
@@ -78,10 +84,11 @@ def _create_afl_afltables_player_model(
         bounces=bounces,
         goal_assists=goal_assists,
         percentage_played=percentage_played,
+        birth_date=birth_date,
     )
 
 
-@MEMORY.cache
+@MEMORY.cache(ignore=["session"])
 def _cached_create_afl_afltables_player_model(
     player_url: str,
     jersey: str,
@@ -109,6 +116,7 @@ def _cached_create_afl_afltables_player_model(
     bounces: int | None,
     goal_assists: int | None,
     percentage_played: float | None,
+    session: requests_cache.CachedSession,
 ) -> PlayerModel:
     return _create_afl_afltables_player_model(
         player_url,
@@ -137,6 +145,7 @@ def _cached_create_afl_afltables_player_model(
         bounces,
         goal_assists,
         percentage_played,
+        session,
     )
 
 
@@ -144,7 +153,6 @@ def create_afl_afltables_player_model(
     player_url: str,
     jersey: str,
     kicks: int | None,
-    dt: datetime.datetime,
     session: requests_cache.CachedSession,
     name: str,
     marks: int | None,
@@ -171,10 +179,7 @@ def create_afl_afltables_player_model(
     percentage_played: float | None,
 ) -> PlayerModel:
     """Create a player model from AFL Tables."""
-    if (
-        not pytest_is_running.is_running()
-        and dt < datetime.datetime.now() - datetime.timedelta(days=7)
-    ):
+    if not pytest_is_running.is_running():
         return _cached_create_afl_afltables_player_model(
             player_url,
             jersey,
@@ -202,6 +207,7 @@ def create_afl_afltables_player_model(
             bounces,
             goal_assists,
             percentage_played,
+            session,
         )
     with session.cache_disabled():
         return _create_afl_afltables_player_model(
@@ -231,4 +237,5 @@ def create_afl_afltables_player_model(
             bounces,
             goal_assists,
             percentage_played,
+            session,
         )

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/afl/afltables/afl_afltables_team_model.py

@@ -104,7 +104,6 @@ def _create_afl_afltables_team_model(
                 player_url,
                 jersey,
                 kicks,
-                dt,
                 session,
                 name,
                 marks,
@@ -231,10 +230,7 @@ def create_afl_afltables_team_model(
     league: League,
 ) -> TeamModel:
     """Create a team model from AFL Tables."""
-    if (
-        not pytest_is_running.is_running()
-        and dt < datetime.datetime.now() - datetime.timedelta(days=7)
-    ):
+    if not pytest_is_running.is_running():
         return _cached_create_afl_afltables_team_model(
             team_url, players, points, session, last_ladder_ranks, dt, league
         )

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/afl/afltables/afl_afltables_venue_model.py

@@ -47,10 +47,7 @@ def create_afl_afltables_venue_model(
     url: str, session: requests_cache.CachedSession, dt: datetime.datetime
 ) -> VenueModel:
     """Create a venue model from AFL tables."""
-    if (
-        not pytest_is_running.is_running()
-        and dt < datetime.datetime.now() - datetime.timedelta(days=7)
-    ):
+    if not pytest_is_running.is_running():
         return _cached_create_afl_afltables_venue_model(url, session, dt)
     with session.cache_disabled():
         return _create_afl_afltables_venue_model(url, session, dt)

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/combined/combined_player_model.py

@@ -41,6 +41,7 @@ def create_combined_player_model(
     bounces = None
     goal_assists = None
     percentage_played = None
+    birth_date = None
     for player_model in player_models:
         player_model_jersey = player_model.jersey
         if not is_null(player_model_jersey):
@@ -138,6 +139,9 @@ def create_combined_player_model(
         player_model_percentage_played = player_model.percentage_played
         if not is_null(player_model_percentage_played):
             percentage_played = player_model_percentage_played
+        player_model_birth_date = player_model.birth_date
+        if not is_null(player_model_birth_date):
+            birth_date = player_model_birth_date
     if name is None:
         raise ValueError("name is null.")
     return PlayerModel(
@@ -174,4 +178,5 @@ def create_combined_player_model(
         bounces=bounces,
         goal_assists=goal_assists,
         percentage_played=percentage_played,
+        birth_date=birth_date,
     )

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/espn/espn_player_model.py

@@ -6,6 +6,7 @@ from typing import Any
 
 import pytest_is_running
 import requests_cache
+from dateutil.parser import parse
 
 from ...cache import MEMORY
 from ..player_model import PlayerModel
@@ -33,6 +34,7 @@ def _create_espn_player_model(
     athlete_response.raise_for_status()
     athlete_dict = athlete_response.json()
     name = athlete_dict["fullName"]
+    birth_date = parse(athlete_dict["dateOfBirth"]).date()
     return PlayerModel(
         identifier=identifier,
         jersey=jersey,
@@ -67,6 +69,7 @@ def _create_espn_player_model(
         bounces=None,
         goal_assists=None,
         percentage_played=None,
+        birth_date=birth_date,
     )
 
 

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/google/google_address_model.py

@@ -2620,6 +2620,33 @@ MCCAMISH_PAVILION = SportsballGeocodeTuple(
     housenumber="965",
     country="USA",
 )
+TUDOR_FIELDHOUSE = SportsballGeocodeTuple(
+    city="Houston",
+    state="TX",
+    postal="77251",
+    lat=29.715102,
+    lng=-95.403895,
+    housenumber="6100",
+    country="USA",
+)
+HAGAN_ARENA = SportsballGeocodeTuple(
+    city="Philadelphia",
+    state="PA",
+    postal="",
+    lat=39.995245,
+    lng=-75.234806,
+    housenumber="",
+    country="USA",
+)
+COORS_EVENTS_CONFERENCE_CENTER = SportsballGeocodeTuple(
+    city="Boulder",
+    state="CO",
+    postal="",
+    lat=40.0047,
+    lng=-105.2606,
+    housenumber="950",
+    country="USA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -4566,15 +4593,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="820",
         country="USA",
     ),
-    "Hagan Arena, Philadelphia, Pennsylvania": SportsballGeocodeTuple(
-        city="Philadelphia",
-        state="PA",
-        postal="",
-        lat=39.995245,
-        lng=-75.234806,
-        housenumber="",
-        country="USA",
-    ),
+    "Hagan Arena, Philadelphia, Pennsylvania": HAGAN_ARENA,
     "Wells Fargo Center, Philadelphia, Pennsylvania": SPECTRUM,
     "UW-Milwaukee Panther Arena, Milwaukee, Wisconsin": MILWAUKEE_ARENA,
     "Pauley Pavilion, Los Angeles, California": SportsballGeocodeTuple(
@@ -5313,15 +5332,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="601",
         country="USA",
     ),
-    "Coors Events/Conference Center, Boulder, Colorado": SportsballGeocodeTuple(
-        city="Boulder",
-        state="CO",
-        postal="",
-        lat=40.0047,
-        lng=-105.2606,
-        housenumber="950",
-        country="USA",
-    ),
+    "Coors Events/Conference Center, Boulder, Colorado": COORS_EVENTS_CONFERENCE_CENTER,
     "Hamilton Gymnasium, Denver, Colorado": SportsballGeocodeTuple(
         city="Denver",
         state="CO",
@@ -5539,15 +5550,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Charles Koch Arena, Wichita, Kansas": CHARLES_KOCH_ARENA,
     "CHI Health Center Omaha, Omaha, Nebraska": CHI_HEALTH_CENTER,
-    "Tudor Fieldhouse, Houston, Texas": SportsballGeocodeTuple(
-        city="Houston",
-        state="TX",
-        postal="77251",
-        lat=29.715102,
-        lng=-95.403895,
-        housenumber="6100",
-        country="USA",
-    ),
+    "Tudor Fieldhouse, Houston, Texas": TUDOR_FIELDHOUSE,
     "Show Me Center, Cape Girardeau, Missouri": SportsballGeocodeTuple(
         city="Cape Girardeau",
         state="MO",
@@ -6228,7 +6231,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Mizzou Arena, Columbia, Missouri": SportsballGeocodeTuple(
         city="Columbia",
-        state="MS",
+        state="MO",
         postal="65211",
         lat=38.93237,
         lng=-92.33303,
@@ -7637,7 +7640,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "T-Mobile Center, Kansas City, Missouri": SportsballGeocodeTuple(
         city="Kansas City",
-        state="MS",
+        state="MO",
         postal="",
         lat=39.0975,
         lng=-94.580278,
@@ -10383,7 +10386,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     "ExploreAsheville.com Arena, Asheville, North Carolina": HARRAHS_CHEROKEE_CENTER,
     "St. Louis, Missouri": SportsballGeocodeTuple(
         city="St. Louis",
-        state="MS",
+        state="MO",
         postal="",
         lat=38.627222,
         lng=-90.197778,
@@ -10500,7 +10503,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Springfield, Missouri": SportsballGeocodeTuple(
         city="Springfield",
-        state="MS",
+        state="MO",
         postal="",
         lat=37.215278,
         lng=-93.298333,
@@ -10894,7 +10897,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Sikeston Field House, Sikeston, Missouri": SportsballGeocodeTuple(
         city="Sikeston",
-        state="MS",
+        state="MO",
         postal="63801",
         lat=36.87943,
         lng=-89.57209,
@@ -10994,7 +10997,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Columbia, Missouri": SportsballGeocodeTuple(
         city="Columbia",
-        state="MS",
+        state="MO",
         postal="",
         lat=38.9475,
         lng=-92.326667,
@@ -11462,7 +11465,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     "Miami Beach Auditorium, Miami Beach, Florida": MIAMI_BEACH_CONVENTION_CENTER,
     "Kiel Auditorium, St. Louis, Missouri": SportsballGeocodeTuple(
         city="St. Louis",
-        state="MS",
+        state="MO",
         postal="63103",
         lat=38.627972,
         lng=-90.201782,
@@ -13934,6 +13937,47 @@ _CACHED_GEOCODES: dict[str, Any] = {
         country="USA",
     ),
     "Madison Square Garden, New York, NY": MADISON_SQUARE_GARDEN,
+    "Hoffman Estates, Illinois": SportsballGeocodeTuple(
+        city="Hoffman Estates",
+        state="IL",
+        postal="",
+        lat=42.063889,
+        lng=-88.146944,
+        housenumber="",
+        country="USA",
+    ),
+    "Bojangles Coliseum, Charlotte, North Carolina": SportsballGeocodeTuple(
+        city="Charlotte",
+        state="NC",
+        postal="",
+        lat=35.205164,
+        lng=-80.795103,
+        housenumber="2700",
+        country="USA",
+    ),
+    "Rice Gymnasium, Houston, Texas": TUDOR_FIELDHOUSE,
+    "Alumni Memorial Fieldhouse, Philadelphia, Pennsylvania": HAGAN_ARENA,
+    "Colonial Center, Columbia, South Carolina": COLONIAL_LIFE_ARENA,
+    "F. Mitchell Johnson Center, Charleston, South Carolina": SportsballGeocodeTuple(
+        city="Charleston",
+        state="SC",
+        postal="",
+        lat=32.785278,
+        lng=-79.934167,
+        housenumber="",
+        country="USA",
+    ),
+    "Coors Events Center, Boulder, Colorado": COORS_EVENTS_CONFERENCE_CENTER,
+    "Target Center, Minneapolis, MN": TARGET_CENTER,
+    "Hammons Student Center, Springfield, Missouri": SportsballGeocodeTuple(
+        city="Springfield",
+        state="MO",
+        postal="",
+        lat=37.202222,
+        lng=-93.284444,
+        housenumber="",
+        country="USA",
+    ),
 }
 
 

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/nba/combined/nba_combined_league_model.py

@@ -889,6 +889,7 @@ NBA_VENUE_IDENTITY_MAP: dict[str, str] = {
     # NBACom
     "Paycom Center, Oklahoma City, OK": PAYCOM_CENTER,
     "Madison Square Garden, New York, NY": MADISON_SQUARE_GARDEN,
+    "Target Center, Minneapolis, MN": TARGET_CENTER,
 }
 NBA_PLAYER_IDENTITY_MAP: dict[str, str] = {}
 

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/nba/nbacom/nba_nbacom_player_model.py

@@ -41,4 +41,5 @@ def create_nba_nbacom_player_model(player_dict: dict[str, Any]) -> PlayerModel:
         bounces=None,
         goal_assists=None,
         percentage_played=None,
+        birth_date=None,
     )

sportsball-0.3.126/sportsball/data/news_model.py

@@ -0,0 +1,30 @@
+"""The prototype class for news."""
+
+import datetime
+from typing import Literal
+
+from pydantic import BaseModel, Field
+
+from .field_type import TYPE_KEY, FieldType
+
+NEWS_SUMMARY_COLUMN: Literal["summary"] = "summary"
+NEWS_TITLE_COLUMN: Literal["title"] = "title"
+NEWS_PUBLISHED_COLUMN: Literal["published"] = "published"
+NEWS_SOURCE_COLUMN: Literal["source"] = "source"
+
+
+class NewsModel(BaseModel):
+    """The serialisable news class."""
+
+    title: str = Field(
+        ..., json_schema_extra={TYPE_KEY: FieldType.TEXT}, alias=NEWS_TITLE_COLUMN
+    )
+    published: datetime.datetime = Field(..., alias=NEWS_PUBLISHED_COLUMN)
+    summary: str = Field(
+        ..., json_schema_extra={TYPE_KEY: FieldType.TEXT}, alias=NEWS_SUMMARY_COLUMN
+    )
+    source: str = Field(
+        ...,
+        json_schema_extra={TYPE_KEY: FieldType.CATEGORICAL},
+        alias=NEWS_SOURCE_COLUMN,
+    )

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/player_model.py

@@ -1,5 +1,6 @@
 """The prototype class for a player."""
 
+import datetime
 from typing import Literal
 
 from pydantic import BaseModel, Field
@@ -42,6 +43,7 @@ PLAYER_BOUNCES_COLUMN: Literal["bounces"] = "bounces"
 PLAYER_GOAL_ASSISTS_COLUMN: Literal["goal_assists"] = "goal_assists"
 PLAYER_PERCENTAGE_PLAYED_COLUMN: Literal["percentage_played"] = "percentage_played"
 PLAYER_NAME_COLUMN: Literal["name"] = "name"
+PLAYER_BIRTH_DATE_COLUMN: Literal["birth_date"] = "birth_date"
 
 
 class PlayerModel(BaseModel):
@@ -204,3 +206,4 @@ class PlayerModel(BaseModel):
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
         alias=PLAYER_PERCENTAGE_PLAYED_COLUMN,
     )
+    birth_date: datetime.date | None = Field(..., alias=PLAYER_BIRTH_DATE_COLUMN)

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/sportsreference/sportsreference_league_model.py

@@ -41,6 +41,8 @@ BAD_URLS = {
     "https://www.sports-reference.com/cbb/boxscores/2009-04-01-texas-el-paso.html",
     "https://www.sports-reference.com/cbb/boxscores/2009-03-15-florida-state.html",
     "https://www.sports-reference.com/cbb/boxscores/2009-03-15-purdue.html",
+    "https://www.sports-reference.com/cbb/boxscores/2008-11-19-alabama-am_w.html",
+    "https://www.sports-reference.com/cbb/boxscores/2008-04-04-tulsa.html",
 }
 
 

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/sportsreference/sportsreference_player_model.py

@@ -6,9 +6,11 @@ import http
 import logging
 from urllib.parse import unquote
 
+import extruct  # type: ignore
 import pytest_is_running
 import requests_cache
 from bs4 import BeautifulSoup
+from dateutil.parser import parse
 
 from ...cache import MEMORY
 from ...session import DEFAULT_TIMEOUT
@@ -52,7 +54,7 @@ def _create_sportsreference_player_model(
     assists: dict[str, int],
     turnovers: dict[str, int],
 ) -> PlayerModel | None:
-    """Create a player model from NCAAB sports reference."""
+    """Create a player model from sports reference."""
     player_url = _fix_url(player_url)
     response = session.get(player_url, timeout=DEFAULT_TIMEOUT)
     # Some players can't be accessed on sports reference
@@ -66,6 +68,12 @@ def _create_sportsreference_player_model(
         logging.warning("h1 is null for %s", player_url)
         return None
     name = h1.get_text().strip()
+    data = extruct.extract(response.text, base_url=response.url)
+    birth_date = None
+    for jsonld in data["json-ld"]:
+        if jsonld["@type"] != "Person":
+            continue
+        birth_date = parse(jsonld["birthDate"])
     return PlayerModel(
         identifier=name,
         jersey=None,
@@ -100,6 +108,7 @@ def _create_sportsreference_player_model(
         bounces=None,
         goal_assists=None,
         percentage_played=None,
+        birth_date=birth_date,
     )
 
 

{sportsball-0.3.124 → sportsball-0.3.126}/sportsball/data/team_model.py

@@ -47,6 +47,7 @@ TEAM_MARKS_INSIDE_COLUMN: Literal["marks_inside"] = "marks_inside"
 TEAM_ONE_PERCENTERS_COLUMN: Literal["one_percenters"] = "one_percenters"
 TEAM_BOUNCES_COLUMN: Literal["bounces"] = "bounces"
 TEAM_GOAL_ASSISTS_COLUMN: Literal["goal_assists"] = "goal_assists"
+TEAM_NEWS_COLUMN: Literal["news"] = "news"
 
 
 def _calculate_kicks(data: dict[str, Any]) -> int | None:
@@ -452,7 +453,7 @@ class TeamModel(BaseModel):
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
         alias=KICKS_COLUMN,
     )
-    news: list[NewsModel]
+    news: list[NewsModel] = Field(..., alias=TEAM_NEWS_COLUMN)
     social: list[SocialModel]
     field_goals: int | None = Field(
         default_factory=_calculate_field_goals,

{sportsball-0.3.124 → sportsball-0.3.126/sportsball.egg-info}/PKG-INFO

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