sportsball 0.3.43__tar.gz → 0.3.45__tar.gz

{sportsball-0.3.43/sportsball.egg-info → sportsball-0.3.45}/PKG-INFO

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

{sportsball-0.3.43 → sportsball-0.3.45}/setup.py

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

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.43"
+__VERSION__ = "0.3.45"

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/address_model.py

@@ -1,10 +1,15 @@
 """A class for holding address information."""
 
+from typing import Literal
+
 from pydantic import BaseModel, Field
 
 from .field_type import TYPE_KEY, FieldType
 from .weather_model import WeatherModel
 
+ADDRESS_LATITUDE_COLUMN: Literal["latitude"] = "latitude"
+ADDRESS_LONGITUDE_COLUMN: Literal["longitude"] = "longitude"
+
 
 class AddressModel(BaseModel):
     """The class for representing an address."""
@@ -14,8 +19,8 @@ class AddressModel(BaseModel):
     zipcode: str | None = Field(
         ..., json_schema_extra={TYPE_KEY: FieldType.CATEGORICAL}
     )
-    latitude: float | None
-    longitude: float | None
+    latitude: float | None = Field(..., alias=ADDRESS_LATITUDE_COLUMN)
+    longitude: float | None = Field(..., alias=ADDRESS_LONGITUDE_COLUMN)
     housenumber: str | None = Field(
         ..., json_schema_extra={TYPE_KEY: FieldType.CATEGORICAL}
     )

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/afl/afl/afl_afl_game_model.py

@@ -13,7 +13,7 @@ from .afl_afl_venue_model import create_afl_afl_venue_model
 
 def create_afl_afl_game_model(
     team_names: list[str],
-    players: list[list[tuple[str, str]]],
+    players: list[list[tuple[str, str, str, str]]],
     dt: datetime.datetime,
     venue_name: str,
     session: requests_cache.CachedSession,

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -44,15 +44,17 @@ class AFLAFLLeagueModel(LeagueModel):
                     "span", {"class": re.compile(".*team-lineups__team-name.*")}
                 ):
                     team_names.append(span.get_text().strip())
-                teams_players: list[list[tuple[str, str]]] = []
+                teams_players: list[list[tuple[str, str, str, str]]] = []
                 for div_team_players in div.find_all(
                     "div", {"class": re.compile(".*team-lineups__positions-players.*")}
                 ):
-                    team_players: list[tuple[str, str]] = []
+                    team_players: list[tuple[str, str, str, str]] = []
                     for a in div_team_players.find_all(
                         "a", {"class": re.compile(".*js-player-profile-link.*")}
                     ):
                         player_id = "afl:" + a.get("data-player-id")
+                        first_name = a.get("data-first-name")
+                        second_name = a.get("data-surname")
                         player_number = None
                         for span_player_number in a.find_all(
                             "span",
@@ -66,7 +68,9 @@ class AFLAFLLeagueModel(LeagueModel):
                             )
                         if player_number is None:
                             raise ValueError("player_number is null")
