sportsball 0.7.8__tar.gz → 0.8.0__tar.gz

{sportsball-0.7.8/sportsball.egg-info → sportsball-0.8.0}/PKG-INFO

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

{sportsball-0.7.8 → sportsball-0.8.0}/setup.py

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

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/__init__.py

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

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/data/afl/afltables/afl_afltables_league_model.py

@@ -61,7 +61,7 @@ class AFLAFLTablesLeagueModel(LeagueModel):
         with self.session.wayback_disabled():
             if year >= datetime.datetime.now().year - 1:
                 with self.session.cache_disabled():
-                        response = self.session.get(season_url)
+                    response = self.session.get(season_url)
             else:
                 response = self.session.get(season_url)
 

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/data/hkjc/hkjc/hkjc_hkjc_owner_model.py

@@ -4,7 +4,7 @@ import logging
 import urllib.parse
 from urllib.parse import urlparse
 
-from ...owner_model import OwnerModel
+from ...owner_model import VERSION, OwnerModel
 
 
 def create_hkjc_hkjc_owner_model(
@@ -22,4 +22,5 @@ def create_hkjc_hkjc_owner_model(
     return OwnerModel(
         identifier=name,
         name=name,
+        version=VERSION,
     )

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/data/league_model.py

@@ -208,10 +208,6 @@ class LeagueModel(Model):
             df = _normalize_tz(df)
 
             if GAME_DT_COLUMN in df.columns.values:
-                # df[GAME_DT_COLUMN] = pd.to_datetime(df[GAME_DT_COLUMN])
-                # naive_times = df[df[GAME_DT_COLUMN].dt.tz.isna()]
-                # print("naive_times:")
-                # print(naive_times)
                 df = df.sort_values(
                     by=GAME_DT_COLUMN,
                     ascending=True,

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/data/nba/sportsdb/nba_sportsdb_league_model.py

@@ -11,3 +11,7 @@ class NBASportsDBLeagueModel(SportsDBLeagueModel):
 
     def __init__(self, session: ScrapeSession, position: int | None = None) -> None:
         super().__init__(session, "4387", League.NBA, position=position)
+
+    @classmethod
+    def name(cls) -> str:
+        return "nba-sportsdb-league-model"

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/data/ncaab/combined/ncaab_combined_league_model.py

@@ -7,6 +7,7 @@ from ...league import League
 from ..espn.ncaab_espn_league_model import NCAABESPNLeagueModel
 from ..oddsportal.ncaab_oddsportal_league_model import \
     NCAABOddsPortalLeagueModel
+from ..sportsdb.ncaab_sportsdb_league_model import NCAABSportsDBLeagueModel
 from ..sportsreference.ncaab_sportsreference_league_model import \
     NCAABSportsReferenceLeagueModel
 
@@ -755,6 +756,7 @@ class NCAABCombinedLeagueModel(CombinedLeagueModel):
                 NCAABSportsReferenceLeagueModel(session, position=0),
                 NCAABESPNLeagueModel(session, position=1),
                 NCAABOddsPortalLeagueModel(session, position=2),
+                NCAABSportsDBLeagueModel(session, position=3),
             ],
             league_filter,
         )

sportsball-0.8.0/sportsball/data/ncaab/sportsdb/ncaab_sportsdb_league_model.py

@@ -0,0 +1,17 @@
+"""NCAAB Sports DB league model."""
+
+from scrapesession.scrapesession import ScrapeSession  # type: ignore
+
+from ...league import League
+from ...sportsdb.sportsdb_league_model import SportsDBLeagueModel
+
+
+class NCAABSportsDBLeagueModel(SportsDBLeagueModel):
+    """NCAAB SportsDB implementation of the league model."""
+
+    def __init__(self, session: ScrapeSession, position: int | None = None) -> None:
+        super().__init__(session, "4607", League.NCAAB, position=position)
+
+    @classmethod
+    def name(cls) -> str:
+        return "ncaab-sportsdb-league-model"

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/data/ncaaf/combined/ncaaf_combined_league_model.py

@@ -7,6 +7,7 @@ from ...league import League
 from ..espn.ncaaf_espn_league_model import NCAAFESPNLeagueModel
 from ..oddsportal.ncaaf_oddsportal_league_model import \
     NCAAFOddsPortalLeagueModel
+from ..sportsdb.ncaaf_sportsdb_league_model import NCAAFSportsDBLeagueModel
 
 NCAAF_TEAM_IDENTITY_MAP: dict[str, str] = {}
 NCAAF_VENUE_IDENTITY_MAP: dict[str, str] = {}
@@ -23,6 +24,7 @@ class NCAAFCombinedLeagueModel(CombinedLeagueModel):
             [
                 NCAAFESPNLeagueModel(session, position=0),
                 NCAAFOddsPortalLeagueModel(session, position=1),
+                NCAAFSportsDBLeagueModel(session, position=2),
             ],
             league_filter,
         )

