sportsball 0.3.85__tar.gz → 0.3.86__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.85
+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.85 → 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.85 → sportsball-0.3.86}/setup.py

@@ -26,7 +26,7 @@ def install_requires() -> typing.List[str]:
 
 setup(
     name='sportsball',
-    version='0.3.85',
+    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.85 → sportsball-0.3.86}/sportsball/__init__.py

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

{sportsball-0.3.85 → 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.85 → 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.85 → 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
 
@@ -18,7 +19,7 @@ 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())
+    return REGEX.sub("", unicodedata.normalize("NFC", name).lower().strip())
 
 
 def create_combined_team_model(
@@ -83,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.85 → 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.85 → 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,
@@ -13333,6 +13333,34 @@ _CACHED_GEOCODES: dict[str, Any] = {
         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.85 → 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.85 → 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.85 → sportsball-0.3.86/sportsball.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.85
+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.85 → 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.86/tests/data/combined/combined_team_model_test.py

@@ -0,0 +1,215 @@
+"""Tests for the combined team model class."""
+import datetime
+import os
+import unittest
+
+import requests_mock
+import requests_cache
+from sportsball.data.combined.combined_team_model import create_combined_team_model
+from sportsball.data.team_model import TeamModel
+from sportsball.data.player_model import PlayerModel
+
+
+class TestCombinedTeamModel(unittest.TestCase):
+
+    def setUp(self):
+        self._session = requests_cache.CachedSession(backend="memory")
+        self.dir = os.path.dirname(__file__)
+
+    def test_names_resolve(self):
+        with requests_mock.Mocker() as m:
+            names = {}
+            player_models = [PlayerModel(
+                identifier="1",
+                jersey=None,
+                kicks=None,
+                fumbles=None,
+                fumbles_lost=None,
+                field_goals=None,
+                field_goals_attempted=None,
+                offensive_rebounds=None,
+                assists=None,
+                turnovers=None,
+                name="Johnny Johnson",
+                marks=None,
+                handballs=None,
+                disposals=None,
+                goals=None,
+                behinds=None,
+                hit_outs=None,
+                tackles=None,
+                rebounds=None,
+                insides=None,
+                clearances=None,
+                clangers=None,
+                free_kicks_for=None,
+                free_kicks_against=None,
+                brownlow_votes=None,
+                contested_possessions=None,
+                uncontested_possessions=None,
+                contested_marks=None,
+                marks_inside=None,
+                one_percenters=None,
+                bounces=None,
+                goal_assists=None,
+                percentage_played=None,
+            )]
+            team_models = [TeamModel(
+                identifier="a",
+                name="Team A",
+                location=None,
+                players=player_models,
+                odds=[],
+                points=None,
+                ladder_rank=None,
+                news=[],
+                social=[],
+            )]
+            team_model = create_combined_team_model(team_models=team_models, identifier="a", player_identity_map={}, names=names)
+            player_models_2 = [PlayerModel(
+                identifier="1a",
+                jersey=None,
+                kicks=None,
+                fumbles=None,
+                fumbles_lost=None,
+                field_goals=None,
+                field_goals_attempted=None,
+                offensive_rebounds=None,
+                assists=None,
+                turnovers=None,
+                name="Johnny Johnson",
+                marks=None,
+                handballs=None,
+                disposals=None,
+                goals=None,
+                behinds=None,
+                hit_outs=None,
+                tackles=None,
+                rebounds=None,
+                insides=None,
+                clearances=None,
+                clangers=None,
+                free_kicks_for=None,
+                free_kicks_against=None,
+                brownlow_votes=None,
+                contested_possessions=None,
+                uncontested_possessions=None,
+                contested_marks=None,
+                marks_inside=None,
+                one_percenters=None,
+                bounces=None,
+                goal_assists=None,
+                percentage_played=None,
+            )]
+            team_models_2 = [TeamModel(
+                identifier="a",
+                name="Team A",
+                location=None,
+                players=player_models_2,
+                odds=[],
+                points=None,
+                ladder_rank=None,
+                news=[],
+                social=[],
+            )]
+            team_model_2 = create_combined_team_model(team_models=team_models_2, identifier="a", player_identity_map={}, names=names)
+            self.assertEqual(team_model.players[0].identifier, team_model_2.players[0].identifier)
+
+    def test_names_resolve_with_surname_firstname(self):
+        with requests_mock.Mocker() as m:
+            names = {}
+            player_models = [PlayerModel(
+                identifier="1",
+                jersey=None,
+                kicks=None,
+                fumbles=None,
+                fumbles_lost=None,
+                field_goals=None,
+                field_goals_attempted=None,
+                offensive_rebounds=None,
+                assists=None,
+                turnovers=None,
+                name="Johnny Johnson",
+                marks=None,
+                handballs=None,
+                disposals=None,
+                goals=None,
+                behinds=None,
+                hit_outs=None,
+                tackles=None,
+                rebounds=None,
+                insides=None,
+                clearances=None,
+                clangers=None,
+                free_kicks_for=None,
+                free_kicks_against=None,
+                brownlow_votes=None,
+                contested_possessions=None,
+                uncontested_possessions=None,
+                contested_marks=None,
+                marks_inside=None,
+                one_percenters=None,
+                bounces=None,
+                goal_assists=None,
+                percentage_played=None,
+            )]
+            team_models = [TeamModel(
+                identifier="a",
+                name="Team A",
+                location=None,
+                players=player_models,
+                odds=[],
+                points=None,
+                ladder_rank=None,
+                news=[],
+                social=[],
+            )]
+            team_model = create_combined_team_model(team_models=team_models, identifier="a", player_identity_map={}, names=names)
+            player_models_2 = [PlayerModel(
+                identifier="1a",
+                jersey=None,
+                kicks=None,
+                fumbles=None,
+                fumbles_lost=None,
+                field_goals=None,
+                field_goals_attempted=None,
+                offensive_rebounds=None,
+                assists=None,
+                turnovers=None,
+                name="Johnson, Johnny",
+                marks=None,
+                handballs=None,
+                disposals=None,
+                goals=None,
+                behinds=None,
+                hit_outs=None,
+                tackles=None,
+                rebounds=None,
+                insides=None,
+                clearances=None,
+                clangers=None,
+                free_kicks_for=None,
+                free_kicks_against=None,
+                brownlow_votes=None,
+                contested_possessions=None,
+                uncontested_possessions=None,
+                contested_marks=None,
+                marks_inside=None,
+                one_percenters=None,
+                bounces=None,
+                goal_assists=None,
+                percentage_played=None,
+            )]
+            team_models_2 = [TeamModel(
+                identifier="a",
+                name="Team A",
+                location=None,
+                players=player_models_2,
+                odds=[],
+                points=None,
+                ladder_rank=None,
+                news=[],
+                social=[],
+            )]
+            team_model_2 = create_combined_team_model(team_models=team_models_2, identifier="a", player_identity_map={}, names=names)
+            self.assertEqual(team_model.players[0].identifier, team_model_2.players[0].identifier)