-                        team_players.append((player_id, player_number))
+                        team_players.append(
+                            (player_id, player_number, first_name, second_name)
+                        )
                     teams_players.append(team_players)
                 dt = None
                 for time in div.find_all(

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/afl/afl/afl_afl_player_model.py

@@ -6,6 +6,7 @@ from ...player_model import PlayerModel
 def create_afl_afl_player_model(
     identifier: str,
     player_number: str,
+    name: str,
 ) -> PlayerModel:
     """Create a player model from AFL AFL."""
     return PlayerModel(
@@ -19,4 +20,5 @@ def create_afl_afl_player_model(
         offensive_rebounds=None,
         assists=None,
         turnovers=None,
+        name=name,
     )

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/afl/afl/afl_afl_team_model.py

@@ -13,14 +13,16 @@ from .afl_afl_player_model import create_afl_afl_player_model
 
 def create_afl_afl_team_model(
     team_name: str,
-    players: list[tuple[str, str]],
+    players: list[tuple[str, str, str, str]],
     session: requests_cache.CachedSession,
     dt: datetime.datetime,
 ) -> TeamModel:
     """Create a team model from AFL AFL."""
     player_models = [
-        create_afl_afl_player_model(identifier, player_number)
-        for identifier, player_number in players
+        create_afl_afl_player_model(
+            identifier, player_number, " ".join([first_name, second_name])
+        )
+        for identifier, player_number, first_name, second_name in players
     ]
     return TeamModel(
         identifier=team_name,

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/afl/afltables/afl_afltables_game_model.py

@@ -152,7 +152,7 @@ def _create_afl_afltables_game_model(
 
     def _find_teams_metadata(
         soup: BeautifulSoup, team_infos: list[tuple[str, str, int]]
-    ) -> list[tuple[str, list[tuple[str, str, int | None]], int]]:
+    ) -> list[tuple[str, list[tuple[str, str, int | None, str]], int]]:
         def _is_correct_table(table: Tag, name: str) -> bool:
             for th in table.find_all("th"):
                 header_text = th.get_text().strip()
@@ -160,8 +160,8 @@ def _create_afl_afltables_game_model(
                     return True
             return False
 
-        def _find_players(table: Tag) -> list[tuple[str, str, int | None]]:
-            players: list[tuple[str, str, int | None]] = []
+        def _find_players(table: Tag) -> list[tuple[str, str, int | None, str]]:
+            players: list[tuple[str, str, int | None, str]] = []
             for tr in table.find_all("tr"):
                 player_row = False
                 player_url = None
@@ -172,10 +172,18 @@ def _create_afl_afltables_game_model(
                         player_row = True
                 if player_row and player_url is not None:
                     jersey = None
+                    name = None
                     kicks = None
                     for count, td in enumerate(tr.find_all("td")):
                         if count == 0:
                             jersey = td.get_text().strip()
+                        elif count == 1:
+                            name = " ".join(
+                                [
+                                    x.strip()
+                                    for x in reversed(td.get_text().strip().split(","))
+                                ]
+                            )
                         elif count == 2:
                             kicks_text = td.get_text().strip()
                             if kicks_text:
@@ -183,8 +191,10 @@ def _create_afl_afltables_game_model(
 
                     if jersey is None:
                         raise ValueError("jersey is null.")
+                    if name is None:
+                        raise ValueError("name is null")
 
-                    players.append((player_url, jersey, kicks))
+                    players.append((player_url, jersey, kicks, name))
             return players
 
         team_metadata = []

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/afl/afltables/afl_afltables_player_model.py

@@ -1,6 +1,6 @@
 """AFL AFLTables player model."""
 
-# pylint: disable=line-too-long,duplicate-code
+# pylint: disable=line-too-long,duplicate-code,too-many-arguments
 import datetime
 import os
 from urllib.parse import urlparse
@@ -13,7 +13,7 @@ from ...player_model import PlayerModel
 
 
 def _create_afl_afltables_player_model(
-    player_url: str, jersey: str, kicks: int | None
+    player_url: str, jersey: str, kicks: int | None, name: str
 ) -> PlayerModel:
     o = urlparse(player_url)
     last_component = o.path.split("/")[-1]
@@ -30,14 +30,15 @@ def _create_afl_afltables_player_model(
         offensive_rebounds=None,
         assists=None,
         turnovers=None,
+        name=name,
     )
 
 
 @MEMORY.cache
 def _cached_create_afl_afltables_player_model(
-    player_url: str, jersey: str, kicks: int | None
+    player_url: str, jersey: str, kicks: int | None, name: str
 ) -> PlayerModel:
-    return _create_afl_afltables_player_model(player_url, jersey, kicks)
+    return _create_afl_afltables_player_model(player_url, jersey, kicks, name)
 
 
 def create_afl_afltables_player_model(
@@ -46,12 +47,18 @@ def create_afl_afltables_player_model(
     kicks: int | None,
     dt: datetime.datetime,
     session: requests_cache.CachedSession,
+    name: str,
 ) -> PlayerModel:
     """Create a player model from AFL Tables."""
     if (
         not pytest_is_running.is_running()
         and dt < datetime.datetime.now() - datetime.timedelta(days=7)
     ):
-        return _cached_create_afl_afltables_player_model(player_url, jersey, kicks)  # pyright: ignore
+        return _cached_create_afl_afltables_player_model(
+            player_url,
+            jersey,
+            kicks,
+            name,  # pyright: ignore
+        )
     with session.cache_disabled():
-        return _create_afl_afltables_player_model(player_url, jersey, kicks)
+        return _create_afl_afltables_player_model(player_url, jersey, kicks, name)

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/afl/afltables/afl_afltables_team_model.py

@@ -44,7 +44,7 @@ _TEAM_NAME_MAP = {
 
 def _create_afl_afltables_team_model(
     team_url: str,
-    players: list[tuple[str, str, int | None]],
+    players: list[tuple[str, str, int | None, str]],
     points: float,
     session: requests_cache.CachedSession,
     last_ladder_ranks: dict[str, int] | None,
@@ -71,8 +71,10 @@ def _create_afl_afltables_team_model(
         identifier=identifier,
         name=name,
         players=[  # pyright: ignore
-            create_afl_afltables_player_model(player_url, jersey, kicks, dt, session)
-            for player_url, jersey, kicks in players
+            create_afl_afltables_player_model(
+                player_url, jersey, kicks, dt, session, name
+            )
+            for player_url, jersey, kicks, name in players
         ],
         odds=[],
         points=points,
@@ -87,7 +89,7 @@ def _create_afl_afltables_team_model(
 @MEMORY.cache(ignore=["session"])
 def _cached_create_afl_afltables_team_model(
     team_url: str,
-    players: list[tuple[str, str, int | None]],
+    players: list[tuple[str, str, int | None, str]],
     points: float,
     session: requests_cache.CachedSession,
     last_ladder_ranks: dict[str, int] | None,
@@ -101,7 +103,7 @@ def _cached_create_afl_afltables_team_model(
 
 def create_afl_afltables_team_model(
     team_url: str,
-    players: list[tuple[str, str, int | None]],
+    players: list[tuple[str, str, int | None, str]],
     points: float,
     session: requests_cache.CachedSession,
     last_ladder_ranks: dict[str, int] | None,

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/afl/combined/afl_combined_league_model.py

@@ -242,7 +242,18 @@ AFL_VENUE_IDENTITY_MAP = {
     "Ondrej Nepela Arena": TIPOS_ARENA,
     "Barossa Park": BAROSSA_PARK,
 }
-AFL_TEAM_IDENTITY_MAP = {}
+RYAN_LESTER = "afl:CD_I291548"
+JACK_PAYNE = "afl:CD_I1002347"
+DAYNE_ZORKO = "afl:CD_I261224"
+JAMES_WORPEL = "James_Worpel"
+JOSH_WEDDLE = "Josh_Weddle"
+AFL_PLAYER_IDENTITY_MAP = {
+    "afl:CD_I291548": RYAN_LESTER,
+    "afl:CD_I1002347": JACK_PAYNE,
+    "afl:CD_I261224": DAYNE_ZORKO,
+    "James_Worpel": JAMES_WORPEL,
+    "Josh_Weddle": JOSH_WEDDLE,
+}
 
 
 class AFLCombinedLeagueModel(CombinedLeagueModel):
@@ -271,4 +282,4 @@ class AFLCombinedLeagueModel(CombinedLeagueModel):
 
     @classmethod
     def player_identity_map(cls) -> dict[str, str]:
-        return AFL_TEAM_IDENTITY_MAP
+        return AFL_PLAYER_IDENTITY_MAP

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/combined/combined_game_model.py

@@ -1,6 +1,6 @@
 """Combined game model."""
 
-# pylint: disable=too-many-locals,line-too-long
+# pylint: disable=too-many-locals,line-too-long,too-many-arguments
 import logging
 
 import requests
@@ -35,6 +35,7 @@ def _team_models(
     game_models: list[GameModel],
     team_identity_map: dict[str, str],
     player_identity_map: dict[str, str],
+    names: dict[str, str],
 ) -> list[TeamModel]:
     team_models: dict[str, list[TeamModel]] = {}
     for game_model in game_models:
@@ -51,7 +52,7 @@ def _team_models(
                     team_model
                 ]
     return [
-        create_combined_team_model(v, k, player_identity_map)  # pyright: ignore
+        create_combined_team_model(v, k, player_identity_map, names)  # pyright: ignore
         for k, v in team_models.items()
     ]
 
@@ -62,10 +63,13 @@ def create_combined_game_model(
     team_identity_map: dict[str, str],
     player_identity_map: dict[str, str],
     session: requests.Session,
+    names: dict[str, str],
 ) -> GameModel:
     """Create a game model by combining many game models."""
     venue_models, full_venue_identity = _venue_models(game_models, venue_identity_map)
-    full_team_models = _team_models(game_models, team_identity_map, player_identity_map)
+    full_team_models = _team_models(
+        game_models, team_identity_map, player_identity_map, names
+    )
     attendance = None
     end_dt = None
     year = None

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/combined/combined_league_model.py

@@ -87,6 +87,7 @@ class CombinedLeagueModel(LeagueModel):
                 game_components = sorted(game_components)
                 key = "-".join(game_components)
                 games[key] = games.get(key, []) + [game_model]
+        names: dict[str, str] = {}
         for game_models in games.values():
             yield create_combined_game_model(  # type: ignore
                 game_models,
@@ -94,4 +95,5 @@ class CombinedLeagueModel(LeagueModel):
                 team_identity_map,
                 self.player_identity_map(),
                 self.session,
+                names,
             )

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/combined/combined_player_model.py

@@ -17,6 +17,7 @@ def create_combined_player_model(
     offensive_rebounds = None
     assists = None
     turnovers = None
+    name = None
     for player_model in player_models:
         player_model_jersey = player_model.jersey
         if player_model_jersey is not None:
@@ -45,6 +46,11 @@ def create_combined_player_model(
         player_model_turnovers = player_model.turnovers
         if player_model_turnovers is not None:
             turnovers = player_model_turnovers
+        player_model_name = player_model.name
+        if player_model_name is not None:
+            name = player_model_name
+    if name is None:
+        raise ValueError("name is null.")
     return PlayerModel(
         identifier=identifier,
         jersey=jersey,
@@ -56,4 +62,5 @@ def create_combined_player_model(
         offensive_rebounds=offensive_rebounds,
         assists=assists,
         turnovers=turnovers,
+        name=name,
     )

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/combined/combined_team_model.py

@@ -1,7 +1,8 @@
 """Combined team model."""
 
 # pylint: disable=too-many-locals
-import logging
+import re
+import unicodedata
 
 from ..news_model import NewsModel
 from ..odds_model import OddsModel
@@ -10,11 +11,14 @@ from ..social_model import SocialModel
 from ..team_model import TeamModel
 from .combined_player_model import create_combined_player_model
 
+REGEX = re.compile("[^a-zA-Z]")
+
 
 def create_combined_team_model(
     team_models: list[TeamModel],
     identifier: str,
     player_identity_map: dict[str, str],
+    names: dict[str, str],
 ) -> TeamModel:
     """Create a team model by combining many team models."""
     location = None
@@ -31,16 +35,16 @@ def create_combined_team_model(
             location = team_model_location
         for player_model in team_model.players:
             player_id = player_model.identifier
-            if player_model.identifier not in player_identity_map:
-                logging.warning(
-                    "Failed to find %s player identifier.", player_model.identifier
-                )
-            else:
+            player_name_key = REGEX.sub(
+                "", unicodedata.normalize("NFC", player_model.name).lower()
+            )
+            if player_model.identifier in player_identity_map:
                 player_id = player_identity_map[player_id]
-            key = player_model.jersey
-            if key is None:
-                key = player_id
-            players[key] = players.get(key, []) + [player_model]
+            elif player_name_key in names:
+                player_id = names[player_name_key]
+            else:
+                names[player_name_key] = player_id
+            players[player_id] = players.get(player_id, []) + [player_model]
         for odds_model in team_model.odds:
             key = f"{odds_model.bookie.identifier}-{odds_model.odds}"
             odds[key] = odds.get(key, []) + [odds_model]

{sportsball-0.3.43 → sportsball-0.3.45}/sportsball/data/espn/espn_player_model.py

@@ -29,6 +29,10 @@ def _create_espn_player_model(
                         fumbles = stat["value"]
                     if stat["name"] == "fumblesLost":
                         fumbles_lost = stat["value"]
+    athlete_response = session.get(player["athlete"]["$ref"])
+    athlete_response.raise_for_status()
+    athlete_dict = athlete_response.json()
+    name = athlete_dict["fullName"]
     return PlayerModel(
         identifier=identifier,
         jersey=jersey,
@@ -40,6 +44,7 @@ def _create_espn_player_model(
         offensive_rebounds=None,
         assists=None,
         turnovers=None,
+        name=name,
     )