sportsball 0.3.84__tar.gz → 0.3.86__tar.gz

{sportsball-0.3.84/sportsball.egg-info → sportsball-0.3.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.84
+Version: 0.3.86
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield
@@ -193,6 +193,29 @@ A representation of a player within a team within a game.
 * **offensive_rebounds**: The number of rebounds during offense by the player made in the game.
 * **assists**: The number of times the player made a pass that resulted in a field goal in the game.
 * **turnovers**: The number of times a player loses possession of the ball in the game.
+* **name**: The name of the player.
+* **marks**: The number of marks the player performed in the game.
+* **handballs**: The number of handballs the player performed in the game.
+* **disposals**: The number of disposals the player performed in the game.
+* **goals**: The number of goals scored by the player in the game.
+* **behinds**: The number of behinds scored by the player in the game.
+* **hit_outs**: The number of hit outs scored by the player in the game.
+* **tackles**: The number of tackles performed by the player in the game.
+* **rebounds**: The number of rebounds performed by the player in the game.
+* **insides**: The number of insides performed by the player in the game.
+* **clearances**: The number of clearances performed by the player in the game.
+* **clangers**: The number of clangers performed by the player in the game.
+* **free_kicks_for**: The number of free kicks given to the player in the game.
+* **free_kicks_against**: The number of free kicks given against an action taken by the player in the game.
+* **brownlow_votes**: The number of votes for the brownlow medal the player has in the current season.
+* **contested_possessions**: The number of possessions the player had in the game that were contested.
+* **uncontested_possessions**: The number of posessions the player had in the game that were uncontested.
+* **contested_marks**: The number of marks the player had in the game that were contested.
+* **marks_inside**: The number of marks the player had in the game inside the 50.
+* **one_percenters:** The number of times the player spoils, knock-ons, smothers or shepherds the ball during the game.
+* **bounces**: The number of bounces the player makes in the game.
+* **goal_assists**: The number of assists on goal the player had in the game.
+* **percentage_played**: The percentage of the game the player was on the field.
 
 #### Odds
 

{sportsball-0.3.84 → sportsball-0.3.86}/README.md

@@ -134,6 +134,29 @@ A representation of a player within a team within a game.
 * **offensive_rebounds**: The number of rebounds during offense by the player made in the game.
 * **assists**: The number of times the player made a pass that resulted in a field goal in the game.
 * **turnovers**: The number of times a player loses possession of the ball in the game.
+* **name**: The name of the player.
+* **marks**: The number of marks the player performed in the game.
+* **handballs**: The number of handballs the player performed in the game.
+* **disposals**: The number of disposals the player performed in the game.
+* **goals**: The number of goals scored by the player in the game.
+* **behinds**: The number of behinds scored by the player in the game.
+* **hit_outs**: The number of hit outs scored by the player in the game.
+* **tackles**: The number of tackles performed by the player in the game.
+* **rebounds**: The number of rebounds performed by the player in the game.
+* **insides**: The number of insides performed by the player in the game.
+* **clearances**: The number of clearances performed by the player in the game.
+* **clangers**: The number of clangers performed by the player in the game.
+* **free_kicks_for**: The number of free kicks given to the player in the game.
+* **free_kicks_against**: The number of free kicks given against an action taken by the player in the game.
+* **brownlow_votes**: The number of votes for the brownlow medal the player has in the current season.
+* **contested_possessions**: The number of possessions the player had in the game that were contested.
+* **uncontested_possessions**: The number of posessions the player had in the game that were uncontested.
+* **contested_marks**: The number of marks the player had in the game that were contested.
+* **marks_inside**: The number of marks the player had in the game inside the 50.
+* **one_percenters:** The number of times the player spoils, knock-ons, smothers or shepherds the ball during the game.
+* **bounces**: The number of bounces the player makes in the game.
+* **goal_assists**: The number of assists on goal the player had in the game.
+* **percentage_played**: The percentage of the game the player was on the field.
 
 #### Odds
 

{sportsball-0.3.84 → sportsball-0.3.86}/setup.py

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

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/__init__.py

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

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -31,10 +31,16 @@ def _parse_game_info(
         for div_positions_row in div.find_all(
             "div", {"class": re.compile(".*team-lineups__positions-row.*")}
         ):
-            row_players: list[list[tuple[str, str, str, str]]] = []
-            for div_team_players in div_positions_row.find_all(
-                "div",
-                {"class": re.compile(".*team-lineups__positions-players.*")},
+            row_players: list[list[tuple[str, str, str, str]]] = [[], []]
+            for count, div_team_players in enumerate(
+                div_positions_row.find_all(
+                    "div",
+                    {
+                        "class": re.compile(
+                            ".*team-lineups__positions-players-container.*"
+                        )
+                    },
+                )
             ):
                 team_players: list[tuple[str, str, str, str]] = []
                 for a in div_team_players.find_all(
@@ -59,17 +65,9 @@ def _parse_game_info(
                     team_players.append(
                         (player_id, player_number, first_name, second_name)
                     )
-                row_players.append(team_players)
-                if len(row_players) >= 2:
-                    break
-                for count, row_players_list in enumerate(row_players):
-                    try:
-                        teams_players[count].extend(row_players_list)
-                    except IndexError as exc:
-                        # logging.error(html)
-                        logging.error(len(team_players))
-                        logging.error(count)
-                        raise exc
+                row_players[count].extend(team_players)
+            for count, row_players_list in enumerate(row_players):
+                teams_players[count].extend(row_players_list)
         dt = None
         for time in div.find_all(
             "time", {"class": re.compile(".*match-list-alt__header-time.*")}

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/afl/combined/afl_combined_league_model.py

@@ -246,18 +246,6 @@ AFL_VENUE_IDENTITY_MAP = {
     "Barossa Park": BAROSSA_PARK,
     "Ninja Stadium": BELLERIVE_OVAL,
 }
-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):
@@ -283,7 +271,3 @@ class AFLCombinedLeagueModel(CombinedLeagueModel):
     @classmethod
     def venue_identity_map(cls) -> dict[str, str]:
         return AFL_VENUE_IDENTITY_MAP
-
-    @classmethod
-    def player_identity_map(cls) -> dict[str, str]:
-        return AFL_PLAYER_IDENTITY_MAP

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/combined/combined_league_model.py

@@ -47,9 +47,7 @@ class CombinedLeagueModel(LeagueModel):
     @classmethod
     def player_identity_map(cls) -> dict[str, str]:
         """A map to resolve the different player identities to a consistent identity."""
-        raise NotImplementedError(
-            "player_identity_map not implemented on CombinedLeagueModel parent class."
-        )
+        return {}
 
     @property
     def games(self) -> Iterator[GameModel]:

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/combined/combined_team_model.py

@@ -1,6 +1,7 @@
 """Combined team model."""
 
 # pylint: disable=too-many-locals
+import logging
 import re
 import unicodedata
 
@@ -14,6 +15,13 @@ from .combined_player_model import create_combined_player_model
 REGEX = re.compile("[^a-zA-Z]")
 
 
+def _normalise_player_name(name: str) -> str:
+    # Handle "Surname, Firstname"
+    if "," in name:
+        name = " ".join(reversed([x.strip() for x in name.split(",")]))
+    return REGEX.sub("", unicodedata.normalize("NFC", name).lower().strip())
+
+
 def create_combined_team_model(
     team_models: list[TeamModel],
     identifier: str,
@@ -35,9 +43,7 @@ def create_combined_team_model(
             location = team_model_location
         for player_model in team_model.players:
             player_id = player_model.identifier
-            player_name_key = REGEX.sub(
-                "", unicodedata.normalize("NFC", player_model.name).lower()
-            )
+            player_name_key = _normalise_player_name(player_model.name)
             if player_model.identifier in player_identity_map:
                 player_id = player_identity_map[player_id]
             elif player_name_key in names:
@@ -78,7 +84,7 @@ def create_combined_team_model(
         name=team_models[0].name,
         location=location,
         players=[  # pyright: ignore
-            create_combined_player_model(x, x[0].identifier) for x in players.values()
+            create_combined_player_model(v, k) for k, v in players.items()
         ],
         odds=[x[0] for x in odds.values()],
         points=points,

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/game_model.py

@@ -52,7 +52,11 @@ class GameModel(BaseModel):
     end_dt: datetime.datetime | None = Field(
         ..., json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD}, alias=END_DT_COLUMN
     )
-    attendance: int | None = Field(..., alias=GAME_ATTENDANCE_COLUMN)
+    attendance: int | None = Field(
+        ...,
+        json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
+        alias=GAME_ATTENDANCE_COLUMN,
+    )
     league: str = Field(..., alias=LEAGUE_COLUMN)
     year: int | None
     season_type: SeasonType | None

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/google/google_address_model.py

@@ -1740,7 +1740,7 @@ DUNKIN_DONUTS_CENTER = SportsballGeocodeTuple(
 )
 CHI_HEALTH_CENTER = SportsballGeocodeTuple(
     city="Omaha",
-    state="NB",
+    state="NE",
     postal="",
     lat=41.263,
     lng=-95.928,
@@ -4599,7 +4599,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Pinnacle Bank Arena, Lincoln, Nebraska": SportsballGeocodeTuple(
         city="Lincoln",
-        state="NB",
+        state="NE",
         postal="",
         lat=40.817778,
         lng=-96.713333,
@@ -5947,7 +5947,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Baxter Arena, Omaha, Nebraska": SportsballGeocodeTuple(
         city="Omaha",
-        state="NB",
+        state="NE",
         postal="",
         lat=41.236,
         lng=-96.013,
@@ -11062,7 +11062,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Omaha, Nebraska": SportsballGeocodeTuple(
         city="Omaha",
-        state="NB",
+        state="NE",
         postal="",
         lat=41.258611,
         lng=-95.9375,
@@ -11352,7 +11352,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Lincoln, Nebraska": SportsballGeocodeTuple(
         city="Lincoln",
-        state="NB",
+        state="NE",
         postal="",
         lat=40.809167,
         lng=-96.678056,
@@ -12190,7 +12190,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Ralston, Nebraska": SportsballGeocodeTuple(
         city="Ralston",
-        state="NB",
+        state="NE",
         postal="",
         lat=41.200556,
         lng=-96.035556,
@@ -12862,7 +12862,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Ralston Arena, Ralston, Nebraska": SportsballGeocodeTuple(
         city="Ralston",
-        state="NB",
+        state="NE",
         postal="",
         lat=41.206944,
         lng=-96.026944,
@@ -13028,7 +13028,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "D.J. Sokol Arena, Omaha, Nebraska": SportsballGeocodeTuple(
         city="Omaha",
-        state="NB",
+        state="NE",
         postal="",
         lat=41.266146,
         lng=-95.940471,
@@ -13261,7 +13261,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
     ),
     "Bob Devaney Sports Center, Lincoln, Nebraska": SportsballGeocodeTuple(
         city="Lincoln",
-        state="NB",
+        state="NE",
         postal="",
         lat=40.830207,
         lng=-96.697644,
@@ -13297,6 +13297,70 @@ _CACHED_GEOCODES: dict[str, Any] = {
         country="USA",
     ),
     "Reliant Stadium, Houston, Texas": NRG_STADIUM,
+    "South Padre Island Convention Centre, South Padre Island, Texas": SportsballGeocodeTuple(
+        city="South Padre Island",
+        state="TX",
+        postal="78597",
+        lat=26.140556,
+        lng=-97.175,
+        housenumber="7355",
+        country="USA",
+    ),
+    "Moon Palace Resort, Cancun": SportsballGeocodeTuple(
+        city="Cancun",
+        state="QR",
+        postal="77500",
+        lat=20.9886511,
+        lng=-86.826701,
+        housenumber="340",
+        country="Mexico",
+    ),
+    "Meeks Family Fieldhouse at Carson Center, Evansville, Indiana": SportsballGeocodeTuple(
+        city="Evansville",
+        state="IN",
+        postal="",
+        lat=37.9963496,
+        lng=-87.6993641,
+        housenumber="",
+        country="USA",
+    ),
+    "José Miguel Agrelot Coliseum, San Juan": SportsballGeocodeTuple(
+        city="San Juan",
+        state="PR",
+        postal="",
+        lat=18.427717,
+        lng=-66.061392,
+        housenumber="500",
+        country="USA",
+    ),
+    "USB Sports Complex, Stony Brook, New York": SportsballGeocodeTuple(
+        city="Stony Brook",
+        state="NY",
+        postal="11790",
+        lat=40.917417,
+        lng=-73.124722,
+        housenumber="100",
+        country="USA",
+    ),
+    "L. A. Sports Arena, Los Angeles, California": LOS_ANGELES_MEMORIAL_COLESIUM,
+    "Kimbel Arena, Conway, South Carolina": SportsballGeocodeTuple(
+        city="Conway",
+        state="SC",
+        postal="",
+        lat=33.79382,
+        lng=-79.013243,
+        housenumber="",
+        country="USA",
+    ),
+    "Sapp Fieldhouse, Ralston, Nebraska": SportsballGeocodeTuple(
+        city="Ralston",
+        state="NE",
+        postal="68132",
+        lat=41.2574,
+        lng=-96.00922,
+        housenumber="6311",
+        country="USA",
+    ),
 }
 
 

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/nba/combined/nba_combined_league_model.py

@@ -883,6 +883,7 @@ NBA_VENUE_IDENTITY_MAP: dict[str, str] = {
     "19331": CAPITAL_ONE_ARENA,
     "24838": SPECTRUM_CENTER,
     "28619": KASEYA_CENTER,
+    "24727": FEDEX_FORUM,
 }
 NBA_PLAYER_IDENTITY_MAP: dict[str, str] = {}
 

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/player_model.py

@@ -41,6 +41,7 @@ PLAYER_ONE_PERCENTERS_COLUMN: Literal["one_percenters"] = "one_percenters"
 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"
 
 
 class PlayerModel(BaseModel):
@@ -92,7 +93,7 @@ class PlayerModel(BaseModel):
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
         alias=TURNOVERS_COLUMN,
     )
-    name: str
+    name: str = Field(..., alias=PLAYER_NAME_COLUMN)
     marks: int | None = Field(
         ...,
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/sportsreference/sportsreference_game_model.py

@@ -399,6 +399,9 @@ def _create_sportsreference_game_model(
             assists,
             turnovers,
         )
+    for team in teams:
+        if team.name == "File Not Found":
+            raise ValueError("team name is File Not Found (invalid)")
 
     season_type = SeasonType.REGULAR
     for h2 in soup.find_all("h2"):

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball/data/sportsreference/sportsreference_team_model.py

@@ -40,6 +40,7 @@ _NON_WAYBACK_URLS: set[str] = {
 }
 _BAD_TEAM_URLS = {
     "https://www.sports-reference.com/cbb/schools/mid-atlantic-christian/2016.html",
+    "https://www.sports-reference.com/cbb/schools/claflin/2013.html",
 }
 
 

{sportsball-0.3.84 → sportsball-0.3.86/sportsball.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.84
+Version: 0.3.86
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield
@@ -193,6 +193,29 @@ A representation of a player within a team within a game.
 * **offensive_rebounds**: The number of rebounds during offense by the player made in the game.
 * **assists**: The number of times the player made a pass that resulted in a field goal in the game.
 * **turnovers**: The number of times a player loses possession of the ball in the game.
+* **name**: The name of the player.
+* **marks**: The number of marks the player performed in the game.
+* **handballs**: The number of handballs the player performed in the game.
+* **disposals**: The number of disposals the player performed in the game.
+* **goals**: The number of goals scored by the player in the game.
+* **behinds**: The number of behinds scored by the player in the game.
+* **hit_outs**: The number of hit outs scored by the player in the game.
+* **tackles**: The number of tackles performed by the player in the game.
+* **rebounds**: The number of rebounds performed by the player in the game.
+* **insides**: The number of insides performed by the player in the game.
+* **clearances**: The number of clearances performed by the player in the game.
+* **clangers**: The number of clangers performed by the player in the game.
+* **free_kicks_for**: The number of free kicks given to the player in the game.
+* **free_kicks_against**: The number of free kicks given against an action taken by the player in the game.
+* **brownlow_votes**: The number of votes for the brownlow medal the player has in the current season.
+* **contested_possessions**: The number of possessions the player had in the game that were contested.
+* **uncontested_possessions**: The number of posessions the player had in the game that were uncontested.
+* **contested_marks**: The number of marks the player had in the game that were contested.
+* **marks_inside**: The number of marks the player had in the game inside the 50.
+* **one_percenters:** The number of times the player spoils, knock-ons, smothers or shepherds the ball during the game.
+* **bounces**: The number of bounces the player makes in the game.
+* **goal_assists**: The number of assists on goal the player had in the game.
+* **percentage_played**: The percentage of the game the player was on the field.
 
 #### Odds
 

{sportsball-0.3.84 → sportsball-0.3.86}/sportsball.egg-info/SOURCES.txt

@@ -176,6 +176,7 @@ tests/data/aussportsbetting/aussportsbetting_game_model_test.py
 tests/data/combined/__init__.py
 tests/data/combined/combined_game_model_test.py
 tests/data/combined/combined_player_model_test.py
+tests/data/combined/combined_team_model_test.py
 tests/data/espn/__init__.py
 tests/data/espn/espn_game_model_test.py
 tests/data/espn/espn_player_model_test.py

{sportsball-0.3.84 → sportsball-0.3.86}/tests/data/afl/afl/afl_afl_league_model_test.py

@@ -15,7 +15,7 @@ class TestAFLAFLLeagueModel(unittest.TestCase):
 
     def test_parse_game_info(self):
         with open(os.path.join(self.dir, "team-lineups.html")) as handle:
-            list(_parse_game_info(handle.read(), self._session, [
+            game_models = list(_parse_game_info(handle.read(), self._session, [
                 "Melbourne",
                 "Richmond",
                 "Collingwood",
@@ -35,3 +35,7 @@ class TestAFLAFLLeagueModel(unittest.TestCase):
                 "Hawthorn",
                 "West Coast Eagles",
             ]))
+            first_game = game_models[0]
+            self.assertEqual(len(first_game.teams), 2)
+            for team in first_game.teams:
+                self.assertEqual(len(team.players), 22)