sportsball-0.8.0/sportsball/data/ncaaf/sportsdb/ncaaf_sportsdb_league_model.py

@@ -0,0 +1,17 @@
+"""NCAAF Sports DB league model."""
+
+from scrapesession.scrapesession import ScrapeSession  # type: ignore
+
+from ...league import League
+from ...sportsdb.sportsdb_league_model import SportsDBLeagueModel
+
+
+class NCAAFSportsDBLeagueModel(SportsDBLeagueModel):
+    """NCAAf SportsDB implementation of the league model."""
+
+    def __init__(self, session: ScrapeSession, position: int | None = None) -> None:
+        super().__init__(session, "4479", League.NCAAF, position=position)
+
+    @classmethod
+    def name(cls) -> str:
+        return "ncaaf-sportsdb-league-model"

sportsball-0.8.0/sportsball/data/owner_model.py

@@ -0,0 +1,44 @@
+"""The prototype class for an owner."""
+
+# pylint: disable=duplicate-code
+from typing import Any, Literal
+
+from pydantic import BaseModel, Field
+
+from .field_type import FFILL_KEY, TYPE_KEY, FieldType
+from .sex import (FEMALE_GENDERS, GENDER_DETECTOR, MALE_GENDERS,
+                  UNCERTAIN_GENDERS, Sex)
+
+OWNER_IDENTIFIER_COLUMN: Literal["identifier"] = "identifier"
+OWNER_NAME_COLUMN: Literal["name"] = "name"
+OWNER_SEX_COLUMN: Literal["sex"] = "sex"
+VERSION = "0.0.1"
+
+
+def _guess_sex(data: dict[str, Any]) -> str | None:
+    name = data[OWNER_NAME_COLUMN]
+    gender_tag = GENDER_DETECTOR.get_gender(name)
+    if gender_tag in MALE_GENDERS:
+        return str(Sex.MALE)
+    if gender_tag in FEMALE_GENDERS:
+        return str(Sex.FEMALE)
+    if gender_tag in UNCERTAIN_GENDERS:
+        return None
+    return None
+
+
+class OwnerModel(BaseModel):
+    """The serialisable owner class."""
+
+    identifier: str = Field(
+        ...,
+        json_schema_extra={TYPE_KEY: FieldType.CATEGORICAL},
+        alias=OWNER_IDENTIFIER_COLUMN,
+    )
+    name: str = Field(..., alias=OWNER_NAME_COLUMN)
+    sex: str | None = Field(
+        default_factory=_guess_sex,
+        json_schema_extra={TYPE_KEY: FieldType.CATEGORICAL, FFILL_KEY: True},
+        alias=OWNER_SEX_COLUMN,
+    )
+    version: str

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/data/player_model.py

@@ -12,6 +12,7 @@ from .address_model import VERSION as ADDRESS_VERSION
 from .address_model import AddressModel
 from .delimiter import DELIMITER
 from .field_type import FFILL_KEY, TYPE_KEY, FieldType
+from .owner_model import VERSION as OWNER_VERSION
 from .owner_model import OwnerModel
 from .sex import (FEMALE_GENDERS, GENDER_DETECTOR, MALE_GENDERS,
                   UNCERTAIN_GENDERS, Sex)
@@ -90,7 +91,7 @@ PLAYER_PERSONAL_FOULS_COLUMN: Literal["personal_fouls"] = "personal_fouls"
 PLAYER_POINTS_COLUMN: Literal["points"] = "points"
 PLAYER_GAME_SCORE_COLUMN: Literal["game_score"] = "game_score"
 PLAYER_POINT_DIFFERENTIAL_COLUMN: Literal["point_differential"] = "point_differential"
-VERSION = DELIMITER.join(["0.0.1", ADDRESS_VERSION])
+VERSION = DELIMITER.join(["0.0.1", ADDRESS_VERSION, OWNER_VERSION])
 
 
 def _guess_sex(data: dict[str, Any]) -> str | None:

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball/data/sportsdb/sportsdb_league_model.py

@@ -2,9 +2,12 @@
 
 # pylint: disable=line-too-long
 import datetime
