sportsball 0.3.116__tar.gz → 0.3.118__tar.gz

{sportsball-0.3.116/sportsball.egg-info → sportsball-0.3.118}/PKG-INFO

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

{sportsball-0.3.116 → sportsball-0.3.118}/setup.py

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

{sportsball-0.3.116 → sportsball-0.3.118}/sportsball/__init__.py

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

sportsball-0.3.118/sportsball/data/afl/afl/afl_afl_bookie_model.py

@@ -0,0 +1,8 @@
+"""AFL AFL bookie model."""
+
+from ...bookie_model import BookieModel
+
+
+def create_afl_afl_bookie_model() -> BookieModel:
+    """Create bookie model from AFL.com."""
+    return BookieModel(identifier="sportsbet", name="sportsbet")

sportsball-0.3.118/sportsball/data/afl/afl/afl_afl_game_model.py

@@ -0,0 +1,75 @@
+"""AFL AFL game model."""
+
+# pylint: disable=too-many-statements,protected-access,too-many-arguments,bare-except
+import datetime
+import logging
+
+import pytest_is_running
+import requests_cache
+from bs4 import BeautifulSoup
+from playwright.sync_api import Playwright
+
+from ....playwright import ensure_install
+from ...game_model import GameModel
+from ...league import League
+from .afl_afl_team_model import create_afl_afl_team_model
+from .afl_afl_venue_model import create_afl_afl_venue_model
+
+
+def _extract_odds(html: str) -> list[float]:
+    odds = []
+    soup = BeautifulSoup(html, "lxml")
+    for span in soup.find_all("span", {"class": "betting-button__money"}):
+        odds.append(float(span.get_text().strip().replace("$", "")))
+    return odds
+
+
+def create_afl_afl_game_model(
+    team_names: list[str],
+    players: list[list[tuple[str, str, str, str]]],
+    dt: datetime.datetime,
+    venue_name: str,
+    session: requests_cache.CachedSession,
+    ladder: list[str],
+    url: str | None,
+    playwright: Playwright,
+) -> GameModel:
+    """Create a game model from AFL Tables."""
+    odds = []
+    if url is not None and not pytest_is_running.is_running():
+        ensure_install()
+        browser = playwright.chromium.launch()
+        context = browser.new_context()
+        page = context.new_page()
+        try:
+            page.goto(url, wait_until="networkidle")
+        except:  # noqa: E722
+            logging.warning("Ladder URL timed out.")
+        odds = _extract_odds(page.content())
+
+    venue_model = create_afl_afl_venue_model(venue_name, session, dt)
+    teams = [
+        create_afl_afl_team_model(
+            x,
+            players[count],
+            session,
+            dt,
+            ladder,
+            odds[count] if count < len(odds) else None,
+        )
+        for count, x in enumerate(team_names)
+    ]
+    return GameModel(
+        dt=dt,
+        week=None,
+        game_number=None,
+        venue=venue_model,
+        teams=teams,
+        end_dt=None,
+        attendance=None,
+        league=League.AFL,
+        year=datetime.datetime.today().year,
+        season_type=None,
+        postponed=None,
+        play_off=None,
+    )

{sportsball-0.3.116 → sportsball-0.3.118}/sportsball/data/afl/afl/afl_afl_league_model.py

@@ -1,15 +1,16 @@
 """AFL AFL league model."""
 
-# pylint: disable=too-many-statements,protected-access,too-many-locals,bare-except,too-many-branches
+# pylint: disable=too-many-statements,protected-access,too-many-locals,bare-except,too-many-branches,duplicate-code
 import datetime
 import logging
 import re
+import urllib.parse
 from typing import Iterator
 
 import requests_cache
 from bs4 import BeautifulSoup
 from dateutil.parser import parse
-from playwright.sync_api import sync_playwright
+from playwright.sync_api import Playwright, sync_playwright
 
 from ....playwright import ensure_install
 from ...game_model import GameModel
