sportsball 0.3.25__tar.gz → 0.3.26__tar.gz

{sportsball-0.3.25/sportsball.egg-info → sportsball-0.3.26}/PKG-INFO

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

{sportsball-0.3.25 → sportsball-0.3.26}/setup.py

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

{sportsball-0.3.25 → sportsball-0.3.26}/sportsball/__init__.py

@@ -1,3 +1,3 @@
 """The main module for sportsball."""
 
-__VERSION__ = "0.3.25"
+__VERSION__ = "0.3.26"

{sportsball-0.3.25 → sportsball-0.3.26}/sportsball/data/google/google_address_model.py

@@ -1297,6 +1297,87 @@ ROSS_E_TEMPLETON_CENTER = SportsballGeocodeTuple(
     housenumber="503",
     country="USA",
 )
+LEVIEN_GYM = SportsballGeocodeTuple(
+    city="New York",
+    state="NY",
+    postal="",
+    lat=40.80979,
+    lng=-73.961715,
+    housenumber="3030",
+    country="USA",
+)
+CRISLER_CENTER = SportsballGeocodeTuple(
+    city="Ann Arbor",
+    state="MI",
+    postal="48104",
+    lat=42.265037,
+    lng=-83.746768,
+    housenumber="333",
+    country="USA",
+)
+HYNES_ATHELTIC_CENTER = SportsballGeocodeTuple(
+    city="New Rochelle",
+    state="NY",
+    postal="",
+    lat=40.92664,
+    lng=-73.784325,
+    housenumber="",
+    country="USA",
+)
+OLE_MISS = SportsballGeocodeTuple(
+    city="Oxford",
+    state="MS",
+    postal="38677",
+    lat=34.363164,
+    lng=-89.535453,
+    housenumber="",
+    country="USA",
+)
+HOLMES_CENTER = SportsballGeocodeTuple(
+    city="Boone",
+    state="NC",
+    postal="28608",
+    lat=36.210624,
+    lng=-81.675952,
+    housenumber="111",
+    country="USA",
+)
+FARRIS_CENTER = SportsballGeocodeTuple(
+    city="Conway",
+    state="AR",
+    postal="",
+    lat=35.081667,
+    lng=-92.459444,
+    housenumber="",
+    country="USA",
+)
+HTC_CENTER = SportsballGeocodeTuple(
+    city="Conway",
+    state="SC",
+    postal="29579",
+    lat=33.799167,
+    lng=-79.015556,
+    housenumber="104",
+    country="USA",
+)
+GERSTEN_PAVILION = SportsballGeocodeTuple(
+    city="Los Angeles",
+    state="CA",
+    postal="90045",
+    lat=33.9675,
+    lng=-118.415556,
+    housenumber="1",
+    country="USA",
+)
+BOGOTA_SAVINGS_BANK_CENTER = SportsballGeocodeTuple(
+    city="Teaneck",
+    state="NJ",
+    postal="07601",
+    lat=40.8967,
+    lng=-74.0324,
+    housenumber="",
+    country="USA",
+)
 _CACHED_GEOCODES: dict[str, Any] = {
     "S.C.G. - Australia": SCG,
     "Victoria Park - Australia": SportsballGeocodeTuple(
@@ -3510,15 +3591,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="",
         country="USA",
     ),
-    "The HTC Center, Conway, South Carolina": SportsballGeocodeTuple(
-        city="Conway",
-        state="SC",
-        postal="29579",
-        lat=33.799167,
-        lng=-79.015556,
-        housenumber="104",
-        country="USA",
-    ),
+    "The HTC Center, Conway, South Carolina": HTC_CENTER,
     "Daskalakis Athletic Center, Philadelphia, Pennsylvania": SportsballGeocodeTuple(
         city="Philadelphia",
         state="PA",
@@ -3546,15 +3619,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="100",
         country="USA",
     ),
-    "Hynes Athletics Center, New Rochelle, New York": SportsballGeocodeTuple(
-        city="New Rochelle",
-        state="NY",
-        postal="",
-        lat=40.92664,
-        lng=-73.784325,
-        housenumber="",
-        country="USA",
-    ),
+    "Hynes Athletics Center, New Rochelle, New York": HYNES_ATHELTIC_CENTER,
     "Swisher Gymnasium, Jacksonville, Florida": SportsballGeocodeTuple(
         city="Jacksonville",
         state="FL",
@@ -3783,15 +3848,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="1250",
         country="USA",
     ),
-    "Albert Gersten Pavilion, Los Angeles, California": SportsballGeocodeTuple(
-        city="Los Angeles",
-        state="CA",
-        postal="90045",
-        lat=33.9675,
-        lng=-118.415556,
-        housenumber="1",
-        country="USA",
-    ),
+    "Albert Gersten Pavilion, Los Angeles, California": GERSTEN_PAVILION,
     "Firestone Fieldhouse, Malibu, California": SportsballGeocodeTuple(
         city="Malibu",
         state="CA",
@@ -4661,15 +4718,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="900",
         country="USA",
     ),
-    "Crisler Arena, Ann Arbor, Michigan": SportsballGeocodeTuple(
-        city="Ann Arbor",
-        state="MI",
-        postal="48104",
-        lat=42.265037,
-        lng=-83.746768,
-        housenumber="333",
-        country="USA",
-    ),
+    "Crisler Arena, Ann Arbor, Michigan": CRISLER_CENTER,
     "FAU Arena, Boca Raton, Florida": SportsballGeocodeTuple(
         city="Boca Raton",
         state="FL",
@@ -4706,15 +4755,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="1615",
         country="USA",
     ),
-    "Bogota Savings Bank Center, Teaneck, New Jersey": SportsballGeocodeTuple(
-        city="Teaneck",
-        state="NJ",
-        postal="07601",
-        lat=40.8967,
-        lng=-74.0324,
-        housenumber="",
-        country="USA",
-    ),
+    "Bogota Savings Bank Center, Teaneck, New Jersey": BOGOTA_SAVINGS_BANK_CENTER,
     "Emil and Patricia Jones Convocation Center, Chicago, Illinois": SportsballGeocodeTuple(
         city="Chicago",
         state="IL",
@@ -4862,15 +4903,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         country="USA",
     ),
     "FedExForum, Memphis, Tennessee": FEDEX_FORUM,
-    "The Pavilion at Ole Miss, Oxford, Mississippi": SportsballGeocodeTuple(
-        city="Oxford",
-        state="MS",
-        postal="38677",
-        lat=34.363164,
-        lng=-89.535453,
-        housenumber="",
-        country="USA",
-    ),
+    "The Pavilion at Ole Miss, Oxford, Mississippi": OLE_MISS,
     "Dee Glen Smith Spectrum, Logan, Utah": SportsballGeocodeTuple(
         city="Logan",
         state="UT",
@@ -4880,15 +4913,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="900",
         country="USA",
     ),
-    "Holmes Convocation Center, Boone, North Carolina": SportsballGeocodeTuple(
-        city="Boone",
-        state="NC",
-        postal="28608",
-        lat=36.210624,
-        lng=-81.675952,
-        housenumber="111",
-        country="USA",
-    ),
+    "Holmes Convocation Center, Boone, North Carolina": HOLMES_CENTER,
     "Leede Arena, Hanover, New Hampshire": SportsballGeocodeTuple(
         city="Hanover",
         state="NH",
@@ -5177,15 +5202,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="13",
         country="USA",
     ),
-    "Levien Gym, New York, New York": SportsballGeocodeTuple(
-        city="New York",
-        state="NY",
-        postal="",
-        lat=40.80979,
-        lng=-73.961715,
-        housenumber="3030",
-        country="USA",
-    ),
+    "Levien Gym, New York, New York": LEVIEN_GYM,
     "Belk Arena, Davidson, North Carolina": SportsballGeocodeTuple(
         city="Davidson",
         state="NC",
@@ -6129,15 +6146,7 @@ _CACHED_GEOCODES: dict[str, Any] = {
         housenumber="4400",
         country="USA",
     ),
-    "Jeff Farris Center, Conway, Arkansas": SportsballGeocodeTuple(
-        city="Conway",
-        state="AR",
-        postal="",
-        lat=35.081667,
-        lng=-92.459444,
-        housenumber="",
-        country="USA",
-    ),
+    "Jeff Farris Center, Conway, Arkansas": FARRIS_CENTER,
     "TD Arena, Charleston, South Carolina": SportsballGeocodeTuple(
         city="Charleston",
         state="SC",
@@ -7487,6 +7496,186 @@ _CACHED_GEOCODES: dict[str, Any] = {
         country="USA",
     ),
     "Ross E. Templeton Center, Clinton, South Carolina": ROSS_E_TEMPLETON_CENTER,
+    "PPG Paints Arena, Pittsburgh, Pennsylvania": SportsballGeocodeTuple(
+        city="Pittsburgh",
+        state="PA",
+        postal="",
+        lat=40.439444,
+        lng=-79.989167,
+        housenumber="1001",
+        country="USA",
+    ),
+    "Levien Gymnasium, New York, New York": LEVIEN_GYM,
+    "Simon Skjodt Assembly Hall, Bloomington, Indiana": SportsballGeocodeTuple(
+        city="Bloomington",
+        state="IN",
+        postal="47408",
+        lat=39.1808334,
+        lng=-86.522222,
+        housenumber="1001",
+        country="USA",
+    ),
+    "Crisler Center, Ann Arbor, Michigan": CRISLER_CENTER,
+    "Jersey Mike's Arena, New Brunswick, New Jersey": SportsballGeocodeTuple(
+        city="New Brunswick",
+        state="NJ",
+        postal="08854",
+        lat=40.525278,
+        lng=-74.441111,
+        housenumber="83",
+        country="USA",
+    ),
+    "Fertitta Center, Houston, Texas": SportsballGeocodeTuple(
+        city="Houston",
+        state="TX",
+        postal="77004",
+        lat=29.724722,
+        lng=-95.346944,
+        housenumber="3875",
+        country="USA",
+    ),
+    "UMPC Cooper Fieldhouse, Pittsburgh, Pennsylvania": SportsballGeocodeTuple(
+        city="Pittsburgh",
+        state="PA",
+        postal="15282",
+        lat=40.4374,
+        lng=-79.9879,
+        housenumber="600",
+        country="USA",
+    ),
+    "Davey Whitney Complex, Alcorn State, Mississippi": SportsballGeocodeTuple(
+        city="Alcorn State",
+        state="MS",
+        postal="",
+        lat=31.873225,
+        lng=-91.13318,
+        housenumber="",
+        country="USA",
+    ),
+    "John J. Lee Amphitheater, New Haven, Connecticut": SportsballGeocodeTuple(
+        city="New Haven",
+        state="CT",
+        postal="06511",
+        lat=41.313611,
+        lng=-72.930556,
+        housenumber="70",
+        country="USA",
+    ),
+    "Hynes Athletic Center, New Rochelle, New York": HYNES_ATHELTIC_CENTER,
+    "The Sandy and John Black Pavilion at Ole Miss, Oxford, Mississippi": OLE_MISS,
+    "Moscow, Idaho": SportsballGeocodeTuple(
+        city="Moscow",
+        state="ID",
+        postal="",
+        lat=46.741667,
+        lng=-117.0,
+        housenumber="",
+        country="USA",
+    ),
+    "Ocean Bank Convocation Center, Miami, Florida": SportsballGeocodeTuple(
+        city="Miami",
+        state="FL",
+        postal="33199",
+        lat=25.756667,
+        lng=-80.379444,
+        housenumber="11200",
+        country="USA",
+    ),
+    "Island Federal Credit Union Arena, Stony Brook, New York": SportsballGeocodeTuple(
+        city="Stony Brook",
+        state="NY",
+        postal="11790",
+        lat=40.91741,
+        lng=-73.125955,
+        housenumber="100",
+        country="USA",
+    ),
+    "Phoenix, Arizona": SportsballGeocodeTuple(
+        city="Phoenix",
+        state="AZ",
+        postal="",
+        lat=33.448333,
+        lng=-112.073889,
+        housenumber="",
+        country="USA",
+    ),
+    "Evansville, Indiana": SportsballGeocodeTuple(
+        city="Evansville",
+        state="IN",
+        postal="",
+        lat=37.977222,
+        lng=-87.550556,
+        housenumber="",
+        country="USA",
+    ),
+    "America First Event Center, Cedar City, Utah": SportsballGeocodeTuple(
+        city="Cedar City",
+        state="UT",
+        postal="84720",
+        lat=37.675556,
+        lng=-113.073056,
+        housenumber="351",
+        country="USA",
+    ),
+    "St. Paul, Minnesota": SportsballGeocodeTuple(
+        city="St. Paul",
+        state="MN",
+        postal="",
+        lat=44.947778,
+        lng=-93.103889,
+        housenumber="",
+        country="USA",
+    ),
+    "Jenny Craig Pavilion, San Diego, California": SportsballGeocodeTuple(
+        city="San Diego",
+        state="CA",
+        postal="",
+        lat=32.7745,
+        lng=-117.1837,
+        housenumber="5998",
+        country="USA",
+    ),
+    "George M. Holmes Convocation Center, Boone, North Carolina": HOLMES_CENTER,
+    "Farris Center, Conway, Arkansas": FARRIS_CENTER,
+    "HTC Center, Conway, South Carolina": HTC_CENTER,
+    "Atlanta, Georgia": SportsballGeocodeTuple(
+        city="Atlanta",
+        state="GA",
+        postal="",
+        lat=33.748889,
+        lng=-84.39,
+        housenumber="",
+        country="USA",
+    ),
+    "UNF Arena, Jacksonville, Florida": SportsballGeocodeTuple(
+        city="Jacksonville",
+        state="FL",
+        postal="32224",
+        lat=30.2734,
+        lng=-81.5079,
+        housenumber="11852",
+        country="USA",
+    ),
+    "Strahan Arena, San Marcos, Texas": SportsballGeocodeTuple(
+        city="San Marcos",
+        state="TX",
+        postal="78666",
+        lat=29.888611,
+        lng=-97.932778,
+        housenumber="601",
+        country="USA",
+    ),
+    "Wellness and Events Center, Newark, New Jersey": SportsballGeocodeTuple(
+        city="Newark",
+        state="NJ",
+        postal="07102",
+        lat=40.7453,
+        lng=-74.183,
+        housenumber="100",
+        country="USA",
+    ),
+    "Gersten Pavilion, Los Angeles, California": GERSTEN_PAVILION,
+    "Rothman Center, Teaneck, New Jersey": BOGOTA_SAVINGS_BANK_CENTER,
 }
 
 

{sportsball-0.3.25 → sportsball-0.3.26}/sportsball/data/oddsportal/oddsportal_game_model.py

@@ -1,6 +1,6 @@
 """OddsPortal game model."""
 
-# pylint: disable=too-many-locals
+# pylint: disable=too-many-locals,too-many-statements
 import datetime
 import json
 import urllib.parse
@@ -21,7 +21,7 @@ def _create_oddsportal_game_model(
     url: str,
     league: League,
 ) -> GameModel:
-    response = session.get(url)
+    response = session.get(url, headers={"X-No-Wayback": "1"})
     response.raise_for_status()
 
     soup = BeautifulSoup(response.text, "html.parser")
@@ -76,17 +76,21 @@ def _create_oddsportal_game_model(
     if event_body["awayResult"] != "":
         away_points = float(event_body["awayResult"])
 
-    return GameModel(
-        dt=dt,
-        week=None,
-        game_number=None,
-        venue=create_oddsportal_venue_model(
+    venue = None
+    if event_body["venue"] and event_body["venueTown"] and event_body["venueCountry"]:
+        venue = create_oddsportal_venue_model(
             session,
             dt,
             event_body["venue"],
             event_body["venueTown"],
             event_body["venueCountry"],
-        ),
+        )
+
+    return GameModel(
+        dt=dt,
+        week=None,
+        game_number=None,
+        venue=venue,
         teams=[
             create_oddsportal_team_model(
                 session,

{sportsball-0.3.25 → sportsball-0.3.26}/sportsball/data/oddsportal/oddsportal_league_model.py

@@ -1,5 +1,6 @@
 """Odds Portal league model."""
 
+# pylint: disable=too-many-locals,too-many-branches,too-many-statements
 import http
 import json
 import logging
@@ -74,15 +75,16 @@ class OddsPortalLeagueModel(LeagueModel):
                 raise exc
 
     def _find_previous(self, pbar: tqdm.tqdm) -> Iterator[GameModel]:
+        standard_suffix = self._path + "results/"
         seen_urls = set()
-        queued_urls = {"https://www.oddsportal.com/" + self._path + "results/"}
+        queued_urls = {"https://www.oddsportal.com/" + standard_suffix}
         while queued_urls:
             url = queued_urls.pop()
             if url in seen_urls:
                 continue
             seen_urls.add(url)
 
-            if url.endswith("results/"):
+            if url.endswith(standard_suffix):
                 with self.session.cache_disabled():
                     response = self.session.get(url)
             else:
@@ -92,24 +94,55 @@ class OddsPortalLeagueModel(LeagueModel):
             soup = BeautifulSoup(response.text, "html.parser")
 
             # Find next URLs
-            for a in soup.find_all("a", href=True):
-                next_url = urllib.parse.urljoin(url, a.get("href"))
-                if next_url.endswith("/results/"):
+            for option in soup.find_all("option"):
+                next_url = urllib.parse.urljoin(url, option.get("value"))
+                if next_url.endswith("/results/") and self._path[:-1] in next_url:
                     queued_urls.add(next_url)
 
             # Paginate through results
             while True:
+                game_urls = set()
+
+                # Check the react tags
                 tournament_component = soup.find("tournament-component")
-                if not isinstance(tournament_component, Tag):
-                    raise ValueError("tournament_component is not a tag.")
-                matches = json.loads(str(tournament_component[":sport-data"]))
-                component = matches.get("tournamentGamesComponent", matches.get("d"))
-                if component.get("total") == 0:
-                    break
-                for match in component.get("rows", []):
+                if isinstance(tournament_component, Tag):
+                    matches = json.loads(str(tournament_component[":sport-data"]))
+                    component = matches.get(
+                        "tournamentGamesComponent", matches.get("d")
+                    )
+                    if component.get("total") != 0:
+                        game_urls = {
+                            urllib.parse.urljoin(url, x["url"])
+                            for x in component.get("rows", [])
+                        }
+                if not game_urls:
+                    for a in soup.find_all("a", href=True):
+                        game_url = urllib.parse.urljoin(url, a.get("href"))
+                        if (
+                            game_url.endswith("results/")
+                            or game_url.endswith("standings/")
+                            or game_url.endswith(self._path)
+                            or game_url.endswith("outrights/")
+                        ):
+                            continue
+                        if self._path[:-1] in game_url:
+                            game_urls.add(game_url)
+
+                for game_url in game_urls:
+                    if "#" in game_url:
+                        continue
+                    if (
+                        game_url.replace("results/", "") == url
+                        or game_url.replace("results/", "") in queued_urls
+                    ):
+                        continue
+                    if game_url.endswith("/archive/"):
+                        continue
+                    if len(game_url.split("/")) != 8:
+                        continue
                     game_model = create_oddsportal_game_model(
                         self.session,
-                        urllib.parse.urljoin(url, match["url"]),
+                        game_url,
                         self.league,
                         False,
                     )

{sportsball-0.3.25 → sportsball-0.3.26}/sportsball/proxy_session.py

@@ -31,6 +31,7 @@ FAST_FAIL_DOMAINS = [
     "https://news.google.com/",
     "https://historical-forecast-api.open-meteo.com/",
 ]
+X_NO_WAYBACK = "x-no-wayback"
 
 
 def _is_fast_fail_url(url: str | None) -> bool:
@@ -119,7 +120,10 @@ class ProxySession(requests_cache.CachedSession):
                     response.request = prepared_request
 
                     return response
-        except wayback.exceptions.MementoPlaybackError:  # pyright: ignore
+        except (
+            wayback.exceptions.MementoPlaybackError,  # pyright: ignore
+            requests.exceptions.ChunkedEncodingError,
+        ):  # pyright: ignore
             pass
         return None
 
@@ -127,6 +131,11 @@ class ProxySession(requests_cache.CachedSession):
     def _perform_timeout_send(self, request: requests.PreparedRequest, **kwargs) -> Any:
         key = self.cache.create_key(request)
 
+        no_wayback = False
+        if X_NO_WAYBACK in request.headers:
+            no_wayback = request.headers.get(X_NO_WAYBACK) == "1"
+            del request.headers[X_NO_WAYBACK]
+
         if not self.settings.disabled:
             # Check the cache
             cached_response = self.cache.get_response(key)
@@ -136,7 +145,7 @@ class ProxySession(requests_cache.CachedSession):
             logging.info("Request for %s not cached.", request.url)
 
             # Otherwise check the wayback machine
-            if not _is_fast_fail_url(request.url):
+            if not _is_fast_fail_url(request.url) and no_wayback:
                 response = self._wayback_machine_request(
                     request.method, request.url, headers=request.headers
                 )

{sportsball-0.3.25 → sportsball-0.3.26/sportsball.egg-info}/PKG-INFO

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