sportsball 0.3.17__tar.gz → 0.3.18__tar.gz

{sportsball-0.3.17/sportsball.egg-info → sportsball-0.3.18}/PKG-INFO

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

{sportsball-0.3.17 → sportsball-0.3.18}/setup.py

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

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.17"
+__VERSION__ = "0.3.18"

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/afl/afltables/afl_afltables_player_model.py

@@ -29,6 +29,7 @@ def _create_afl_afltables_player_model(
         field_goals_attempted=None,
         offensive_rebounds=None,
         assists=None,
+        turnovers=None,
     )
 
 

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/combined/combined_player_model.py

@@ -16,6 +16,7 @@ def create_combined_player_model(
     field_goals_attempted = None
     offensive_rebounds = None
     assists = None
+    turnovers = None
     for player_model in player_models:
         player_model_jersey = player_model.jersey
         if player_model_jersey is not None:
@@ -41,6 +42,9 @@ def create_combined_player_model(
         player_model_assists = player_model.assists
         if player_model_assists is not None:
             assists = player_model_assists
+        player_model_turnovers = player_model.turnovers
+        if player_model_turnovers is not None:
+            turnovers = player_model_turnovers
     return PlayerModel(
         identifier=identifier,
         jersey=jersey,
@@ -51,4 +55,5 @@ def create_combined_player_model(
         field_goals_attempted=field_goals_attempted,
         offensive_rebounds=offensive_rebounds,
         assists=assists,
+        turnovers=turnovers,
     )

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/espn/espn_player_model.py

@@ -1,5 +1,6 @@
 """ESPN player model."""
 
+# pylint: disable=duplicate-code
 import datetime
 from typing import Any
 
@@ -38,6 +39,7 @@ def _create_espn_player_model(
         field_goals_attempted=None,
         offensive_rebounds=None,
         assists=None,
+        turnovers=None,
     )
 
 

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/google/google_address_model.py

@@ -1027,6 +1027,33 @@ ESPN_WIDE_WORLD_OF_SPORTS_COMPLEX = SportsballGeocodeTuple(
     housenumber="1375",
     country="USA",
 )
+QUICKEN_LOANS_ARENA = SportsballGeocodeTuple(
+    city="Cleveland",
+    state="OH",
+    postal="",
+    lat=41.496389,
+    lng=-81.688056,
+    housenumber="1",
+    country="USA",
+)
+KASEYA_CENTER = SportsballGeocodeTuple(
+    city="Miami",
+    state="FL",
+    postal="",
+    lat=25.781389,
+    lng=-80.188056,
+    housenumber="601",
+    country="USA",
+)
+DUNN_OLIVER_ACADOME = SportsballGeocodeTuple(
+    city="Montgomery",
+    state="AL",
+    postal="",
+    lat=32.36185,
+    lng=-86.293158,
+    housenumber="",
+    country="USA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -5853,15 +5880,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="1000",
         country="USA",
     ),
-    "Dunn–Oliver Acadome, Montgomery, Alabama": SportsballGeocodeTuple(
-        city="Montgomery",
-        state="AL",
-        postal="",
-        lat=32.36185,
-        lng=-86.293158,
-        housenumber="",
-        country="USA",
-    ),
+    "Dunn–Oliver Acadome, Montgomery, Alabama": DUNN_OLIVER_ACADOME,
     "Health & Physical Education Arena, Houston, Texas": SportsballGeocodeTuple(
         city="Houston",
         state="TX",
@@ -6521,15 +6540,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         country="USA",
     ),
     "America West Arena": AMERICA_WEST_ARENA,
-    "Quicken Loans Arena - Cleveland, Ohio - United States": SportsballGeocodeTuple(
-        city="Cleveland",
-        state="OH",
-        postal="",
-        lat=41.496389,
-        lng=-81.688056,
-        housenumber="1",
-        country="USA",
-    ),
+    "Quicken Loans Arena - Cleveland, Ohio - United States": QUICKEN_LOANS_ARENA,
     "Pepsi Center - Denver, Colorado, U.S. - United States": PEPSI_CENTRE,
     "Staples Center": STAPLES_CENTRE,
     "American Airlines Arena": AMERICAN_AIRLINES_ARENA,
@@ -6949,15 +6960,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         country="USA",
     ),
     "Golden 1 Center, Sacramento, California": GOLDEN_1_CENTER,
-    "Kaseya Center, Miami, Florida": SportsballGeocodeTuple(
-        city="Miami",
-        state="FL",
-        postal="",
-        lat=25.781389,
-        lng=-80.188056,
-        housenumber="601",
-        country="USA",
-    ),
+    "Kaseya Center, Miami, Florida": KASEYA_CENTER,
     "Scotiabank Arena, Toronto, Canada": SportsballGeocodeTuple(
         city="Toronto",
         state="ON",
@@ -6994,6 +6997,33 @@ _CACHED_GEOCODES: dict[str, Any] = {
     "Chesapeake Energy Arena, Oklahoma City, Oklahoma": CHESAPEAKE_ENERGY_ARENA,
     "The Arena, Bay Lake, Florida": ESPN_WIDE_WORLD_OF_SPORTS_COMPLEX,
     "HP Field House, Bay Lake, Florida": ESPN_WIDE_WORLD_OF_SPORTS_COMPLEX,
+    "Mexico City Arena, Mexico City, Mexico": SportsballGeocodeTuple(
+        city="Mexico City",
+        state="",
+        postal="04650",
+        lat=19.496309,
+        lng=-99.175429,
+        housenumber="",
+        country="Mexico",
+    ),
+    "Amway Center, Orlando, Florida": ORLANDO_ARENA,
+    "Phoenix Suns Arena, Phoenix, Arizona": AMERICA_WEST_ARENA,
+    "Quicken Loans Arena, Cleveland, Ohio": QUICKEN_LOANS_ARENA,
+    "STAPLES Center, Los Angeles, California": STAPLES_CENTRE,
+    "Bankers Life Fieldhouse, Indianapolis, Indiana": GAINBRIDGE_FIELDHOUSE,
+    "AmericanAirlines Arena, Miami, Florida": KASEYA_CENTER,
+    "Amalie Arena, Tampa, Florida": SportsballGeocodeTuple(
+        city="Tampa",
+        state="FL",
+        postal="",
+        lat=27.942778,
+        lng=-82.451944,
+        housenumber="401",
+        country="USA",
+    ),
+    "Pepsi Center, Denver, Colorado": PEPSI_CENTRE,
+    "Visa Athletic Center, Bay Lake, Florida": ESPN_WIDE_WORLD_OF_SPORTS_COMPLEX,
+    "Dunn–Oliver Acadome, Montgomery, Alabama": DUNN_OLIVER_ACADOME,
 }
 
 

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/nba/nba/nba_nba_player_model.py

@@ -38,6 +38,7 @@ def _create_nba_nba_player_model(
         field_goals_attempted=None,
         offensive_rebounds=None,
         assists=None,
+        turnovers=None,
     )
 
 

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/nba/nba/nba_nba_team_model.py

@@ -49,6 +49,7 @@ def _create_nba_nba_team_model(
         field_goals_attempted=row["FGA" + suffix],
         offensive_rebounds=row["OREB" + suffix],
         assists=row["AST" + suffix],
+        turnovers=row["TOV" + suffix],
     )
 
 

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/player_model.py

@@ -14,6 +14,7 @@ FIELD_GOALS_COLUMN: Literal["field_goals"] = "field_goals"
 FIELD_GOALS_ATTEMPTED_COLUMN: Literal["field_goals_attempted"] = "field_goals_attempted"
 OFFENSIVE_REBOUNDS_COLUMN: Literal["offensive_rebounds"] = "offensive_rebounds"
 ASSISTS_COLUMN: Literal["assists"] = "assists"
+TURNOVERS_COLUMN: Literal["turnovers"] = "turnovers"
 
 
 class PlayerModel(BaseModel):
@@ -60,3 +61,8 @@ class PlayerModel(BaseModel):
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
         alias=ASSISTS_COLUMN,
     )
+    turnovers: int | None = Field(
+        ...,
+        json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
+        alias=TURNOVERS_COLUMN,
+    )

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/sportsreference/sportsreference_game_model.py

@@ -72,6 +72,7 @@ def _create_sportsreference_game_model(
     fga = {}
     offensive_rebounds = {}
     assists = {}
+    turnovers = {}
     for df in dfs:
         if df.index.nlevels > 1:
             df.columns = df.columns.get_level_values(1)
@@ -93,6 +94,10 @@ def _create_sportsreference_game_model(
                 asts = df["AST"].tolist()
                 for idx, player in enumerate(players):
                     assists[player] = asts[idx]
+            if "TOV" in df.columns.values:
+                tovs = df["TOV"].tolist()
+                for idx, player in enumerate(players):
+                    turnovers[player] = tovs[idx]
 
     teams: list[TeamModel] = []
     for a in scorebox_div.find_all("a"):
@@ -110,6 +115,7 @@ def _create_sportsreference_game_model(
                     fga,
                     offensive_rebounds,
                     assists,
+                    turnovers,
                 )
             )
 

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/sportsreference/sportsreference_player_model.py

@@ -28,6 +28,7 @@ def _create_sportsreference_player_model(
     fga: dict[str, int],
     offensive_rebounds: dict[str, int],
     assists: dict[str, int],
+    turnovers: dict[str, int],
 ) -> PlayerModel | None:
     """Create a player model from NCAAB sports reference."""
     player_url = _fix_url(player_url)
@@ -53,6 +54,7 @@ def _create_sportsreference_player_model(
         field_goals_attempted=fga.get(name),
         offensive_rebounds=offensive_rebounds.get(name),
         assists=assists.get(name),
+        turnovers=turnovers.get(name),
     )
 
 
@@ -64,9 +66,10 @@ def _cached_create_sportsreference_player_model(
     fga: dict[str, int],
     offensive_rebounds: dict[str, int],
     assists: dict[str, int],
+    turnovers: dict[str, int],
 ) -> PlayerModel | None:
     return _create_sportsreference_player_model(
-        session, player_url, fg, fga, offensive_rebounds, assists
+        session, player_url, fg, fga, offensive_rebounds, assists, turnovers
     )
 
 
@@ -78,13 +81,14 @@ def create_sportsreference_player_model(
     fga: dict[str, int],
     offensive_rebounds: dict[str, int],
     assists: dict[str, int],
+    turnovers: dict[str, int],
 ) -> PlayerModel | None:
     """Create a player model from sports reference."""
     if not pytest_is_running.is_running():
         return _cached_create_sportsreference_player_model(
-            session, player_url, fg, fga, offensive_rebounds, assists
+            session, player_url, fg, fga, offensive_rebounds, assists, turnovers
         )
     with session.cache_disabled():
         return _create_sportsreference_player_model(
-            session, player_url, fg, fga, offensive_rebounds, assists
+            session, player_url, fg, fga, offensive_rebounds, assists, turnovers
         )

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/sportsreference/sportsreference_team_model.py

@@ -1,6 +1,6 @@
 """Sports Reference team model."""
 
-# pylint: disable=too-many-arguments,too-many-locals
+# pylint: disable=too-many-arguments,too-many-locals,duplicate-code
 import datetime
 import json
 import urllib.parse
@@ -30,6 +30,7 @@ def _create_sportsreference_team_model(
     fga: dict[str, int],
     offensive_rebounds: dict[str, int],
     assists: dict[str, int],
+    turnovers: dict[str, int],
 ) -> TeamModel:
     response = session.get(url)
     response.raise_for_status()
@@ -58,7 +59,7 @@ def _create_sportsreference_team_model(
             y
             for y in [  # pyright: ignore
                 create_sportsreference_player_model(
-                    session, x, dt, fg, fga, offensive_rebounds, assists
+                    session, x, dt, fg, fga, offensive_rebounds, assists, turnovers
                 )
                 for x in valid_player_urls
             ]
@@ -85,6 +86,7 @@ def _cached_create_sportsreference_team_model(
     fga: dict[str, int],
     offensive_rebounds: dict[str, int],
     assists: dict[str, int],
+    turnovers: dict[str, int],
 ) -> TeamModel:
     return _create_sportsreference_team_model(
         session,
@@ -97,6 +99,7 @@ def _cached_create_sportsreference_team_model(
         fga,
         offensive_rebounds,
         assists,
+        turnovers,
     )
 
 
@@ -111,6 +114,7 @@ def create_sportsreference_team_model(
     fga: dict[str, int],
     offensive_rebounds: dict[str, int],
     assists: dict[str, int],
+    turnovers: dict[str, int],
 ) -> TeamModel:
     """Create a team model from Sports Reference."""
     if not pytest_is_running.is_running():
@@ -125,6 +129,7 @@ def create_sportsreference_team_model(
             fga,
             offensive_rebounds,
             assists,
+            turnovers,
         )
     with session.cache_disabled():
         return _create_sportsreference_team_model(
@@ -138,4 +143,5 @@ def create_sportsreference_team_model(
             fga,
             offensive_rebounds,
             assists,
+            turnovers,
         )

{sportsball-0.3.17 → sportsball-0.3.18}/sportsball/data/team_model.py

@@ -1,5 +1,6 @@
 """The prototype class for a team."""
 
+# pylint: disable=duplicate-code
 from typing import Any, Literal
 
 from pydantic import BaseModel, Field
@@ -18,6 +19,7 @@ FIELD_GOALS_COLUMN: Literal["field_goals"] = "field_goals"
 FIELD_GOALS_ATTEMPTED_COLUMN: Literal["field_goals_attempted"] = "field_goals_attempted"
 OFFENSIVE_REBOUNDS_COLUMN: Literal["offensive_rebounds"] = "offensive_rebounds"
 ASSISTS_COLUMN: Literal["assists"] = "assists"
+TURNOVERS_COLUMN: Literal["turnovers"] = "turnovers"
 
 
 def _calculate_kicks(data: dict[str, Any]) -> int | None:
@@ -90,6 +92,20 @@ def _calculate_assists(data: dict[str, Any]) -> int | None:
     return assists
 
 
+def _calculate_turnovers(data: dict[str, Any]) -> int | None:
+    turnovers = 0
+    found_turnovers = False
+    for player in data[PLAYER_COLUMN_PREFIX]:
+        player_turnovers = player.turnovers
+        if player_turnovers is None:
+            continue
+        found_turnovers = True
+        turnovers += player_turnovers
+    if not found_turnovers:
+        return None
+    return turnovers
+
+
 class TeamModel(BaseModel):
     """The serialisable team class."""
 
@@ -136,3 +152,8 @@ class TeamModel(BaseModel):
         json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
         alias=ASSISTS_COLUMN,
     )
+    turnovers: int | None = Field(
+        default_factory=_calculate_turnovers,
+        json_schema_extra={TYPE_KEY: FieldType.LOOKAHEAD},
+        alias=TURNOVERS_COLUMN,
+    )

{sportsball-0.3.17 → sportsball-0.3.18/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.3.17 → sportsball-0.3.18}/tests/data/combined/combined_player_model_test.py

@@ -28,6 +28,7 @@ class TestCombinedPlayerModel(unittest.TestCase):
                 field_goals_attempted=field_goals_attempted,
                 offensive_rebounds=None,
                 assists=None,
+                turnovers=None,
             )
             combined_player_model = create_combined_player_model(
                 [player_model],

{sportsball-0.3.17 → sportsball-0.3.18}/tests/data/nba/nba/nba_nba_game_model_test.py

@@ -38,6 +38,8 @@ class TestNBANBAGameModel(unittest.TestCase):
                     12.0,
                     20.0,
                     30.0,
+                    12,
+                    15,
                 ], index=[
                     "SEASON_ID",
                     "GAME_DATE",
@@ -56,6 +58,8 @@ class TestNBANBAGameModel(unittest.TestCase):
                     "OREB_B",
                     "AST_A",
                     "AST_B",
+                    "TOV_A",
+                    "TOV_B",
                 ]),
                 League.NBA,
                 0,

{sportsball-0.3.17 → sportsball-0.3.18}/tests/data/nba/nba/nba_nba_team_model_test.py

@@ -35,6 +35,7 @@ class TestNBANBATeamModel(unittest.TestCase):
                     10.0,
                     10.0,
                     20.0,
+                    40,
                 ], index=[
                     "TEAM_ID_B",
                     "TEAM_NAME_B",
@@ -45,6 +46,7 @@ class TestNBANBATeamModel(unittest.TestCase):
                     "FGA_B",
                     "OREB_B",
                     "AST_B",
+                    "TOV_B",
                 ]),
                 False,
                 self.session,

{sportsball-0.3.17 → sportsball-0.3.18}/tests/data/player_model_test.py

@@ -17,6 +17,7 @@ class TestPlayerModel(unittest.TestCase):
             field_goals_attempted=10,
             offensive_rebounds=None,
             assists=None,
+            turnovers=None,
         )
 
     def test_field_goals_attempted(self):

{sportsball-0.3.17 → sportsball-0.3.18}/tests/data/sportsreference/sportsreference_player_model_test.py

@@ -27,5 +27,6 @@ class TestSportsReferencePlayerModel(unittest.TestCase):
                 {},
                 {},
                 {},
+                {},
             )
             self.assertEqual(player_model.field_goals, 8)

{sportsball-0.3.17 → sportsball-0.3.18}/tests/data/sportsreference/sportsreference_team_model_test.py

@@ -31,6 +31,7 @@ class TestSportsReferenceTeamModel(unittest.TestCase):
                 {},
                 {},
                 {},
+                {},
             )
             self.assertEqual(team_model.identifier, "Villanova Wildcats Men's")
 
@@ -55,6 +56,7 @@ class TestSportsReferenceTeamModel(unittest.TestCase):
                 {},
                 {},
                 {},
+                {},
             )
             self.assertEqual(team_model.field_goals, 8)
 
@@ -81,5 +83,6 @@ class TestSportsReferenceTeamModel(unittest.TestCase):
                 },
                 {},
                 {},
+                {},
             )
             self.assertEqual(team_model.field_goals_attempted, 10)