@@ -19,7 +20,11 @@ from .afl_afl_game_model import create_afl_afl_game_model
 
 
 def _parse_game_info(
-    html: str, session: requests_cache.CachedSession, ladder: list[str]
+    html: str,
+    session: requests_cache.CachedSession,
+    ladder: list[str],
+    html_url: str,
+    playwright: Playwright,
 ) -> Iterator[GameModel]:
     soup = BeautifulSoup(html, "lxml")
     for div in soup.find_all("div", {"class": re.compile(".*js-match-list-item.*")}):
@@ -88,8 +93,20 @@ def _parse_game_info(
             raise ValueError("venue_name is null")
         if dt is None:
             raise ValueError("dt is null")
+        url = None
+        for a in div.find_all(
+            "a", {"class": re.compile(".*match-list-alt__header-mc-link.*")}
+        ):
+            url = urllib.parse.urljoin(html_url, a.get("href"))
         yield create_afl_afl_game_model(
-            team_names, teams_players, dt, venue_name, session, ladder
+            team_names,
+            teams_players,
+            dt,
+            venue_name,
+            session,
+            ladder,
+            url,
+            playwright,
         )
 
 
@@ -139,7 +156,6 @@ class AFLAFLLeagueModel(LeagueModel):
             browser = p.chromium.launch()
             context = browser.new_context()
             page = context.new_page()
-            page.goto(
-                "https://www.afl.com.au/matches/team-lineups", wait_until="networkidle"
-            )
-            yield from _parse_game_info(page.content(), self.session, ladder)
+            url = "https://www.afl.com.au/matches/team-lineups"
+            page.goto(url, wait_until="networkidle")
+            yield from _parse_game_info(page.content(), self.session, ladder, url, p)

sportsball-0.3.118/sportsball/data/afl/afl/afl_afl_odds_model.py

@@ -0,0 +1,14 @@
+"""AFL AFL odds model."""
+
+import datetime
+
+from ...team_model import OddsModel
+from .afl_afl_bookie_model import create_afl_afl_bookie_model
+
+
+def create_afl_afl_odds_model(odds: float) -> OddsModel:
+    """Create an odds model based off aus sports betting."""
+    bookie = create_afl_afl_bookie_model()
+    return OddsModel(
+        odds=odds, bookie=bookie, dt=datetime.datetime.now(), canonical=True
+    )  # pyright: ignore

{sportsball-0.3.116 → sportsball-0.3.118}/sportsball/data/afl/afl/afl_afl_team_model.py

@@ -1,6 +1,6 @@
 """AFL AFL team model."""
 
-# pylint: disable=duplicate-code
+# pylint: disable=duplicate-code,too-many-arguments
 import datetime
 
 import requests_cache
@@ -8,6 +8,7 @@ import requests_cache
 from ...google.google_news_model import create_google_news_models
 from ...league import League
 from ...team_model import TeamModel
+from .afl_afl_odds_model import create_afl_afl_odds_model
 from .afl_afl_player_model import create_afl_afl_player_model
 
 
@@ -17,6 +18,7 @@ def create_afl_afl_team_model(
     session: requests_cache.CachedSession,
     dt: datetime.datetime,
     ladder: list[str],
+    odds: float | None,
 ) -> TeamModel:
     """Create a team model from AFL AFL."""
     player_models = [
@@ -25,12 +27,15 @@ def create_afl_afl_team_model(
         )
         for identifier, player_number, first_name, second_name in players
     ]
+    odds_models = []
+    if odds is not None:
+        odds_models.append(create_afl_afl_odds_model(odds))
     return TeamModel(
         identifier=team_name,
         name=team_name,
         location=None,
         players=player_models,
-        odds=[],
+        odds=odds_models,
         points=None,
         ladder_rank=ladder.index(team_name) + 1,
         kicks=None,

{sportsball-0.3.116 → sportsball-0.3.118}/sportsball/data/aussportsbetting/aussportsbetting_odds_model.py

@@ -9,4 +9,4 @@ from .aussportsbetting_bookie_model import create_aussportsbetting_bookie_model
 def create_aussportsbetting_odds_model(odds: float) -> OddsModel:
     """Create an odds model based off aus sports betting."""
     bookie = create_aussportsbetting_bookie_model()
-    return OddsModel(odds=odds, bookie=bookie, dt=None)  # pyright: ignore
+    return OddsModel(odds=odds, bookie=bookie, dt=None, canonical=True)  # pyright: ignore

{sportsball-0.3.116 → sportsball-0.3.118}/sportsball/data/espn/espn_odds_model.py

@@ -18,4 +18,4 @@ def create_espn_odds_model(odds: dict[str, Any], bookie: BookieModel) -> OddsMod
         odds_val = (float(moneyline) / 100.0) + 1.0
     elif moneyline < 0:
         odds_val = (100.0 / float(abs(moneyline))) + 1.0
-    return OddsModel(odds=odds_val, bookie=bookie, dt=None)
+    return OddsModel(odds=odds_val, bookie=bookie, dt=None, canonical=False)

{sportsball-0.3.116 → sportsball-0.3.118}/sportsball/data/odds_model.py

@@ -11,6 +11,7 @@ from .field_type import TYPE_KEY, FieldType
 DT_COLUMN: Literal["dt"] = "dt"
 ODDS_ODDS_COLUMN: Literal["odds"] = "odds"
 ODDS_BOOKIE_COLUMN: Literal["bookie"] = "bookie"
+ODDS_CANONICAL_COLUMN: Literal["canonical"] = "canonical"
 
 
 class OddsModel(BaseModel):
@@ -24,3 +25,4 @@ class OddsModel(BaseModel):
         ...,
         alias=DT_COLUMN,
     )
+    canonical: bool = Field(..., alias=ODDS_CANONICAL_COLUMN)

{sportsball-0.3.116 → sportsball-0.3.118}/sportsball/data/oddsportal/oddsportal_odds_model.py

@@ -13,4 +13,4 @@ def create_oddsportal_odds_model(
 ) -> OddsModel:
     """Create an odds model based off aus sports betting."""
     bookie = create_oddsportal_bookie_model(bookie_name, bookie_id)
-    return OddsModel(odds=odds, bookie=bookie, dt=dt)  # pyright: ignore
+    return OddsModel(odds=odds, bookie=bookie, dt=dt, canonical=False)  # pyright: ignore

{sportsball-0.3.116 → sportsball-0.3.118/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.3.116 → sportsball-0.3.118}/sportsball.egg-info/SOURCES.txt

@@ -38,8 +38,10 @@ sportsball/data/venue_model.py
 sportsball/data/weather_model.py
 sportsball/data/afl/__init__.py
 sportsball/data/afl/afl/__init__.py
+sportsball/data/afl/afl/afl_afl_bookie_model.py
 sportsball/data/afl/afl/afl_afl_game_model.py
 sportsball/data/afl/afl/afl_afl_league_model.py
+sportsball/data/afl/afl/afl_afl_odds_model.py
 sportsball/data/afl/afl/afl_afl_player_model.py
 sportsball/data/afl/afl/afl_afl_team_model.py
 sportsball/data/afl/afl/afl_afl_venue_model.py

{sportsball-0.3.116 → sportsball-0.3.118}/tests/data/afl/afl/afl_afl_league_model_test.py

@@ -34,7 +34,7 @@ class TestAFLAFLLeagueModel(unittest.TestCase):
                 "Geelong Cats",
                 "Hawthorn",
                 "West Coast Eagles",
-            ]))
+            ], "https://www.afl.com.au/matches/team-lineups", None))
             first_game = game_models[0]
             self.assertEqual(len(first_game.teams), 2)
             for team in first_game.teams:

sportsball-0.3.116/sportsball/data/afl/afl/afl_afl_game_model.py

@@ -1,41 +0,0 @@
-"""AFL AFL game model."""
-
-# pylint: disable=too-many-statements,protected-access,too-many-arguments
-import datetime
-
-import requests_cache
-
-from ...game_model import GameModel
-from ...league import League
-from .afl_afl_team_model import create_afl_afl_team_model
-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, str, str]]],
-    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, ladder)
-        for count, x in enumerate(team_names)
-    ]
-    return GameModel(
-        dt=dt,
-        week=None,
-        game_number=None,
-        venue=venue_model,
-        teams=teams,
-        end_dt=None,
-        attendance=None,
-        league=League.AFL,
-        year=datetime.datetime.today().year,
-        season_type=None,
-        postponed=None,
-        play_off=None,
-    )