sportsball 0.3.22__tar.gz → 0.3.24__tar.gz

{sportsball-0.3.22/sportsball.egg-info → sportsball-0.3.24}/PKG-INFO

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

{sportsball-0.3.22 → sportsball-0.3.24}/setup.py

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

{sportsball-0.3.22 → sportsball-0.3.24}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.22"
+__VERSION__ = "0.3.24"

{sportsball-0.3.22 → sportsball-0.3.24}/sportsball/data/afl/afltables/afl_afltables_league_model.py

@@ -28,7 +28,7 @@ class AFLAFLTablesLeagueModel(LeagueModel):
         super().__init__(League.AFL, session)
 
     def _produce_games(
-        self, season_url: str, season_type: SeasonType
+        self, season_url: str, season_type: SeasonType, pbar: tqdm.tqdm
     ) -> Iterator[GameModel]:
         # pylint: disable=too-many-branches,too-many-locals
         o = urlparse(season_url)
@@ -56,8 +56,10 @@ class AFLAFLTablesLeagueModel(LeagueModel):
             current_dt = None
             for td in table.find_all("td"):
                 td_text = td.get_text().strip()
-                if "(" in td_text:
-                    current_dt = parser.parse(td_text.split("(")[0].strip())
+                if "Venue:" in td_text:
+                    cleaned_text = td_text.split("Venue:")[0].split("Att:")[0].strip()
+                    cleaned_text = " ".join(cleaned_text.split()[-3:])
+                    current_dt = parser.parse(cleaned_text)
             for a in table.find_all("a", href=True):
                 if a.get_text().strip().lower() == "match stats":
                     url = urllib.parse.urljoin(season_url, a.get("href"))
@@ -66,7 +68,7 @@ class AFLAFLTablesLeagueModel(LeagueModel):
                     if current_dt is None:
                         raise ValueError("current_dt is null.")
                     if not in_finals and season_type == SeasonType.REGULAR:
-                        model = create_afl_afltables_game_model(
+                        game_model = create_afl_afltables_game_model(
                             game_number,
                             self.session,
                             url,
@@ -77,14 +79,18 @@ class AFLAFLTablesLeagueModel(LeagueModel):
                             season_type,
                             current_dt,
                         )
-                        model_week = model.week
+                        model_week = game_model.week
                         if model_week is None:
                             raise ValueError("model_week is null")
                         last_round_number = model_week  # pyright: ignore
                         if season_type == SeasonType.REGULAR:
-                            yield model  # pyright: ignore
+                            pbar.update(1)
+                            pbar.set_description(
+                                f"AFLTables {game_model.year} - {season_type} - {game_model.dt}"
+                            )
+                            yield game_model  # pyright: ignore
                     elif in_finals and season_type == SeasonType.POSTSEASON:
-                        yield create_afl_afltables_game_model(
+                        game_model = create_afl_afltables_game_model(
                             game_number,
                             self.session,
                             url,
@@ -95,6 +101,11 @@ class AFLAFLTablesLeagueModel(LeagueModel):
                             season_type,
                             current_dt,
                         )
+                        pbar.update(1)
+                        pbar.set_description(
+                            f"AFLTables {game_model.year} - {season_type} - {game_model.dt}"
+                        )
+                        yield game_model
                     game_number += 1
                     urls_duplicates.add(url)
             ladder_count = None
@@ -121,12 +132,15 @@ class AFLAFLTablesLeagueModel(LeagueModel):
     def games(self) -> Iterator[GameModel]:
         response = self.session.get(_SEASON_URL)
         soup = BeautifulSoup(response.text, "html.parser")
-        with tqdm.tqdm(desc="AFLTables seasons") as pbar:
+        with tqdm.tqdm() as pbar:
             for table in soup.find_all("table"):
                 for tr in table.find_all("tr"):
                     for td in tr.find_all("td"):
                         for a in td.find_all("a"):
                             url = urllib.parse.urljoin(_SEASON_URL, a.get("href"))
-                            yield from self._produce_games(url, SeasonType.REGULAR)
-                            yield from self._produce_games(url, SeasonType.POSTSEASON)
-                            pbar.update(2)
+                            yield from self._produce_games(
+                                url, SeasonType.REGULAR, pbar
+                            )
+                            yield from self._produce_games(
+                                url, SeasonType.POSTSEASON, pbar
+                            )

{sportsball-0.3.22 → sportsball-0.3.24}/sportsball/data/aussportsbetting/aussportsbetting_league_model.py

@@ -1,5 +1,6 @@
 """Aussportsbetting league model."""
 
+# pylint: disable=line-too-long
 from io import BytesIO
 from typing import Any, Iterator
 
@@ -95,7 +96,12 @@ class AusSportsBettingLeagueModel(LeagueModel):
         ws = workbook.active
         if ws is None:
             raise ValueError("ws is null.")
-        for row in tqdm.tqdm(ws.iter_rows(), desc="AusSportsBetting Games"):
-            game = self._row_to_game(row)
-            if game is not None:
-                yield game
+        with tqdm.tqdm() as pbar:
+            for row in ws.iter_rows():
+                game_model = self._row_to_game(row)
+                if game_model is not None:
+                    pbar.update(1)
+                    pbar.set_description(
+                        f"AusSportsBetting {game_model.year} - {game_model.season_type} - {game_model.dt}"
+                    )
+                    yield game_model

{sportsball-0.3.22 → sportsball-0.3.24}/sportsball/data/google/google_address_model.py

@@ -7095,6 +7095,69 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="",
         country="USA",
     ),
+    "Salt Lake City, Utah": SportsballGeocodeTuple(
+        city="Salt Lake City",
+        state="UT",
+        postal="",
+        lat=40.760833,
+        lng=-111.891111,
+        housenumber="",
+        country="USA",
+    ),
+    "Ferrell Center, Waco, Texas": SportsballGeocodeTuple(
+        city="Waco",
+        state="TX",
+        postal="76706",
+        lat=31.547903,
+        lng=-97.105969,
+        housenumber="1900",
+        country="USA",
+    ),
+    "Princeton, New Jersey": SportsballGeocodeTuple(
+        city="Princeton",
+        state="NJ",
+        postal="",
+        lat=40.358244,
+        lng=-74.666728,
+        housenumber="",
+        country="USA",
+    ),
+    "Nashville, Tennessee": SportsballGeocodeTuple(
+        city="Nashville",
+        state="TN",
+        postal="",
+        lat=36.162222,
+        lng=-86.774444,
+        housenumber="",
+        country="USA",
+    ),
+    "Fort Worth, Texas": SportsballGeocodeTuple(
+        city="Fort Worth",
+        state="TX",
+        postal="",
+        lat=32.756389,
+        lng=-97.3325,
+        housenumber="",
+        country="USA",
+    ),
+    "T-Mobile Center, Kansas City, Missouri": SportsballGeocodeTuple(
+        city="Kansas City",
+        state="MS",
+        postal="",
+        lat=39.0975,
+        lng=-94.580278,
+        housenumber="1407",
+        country="USA",
+    ),
+    "Henderson, Nevada": SportsballGeocodeTuple(
+        city="Henderson",
+        state="NV",
+        postal="",
+        lat=36.033333,
+        lng=-114.983333,
+        housenumber="",
+        country="USA",
+    ),
 }
 
 

