wsba-hockey 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

wsba_hockey/__init__.py

@@ -7,6 +7,7 @@ from wsba_hockey.wsba_main import (
     nhl_scrape_roster,
     nhl_scrape_draft_rankings,
     nhl_scrape_prospects,
+    nhl_scrape_team_info,
     nhl_scrape_game_info,
     nhl_calculate_stats,
     nhl_apply_xG,

wsba_hockey/tools/game_pred.py

@@ -0,0 +1,33 @@
+import joblib
+import os
+import pandas as pd
+import numpy as np
+import xgboost as xgb
+import scipy.sparse as sp
+import wsba_hockey.wsba_main as wsba
+import wsba_hockey.tools.scraping as scraping
+import matplotlib.pyplot as plt
+from sklearn.calibration import calibration_curve
+from sklearn.metrics import roc_curve, auc
+
+### GAME PREDICTION MODEL FUNCTIONS ###
+# Provided in this file are functions vital to the game prediction model in the WSBA Hockey Python package. #
+
+## GLOBAL VARIABLES ##
+dir = os.path.dirname(os.path.realpath(__file__))
+roster_path = os.path.join(dir,'rosters\\nhl_rosters.csv')
+schedule_path = os.path.join(dir,'schedule/schedule.csv')
+
+def prep_game_data(pbp):
+    #Prepare schedule data for model development given full-season pbp
+
+    #Calculate necessary team stats (by game) for the prediction model
+    #The model will evaluate based on three different qualities for valid EV, PP, and SH strength 
+    dfs = []
+    for strength in [['5v5'],['5v4'],['4v5']]:
+        team_games = wsba.nhl_calculate_stats(pbp,'team',[2,3],strength,True)
+        team_games['Year'] = team_games['Season'].str[0:4].astype(int)
+        dfs.append(team_games)
+
+    #Place the games in order and create sums for 
+    df = pd.concat(dfs).sort_values(by=['Year','Game'])

wsba_hockey/wsba_main.py

@@ -105,7 +105,7 @@ KNOWN_PROBS = {
 
 SHOT_TYPES = ['wrist','deflected','tip-in','slap','backhand','snap','wrap-around','poke','bat','cradle','between-legs']
 
-NEW = 2024
+NEW = 2025
 
 EVENTS = ['faceoff','hit','giveaway','takeaway','blocked-shot','missed-shot','shot-on-goal','goal','penalty']
 
@@ -459,14 +459,14 @@ def nhl_scrape_seasons_info(seasons:list[int] = []):
     else:
         return df.sort_values(by=['id'])
 
-def nhl_scrape_standings(arg:str | int = "now", season_type:int = 2):
+def nhl_scrape_standings(arg:int | list[int] | Literal['now'] = 'now', season_type:int = 2):
     """
     Returns standings or playoff bracket
     Args:
-        arg (str or int, optional):
-            Date formatted as 'YYYY-MM-DD' to scrape standings, NHL season such as "20242025", or 'now' for current standings. Default is 'now'.
+        arg (int or list[int] or str, optional):
+            Date formatted as 'YYYY-MM-DD' to scrape standings, NHL season such as "20242025", list of NHL seasons, or 'now' for current standings. Default is 'now'.
         season_type (int, optional):
-            Part of season to scrape.  If 3 (playoffs) then scrape the playoff bracket for the season implied by arg. When arg = 'now' this is ignored. Default is 2.
+            Part of season to scrape.  If 3 (playoffs) then scrape the playoff bracket for the season implied by arg. When arg = 'now' this is defaulted to the most recent playoff year.  Any dates passed through are parsed as seasons. Default is 2.
 
     Returns:
         pd.DataFrame: 
@@ -475,31 +475,59 @@ def nhl_scrape_standings(arg:str | int = "now", season_type:int = 2):
 
     if season_type == 3:
         if arg == "now":
-            arg = NEW
+            arg = [NEW]
+        elif type(arg) == int:
+            #Find year from season
+            arg = [str(arg)[4:8]]
+        elif type(arg) == list:
+            #Find year from seasons
+            arg = [str(s)[4:8] for s in arg]
+        else:
+            #Find year from season from date
+            arg = [int(arg[0:4])+1 if (9 < int(arg[5:7]) < 13) else int(arg[0:4])]
 
-        print(f"Scraping playoff bracket for date: {arg}")
-        api = f"https://api-web.nhle.com/v1/playoff-bracket/{arg}"
+        print(f"Scraping playoff bracket for season{'s' if len(arg)>1 else ''}: {arg}")
+        
+        dfs = []
+        for season in arg:
+            api = f"https://api-web.nhle.com/v1/playoff-bracket/{season}"
 
-        data = rs.get(api).json()['series']
+            data = rs.get(api).json()['series']
+            dfs.append(pd.json_normalize(data))
 
-        return pd.json_normalize(data)
+        #Return: playoff bracket
+        return pd.concat(dfs)
 
     else:
         if arg == "now":
             print("Scraping standings as of now...")
+            arg = [arg]
         elif arg in SEASONS:
             print(f'Scraping standings for season: {arg}')
+            arg = [arg]
+        elif type(arg) == list:
+            print(f'Scraping standings for seasons: {arg}')
         else:
             print(f"Scraping standings for date: {arg}")
+            arg = [arg]
+
+        dfs = []
+        for search in arg:
+            #If the end is an int then its a season otherwise it is either 'now' or a date as a string
+            if type(search) == int:
+                season_data = rs.get('https://api.nhle.com/stats/rest/en/season').json()['data']
+                season_data = [s for s in season_data if s['id'] == search][0]
+                end = season_data['regularSeasonEndDate'][0:10]
+            else:
+                end = search
+                
+            api = f"https://api-web.nhle.com/v1/standings/{end}"
 
-        season_data = rs.get('https://api.nhle.com/stats/rest/en/season').json()['data']
-        season_data = [s for s in season_data if s['id'] == arg][0]
-        end = season_data['regularSeasonEndDate'][0:10]
-
-        api = f"https://api-web.nhle.com/v1/standings/{end}"
-        data = rs.get(api).json()['standings']
+            data = rs.get(api).json()['standings']
+            dfs.append(pd.json_normalize(data))
 
-        return pd.json_normalize(data)
+        #Return: standings data
+        return pd.concat(dfs)
 
 def nhl_scrape_roster(season: int):
     """
@@ -627,7 +655,7 @@ def nhl_scrape_player_data(player_ids:list[int]):
     else:
         return pd.DataFrame()
 
-def nhl_scrape_draft_rankings(arg:str = 'now', category:int = 0):
+def nhl_scrape_draft_rankings(arg:str | Literal['now'] = 'now', category:int = 0):
     """
     Returns draft rankings
     Args:

{wsba_hockey-1.2.1.dist-info → wsba_hockey-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsba_hockey
-Version: 1.2.1
+Version: 1.2.2
 Summary: WeakSide Breakout's complete Python package of access to hockey data, primairly including the scraping of National Hockey League schedule, play-by-play, and shifts information.
 Author-email: Owen Singh <owenbksingh@gmail.com>
 Project-URL: Homepage, https://github.com/owensingh38/wsba_hockey/

{wsba_hockey-1.2.1.dist-info → wsba_hockey-1.2.2.dist-info}/RECORD

@@ -1,15 +1,16 @@
-wsba_hockey/__init__.py,sha256=rXczecTEm4W8F9RbFmIttxpX9aqiq7PF5KNDLQVY35w,539
-wsba_hockey/wsba_main.py,sha256=ImOIOiN7Pa1P9nvBOyRlDfvMNZKA6pQcVlwaLRn0uJU,72946
+wsba_hockey/__init__.py,sha256=4wdj-GjqGGb3BnnyLlvRXYS7wNoaLAzkfVnz6kM8v7g,566
+wsba_hockey/wsba_main.py,sha256=iXh4OSgqLLuxBV-5WthQ-2ISESo3qusm9InM_K7KQKc,74170
 wsba_hockey/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wsba_hockey/tools/agg.py,sha256=OkIYd-ApvGVYe2JJLOI21jnDIN5LH8nkeH7eo0reWFI,23364
+wsba_hockey/tools/game_pred.py,sha256=OGh6o1vIcyLUixU80hOO0RPGNmDSY1cvvCNZFcP0wL4,1308
 wsba_hockey/tools/plotting.py,sha256=81hBaM7tcwUNB4-tovPn7QreOUz6B2NuI_SR4-djVSk,6029
 wsba_hockey/tools/scraping.py,sha256=6_GyF8o56fuijTosm4x4OSrvpL61ZygluK2A26XajqU,52246
 wsba_hockey/tools/xg_model.py,sha256=OqSvr1Er3zGaY6ZTBnuulBTPLO6CPhNk97SwpnkRD6M,18686
 wsba_hockey/tools/archive/old_scraping.py,sha256=hEjMI1RtfeZnf0RBiJFI38oXkLZ3WofeH5xqcF4pzgM,49585
 wsba_hockey/tools/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wsba_hockey/tools/utils/shared.py,sha256=KxeQVttGem73yncAlnuZvTclqpJpoerTKtLusRh5zsk,2472
-wsba_hockey-1.2.1.dist-info/licenses/LICENSE,sha256=Nr_Um1Pd5FQJTWWgm7maZArdtYMbDhzXYSwyJIZDGik,1114
-wsba_hockey-1.2.1.dist-info/METADATA,sha256=FqPgksWmo2rfRSJlyvxn71SkaalXSAxBBT9p2l2L72s,3592
-wsba_hockey-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wsba_hockey-1.2.1.dist-info/top_level.txt,sha256=acU7s3x-RZC1zGiqCOmO0g267iqCg34lzIfdmYxxGmQ,12
-wsba_hockey-1.2.1.dist-info/RECORD,,
+wsba_hockey-1.2.2.dist-info/licenses/LICENSE,sha256=Nr_Um1Pd5FQJTWWgm7maZArdtYMbDhzXYSwyJIZDGik,1114
+wsba_hockey-1.2.2.dist-info/METADATA,sha256=8lZANGgWtAMVI7QfEr2cP66kM8WzUXv-YYeV6z1IL4A,3592
+wsba_hockey-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wsba_hockey-1.2.2.dist-info/top_level.txt,sha256=acU7s3x-RZC1zGiqCOmO0g267iqCg34lzIfdmYxxGmQ,12
+wsba_hockey-1.2.2.dist-info/RECORD,,