sportsball 0.3.56__tar.gz → 0.3.58__tar.gz

{sportsball-0.3.56/sportsball.egg-info → sportsball-0.3.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sportsball
-Version: 0.3.56
+Version: 0.3.58
 Summary: A library for pulling in and normalising sports stats.
 Home-page: https://github.com/8W9aG/sportsball
 Author: Will Sackfield
@@ -44,6 +44,8 @@ Requires-Dist: cryptography>=44.0.0
 Requires-Dist: feedparser>=6.0.11
 Requires-Dist: dateparser>=1.2.0
 Requires-Dist: playwright>=1.51.0
+Requires-Dist: cchardet>=2.2.0a2
+Requires-Dist: lxml>=5.3.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -103,6 +105,8 @@ Python 3.11.6:
 - [feedparser](https://github.com/kurtmckee/feedparser)
 - [dateparser](https://dateparser.readthedocs.io/en/latest/)
 - [playwright](https://playwright.dev/)
+- [cchardet](https://github.com/PyYoshi/cChardet)
+- [lxml](https://lxml.de/)
 
 ## Raison D'être :thought_balloon:
 

{sportsball-0.3.56 → sportsball-0.3.58}/README.md

@@ -46,6 +46,8 @@ Python 3.11.6:
 - [feedparser](https://github.com/kurtmckee/feedparser)
 - [dateparser](https://dateparser.readthedocs.io/en/latest/)
 - [playwright](https://playwright.dev/)
+- [cchardet](https://github.com/PyYoshi/cChardet)
+- [lxml](https://lxml.de/)
 
 ## Raison D'être :thought_balloon:
 

sportsball-0.3.56/sportsball.egg-info/requires.txt → sportsball-0.3.58/requirements.txt

@@ -31,3 +31,5 @@ cryptography>=44.0.0
 feedparser>=6.0.11
 dateparser>=1.2.0
 playwright>=1.51.0
+cchardet>=2.2.0a2
+lxml>=5.3.0

{sportsball-0.3.56 → sportsball-0.3.58}/setup.py

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

sportsball-0.3.58/sportsball/__init__.py

@@ -0,0 +1,7 @@
+"""The main module for sportsball."""
+
+# flake8: noqa
+import cchardet  # type: ignore
+import lxml  # noqa: ignore
+
+__VERSION__ = "0.3.58"

{sportsball-0.3.56 → sportsball-0.3.58}/sportsball/data/afl/afl/afl_afl_game_model.py

@@ -1,6 +1,6 @@
 """AFL AFL game model."""
 
-# pylint: disable=too-many-statements,protected-access
+# pylint: disable=too-many-statements,protected-access,too-many-arguments
 import datetime
 
 import requests_cache
@@ -17,11 +17,12 @@ def create_afl_afl_game_model(
     dt: datetime.datetime,
     venue_name: str,
     session: requests_cache.CachedSession,
+    ladder: list[str],
 ) -> GameModel:
     """Create a game model from AFL Tables."""
     venue_model = create_afl_afl_venue_model(venue_name, session, dt)
     teams = [
-        create_afl_afl_team_model(x, players[count], session, dt)
+        create_afl_afl_team_model(x, players[count], session, dt, ladder)
         for count, x in enumerate(team_names)
     ]
     return GameModel(

{sportsball-0.3.56 → sportsball-0.3.58}/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -24,9 +24,29 @@ class AFLAFLLeagueModel(LeagueModel):
     ) -> None:
         super().__init__(League.AFL, session)
 
+    @property
+    def _ladder(self) -> list[str]:
+        ladder = []
+        ensure_install()
+        with sync_playwright() as p:
+            browser = p.chromium.launch()
+            context = browser.new_context()
+            page = context.new_page()
+            page.goto("https://www.afl.com.au/ladder", wait_until="networkidle")
+            soup = BeautifulSoup(page.content(), "lxml")
+            for span in soup.find_all(
+                "span", {"class": re.compile(".*stats-table__club-name.*")}
+            ):
+                team_name = span.get_text().strip()
+                if team_name in ladder:
+                    continue
+                ladder.append(team_name)
+        return ladder
+
     @property
     def games(self) -> Iterator[GameModel]:
         # https://www.afl.com.au/matches/team-lineups
+        ladder = self._ladder
         ensure_install()
         with sync_playwright() as p:
             browser = p.chromium.launch()
@@ -35,7 +55,7 @@ class AFLAFLLeagueModel(LeagueModel):
             page.goto(
                 "https://www.afl.com.au/matches/team-lineups", wait_until="networkidle"
             )
-            soup = BeautifulSoup(page.content(), "html.parser")
+            soup = BeautifulSoup(page.content(), "lxml")
             for div in soup.find_all(
                 "div", {"class": re.compile(".*js-match-list-item.*")}
             ):
@@ -100,5 +120,5 @@ class AFLAFLLeagueModel(LeagueModel):
                 if dt is None:
                     raise ValueError("dt is null")
                 yield create_afl_afl_game_model(
-                    team_names, teams_players, dt, venue_name, self.session
+                    team_names, teams_players, dt, venue_name, self.session, ladder
                 )

{sportsball-0.3.56 → sportsball-0.3.58}/sportsball/data/afl/afl/afl_afl_player_model.py

@@ -22,4 +22,25 @@ def create_afl_afl_player_model(
         turnovers=None,
         name=name,
         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,
     )

{sportsball-0.3.56 → sportsball-0.3.58}/sportsball/data/afl/afl/afl_afl_team_model.py

@@ -16,6 +16,7 @@ def create_afl_afl_team_model(
     players: list[tuple[str, str, str, str]],
     session: requests_cache.CachedSession,
     dt: datetime.datetime,
+    ladder: list[str],
 ) -> TeamModel:
     """Create a team model from AFL AFL."""
     player_models = [
@@ -31,7 +32,7 @@ def create_afl_afl_team_model(
         players=player_models,
         odds=[],
         points=None,
-        ladder_rank=None,
+        ladder_rank=ladder.index(team_name) + 1,
         kicks=None,
         news=create_google_news_models(team_name, session, dt, League.AFL),
         social=[],

{sportsball-0.3.56 → sportsball-0.3.58}/sportsball/data/afl/afltables/afl_afltables_game_model.py

@@ -1,6 +1,6 @@
 """AFL AFLTables game model."""
 
-# pylint: disable=too-many-arguments,too-many-branches
+# pylint: disable=too-many-arguments,too-many-branches,too-many-statements
 import datetime
 import urllib.parse
 from urllib.parse import urlparse
@@ -148,11 +148,46 @@ def _create_afl_afltables_game_model(
     # pylint: disable=too-many-locals
     response = session.get(url)
     response.raise_for_status()
-    soup = BeautifulSoup(response.text, "html.parser")
+    soup = BeautifulSoup(response.text, "lxml")
 
     def _find_teams_metadata(
         soup: BeautifulSoup, team_infos: list[tuple[str, str, int]]
-    ) -> list[tuple[str, list[tuple[str, str, int | None, str, int | None]], int]]:
+    ) -> list[
+        tuple[
+            str,
+            list[
+                tuple[
+                    str,
+                    str,
+                    int | None,
+                    str,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    float | None,
+                ]
+            ],
+            int,
+        ]
+    ]:
         def _is_correct_table(table: Tag, name: str) -> bool:
             for th in table.find_all("th"):
                 header_text = th.get_text().strip()
@@ -162,8 +197,66 @@ def _create_afl_afltables_game_model(
 
         def _find_players(
             table: Tag,
-        ) -> list[tuple[str, str, int | None, str, int | None]]:
-            players: list[tuple[str, str, int | None, str, int | None]] = []
+        ) -> list[
+            tuple[
+                str,
+                str,
+                int | None,
+                str,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                float | None,
+            ]
+        ]:
+            players: list[
+                tuple[
+                    str,
+                    str,
+                    int | None,
+                    str,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    int | None,
+                    float | None,
+                ]
+            ] = []
             for tr in table.find_all("tr"):
                 player_row = False
                 player_url = None
@@ -177,6 +270,27 @@ def _create_afl_afltables_game_model(
                     name = None
                     kicks = None
                     marks = None
+                    handballs = None
+                    disposals = None
+                    goals: int | None = 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
                     for count, td in enumerate(tr.find_all("td")):
                         if count == 0:
                             jersey = td.get_text().strip()
@@ -195,13 +309,128 @@ def _create_afl_afltables_game_model(
                             marks_text = td.get_text().strip()
                             if marks_text:
                                 marks = int(marks_text)
+                        elif count == 4:
+                            handballs_text = td.get_text().strip()
+                            if handballs_text:
+                                handballs = int(handballs_text)
+                        elif count == 5:
+                            disposals_text = td.get_text().strip()
+                            if disposals_text:
+                                disposals = int(disposals_text)
+                        elif count == 6:
+                            goals_text = td.get_text().strip()
+                            if goals_text:
+                                goals = int(goals_text)
+                        elif count == 7:
+                            behinds_text = td.get_text().strip()
+                            if behinds_text:
+                                behinds = int(behinds_text)
+                        elif count == 8:
+                            hit_outs_text = td.get_text().strip()
+                            if hit_outs_text:
+                                hit_outs = int(hit_outs_text)
+                        elif count == 9:
+                            tackles_text = td.get_text().strip()
+                            if tackles_text:
+                                tackles = int(tackles_text)
+                        elif count == 10:
+                            rebounds_text = td.get_text().strip()
+                            if rebounds_text:
+                                rebounds = int(rebounds_text)
+                        elif count == 11:
+                            insides_text = td.get_text().strip()
+                            if insides_text:
+                                insides = int(insides_text)
+                        elif count == 12:
+                            clearances_text = td.get_text().strip()
+                            if clearances_text:
+                                clearances = int(clearances_text)
+                        elif count == 13:
+                            clangers_text = td.get_text().strip()
+                            if clangers_text:
+                                clangers = int(clangers_text)
+                        elif count == 14:
+                            free_kicks_for_text = td.get_text().strip()
+                            if free_kicks_for_text:
+                                free_kicks_for = int(free_kicks_for_text)
+                        elif count == 15:
+                            free_kicks_against_text = td.get_text().strip()
+                            if free_kicks_against_text:
+                                free_kicks_against = int(free_kicks_against_text)
+                        elif count == 16:
+                            brownlow_votes_text = td.get_text().strip()
+                            if brownlow_votes_text:
+                                brownlow_votes = int(brownlow_votes_text)
+                        elif count == 17:
+                            contested_possessions_text = td.get_text().strip()
+                            if contested_possessions_text:
+                                contested_possessions = int(contested_possessions_text)
+                        elif count == 18:
+                            uncontested_possessions_text = td.get_text().strip()
+                            if uncontested_possessions_text:
+                                uncontested_possessions = int(
+                                    uncontested_possessions_text
+                                )
+                        elif count == 19:
+                            contested_marks_text = td.get_text().strip()
+                            if contested_marks_text:
+                                contested_marks = int(contested_marks_text)
+                        elif count == 20:
+                            marks_inside_text = td.get_text().strip()
+                            if marks_inside_text:
+                                marks_inside = int(marks_inside_text)
+                        elif count == 21:
+                            one_percenters_text = td.get_text().strip()
+                            if one_percenters_text:
+                                one_percenters = int(one_percenters_text)
+                        elif count == 22:
+                            bounces_text = td.get_text().strip()
+                            if bounces_text:
+                                bounces = int(bounces_text)
+                        elif count == 23:
+                            goal_assists_text = td.get_text().strip()
+                            if goal_assists_text:
+                                goal_assists = int(goal_assists_text)
+                        elif count == 24:
+                            percentage_played_text = td.get_text().strip()
+                            if percentage_played_text:
+                                percentage_played = float(percentage_played_text)
 
                     if jersey is None:
                         raise ValueError("jersey is null.")
                     if name is None:
                         raise ValueError("name is null")
 
-                    players.append((player_url, jersey, kicks, name, marks))
+                    players.append(
+                        (
+                            player_url,
+                            jersey,
+                            kicks,
+                            name,
+                            marks,
+                            handballs,
+                            disposals,
+                            goals,
+                            behinds,
+                            hit_outs,
+                            tackles,
+                            rebounds,
+                            insides,
+                            clearances,
+                            clangers,
+                            free_kicks_for,
+                            free_kicks_against,
+                            brownlow_votes,
+                            contested_possessions,
+                            uncontested_possessions,
+                            contested_marks,
+                            marks_inside,
+                            one_percenters,
+                            bounces,
+                            goal_assists,
+                            percentage_played,
+                        )
+                    )
             return players
 
         team_metadata = []

{sportsball-0.3.56 → sportsball-0.3.58}/sportsball/data/afl/afltables/afl_afltables_league_model.py

@@ -62,7 +62,7 @@ class AFLAFLTablesLeagueModel(LeagueModel):
         else:
             response = self.session.get(season_url)
 
-        soup = BeautifulSoup(response.text, "html.parser")
+        soup = BeautifulSoup(response.text, "lxml")
         in_finals = False
         game_number = 0
         last_round_number = 0
@@ -151,7 +151,7 @@ class AFLAFLTablesLeagueModel(LeagueModel):
         with self.session.cache_disabled():
             response = self.session.get(_SEASON_URL)
         response.raise_for_status()
-        soup = BeautifulSoup(response.text, "html.parser")
+        soup = BeautifulSoup(response.text, "lxml")
         with tqdm.tqdm(position=self.position) as pbar:
             for table in soup.find_all("table"):
                 for tr in table.find_all("tr"):