{sportsball-0.3.22 → sportsball-0.3.24}/sportsball/data/oddsportal/oddsportal_league_model.py

@@ -1,10 +1,13 @@
 """Odds Portal league model."""
 
+import http
 import json
+import logging
 import urllib.parse
 from typing import Iterator
 
 import extruct  # type: ignore
+import requests
 import tqdm
 from bs4 import BeautifulSoup, Tag
 
@@ -52,15 +55,23 @@ class OddsPortalLeagueModel(LeagueModel):
         for jsonld in data["json-ld"]:
             if jsonld["@type"] != "SportsEvent":
                 continue
-            game_model = create_oddsportal_game_model(
-                self.session,
-                urllib.parse.urljoin(base_url, jsonld["url"]),
-                self.league,
-                True,
-            )
-            pbar.update(1)
-            pbar.set_description(f"OddsPortal {game_model.dt}")
-            yield game_model
+            try:
+                game_model = create_oddsportal_game_model(
+                    self.session,
+                    urllib.parse.urljoin(base_url, jsonld["url"]),
+                    self.league,
+                    True,
+                )
+                pbar.update(1)
+                pbar.set_description(
+                    f"OddsPortal {game_model.year} - {game_model.season_type} - {game_model.dt}"
+                )
+                yield game_model
+            except requests.exceptions.HTTPError as exc:
+                if exc.response.status_code == http.HTTPStatus.NOT_FOUND:
+                    logging.warning("Failed to find game at: %s", jsonld["url"])
+                    continue
+                raise exc
 
     def _find_previous(self, pbar: tqdm.tqdm) -> Iterator[GameModel]:
         seen_urls = set()

{sportsball-0.3.22 → sportsball-0.3.24/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.3.22 → sportsball-0.3.24}/sportsball.egg-info/SOURCES.txt

@@ -159,6 +159,7 @@ tests/data/social_model_test.py
 tests/data/team_model_test.py
 tests/data/afl/__init__.py
 tests/data/afl/afltables/__init__.py
+tests/data/afl/afltables/afl_afltables_league_model_test.py
 tests/data/afl/afltables/afl_afltables_player_model_test.py
 tests/data/aussportsbetting/__init__.py
 tests/data/aussportsbetting/aussportsbetting_game_model_test.py

sportsball-0.3.24/tests/data/afl/afltables/afl_afltables_league_model_test.py

@@ -0,0 +1,16 @@
+"""Tests for the afltables league model class."""
+import unittest
+
+import requests_cache
+from sportsball.data.afl.afltables.afl_afltables_league_model import AFLAFLTablesLeagueModel
+from sportsball.data.league import League
+
+
+class TestAFLTablesLeagueModel(unittest.TestCase):
+
+    def setUp(self):
+        self._session = requests_cache.CachedSession(backend="memory")
+        self._league_model = AFLAFLTablesLeagueModel(self._session)
+
+    def test_league(self):
+        self.assertEqual(self._league_model.league, League.AFL)