+import io
 from typing import Iterator
 
+import pandas as pd
 import tqdm
+from bs4 import BeautifulSoup
 from scrapesession.scrapesession import ScrapeSession  # type: ignore
 
 from ..game_model import GameModel
@@ -54,6 +57,8 @@ class SportsDBLeagueModel(LeagueModel):
             events = games["events"]
             if events is None:
                 return
+            event_ids = set()
+            current_count = 0
             for count, game in enumerate(events):
                 pbar.update(1)
                 game_model = create_sportsdb_game_model(
@@ -69,6 +74,47 @@ class SportsDBLeagueModel(LeagueModel):
                     f"SportsDB {season_year} - {season_type} - {game_model.dt}"
                 )
                 yield game_model
+                event_ids.add(game["idEvent"])
+                current_count = count
+            response = self.session.get(
+                f"https://www.thesportsdb.com/season/{league_id}/{season_year}?csv=1&all=1",
+            )
+            response.raise_for_status()
+            soup = BeautifulSoup(response.text, "lxml")
+            for textarea in soup.find_all("textarea"):
+                df = pd.read_csv(
+                    io.BytesIO(textarea.get_text().strip().encode()),
+                    parse_dates=[1],
+                    header=None,
+                ).rename(
+                    columns={
+                        0: "idEvent",
+                        1: "dateEvent",
+                    }
+                )
+                for game_id in df["idEvent"].tolist():
+                    if game_id in event_ids:
+                        continue
+                    game_response = self.session.get(
+                        f"https://www.thesportsdb.com/api/v1/json/123/lookupevent.php?id={game_id}"
+                    )
+                    game_response.raise_for_status()
+                    game = game_response.json()["events"][0]
+                    pbar.update(1)
+                    game_model = create_sportsdb_game_model(
+                        self.session,
+                        game,
+                        week,
+                        current_count,
+                        self.league,
+                        year,
+                        season_type,
+                    )
+                    pbar.set_description(
+                        f"SportsDB {season_year} - {season_type} - {game_model.dt}"
+                    )
+                    yield game_model
+                    current_count += 1
 
         if year < datetime.datetime.now().year - 1:
             yield from internal_produce_games()

{sportsball-0.7.8 → sportsball-0.8.0/sportsball.egg-info}/PKG-INFO

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

{sportsball-0.7.8 → sportsball-0.8.0}/sportsball.egg-info/SOURCES.txt

@@ -138,6 +138,8 @@ sportsball/data/ncaab/espn/__init__.py
 sportsball/data/ncaab/espn/ncaab_espn_league_model.py
 sportsball/data/ncaab/oddsportal/__init__.py
 sportsball/data/ncaab/oddsportal/ncaab_oddsportal_league_model.py
+sportsball/data/ncaab/sportsdb/__init__.py
+sportsball/data/ncaab/sportsdb/ncaab_sportsdb_league_model.py
 sportsball/data/ncaab/sportsreference/__init__.py
 sportsball/data/ncaab/sportsreference/ncaab_sportsreference_league_model.py
 sportsball/data/ncaaf/__init__.py
@@ -147,6 +149,8 @@ sportsball/data/ncaaf/espn/__init__.py
 sportsball/data/ncaaf/espn/ncaaf_espn_league_model.py
 sportsball/data/ncaaf/oddsportal/__init__.py
 sportsball/data/ncaaf/oddsportal/ncaaf_oddsportal_league_model.py
+sportsball/data/ncaaf/sportsdb/__init__.py
+sportsball/data/ncaaf/sportsdb/ncaaf_sportsdb_league_model.py
 sportsball/data/nfl/__init__.py
 sportsball/data/nfl/position.py
 sportsball/data/nfl/aussportsbetting/__init__.py

sportsball-0.7.8/sportsball/data/owner_model.py

@@ -1,21 +0,0 @@
-"""The prototype class for an owner."""
-
-from typing import Literal
-
-from pydantic import BaseModel, Field
-
-from .field_type import TYPE_KEY, FieldType
-
-OWNER_IDENTIFIER_COLUMN: Literal["identifier"] = "identifier"
-OWNER_NAME_COLUMN: Literal["name"] = "name"
-
-
-class OwnerModel(BaseModel):
-    """The serialisable owner class."""
-
-    identifier: str = Field(
-        ...,
-        json_schema_extra={TYPE_KEY: FieldType.CATEGORICAL},
-        alias=OWNER_IDENTIFIER_COLUMN,
-    )
-    name: str = Field(..., alias=OWNER_NAME_COLUMN)