wsba-hockey 1.0.6__tar.gz → 1.1.1__tar.gz

{wsba_hockey-1.0.6/src/wsba_hockey.egg-info → wsba_hockey-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsba_hockey
-Version: 1.0.6
+Version: 1.1.1
 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.0.6 → wsba_hockey-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wsba_hockey"
-version = "1.0.6"
+version = "1.1.1"
 authors = [
   { name="Owen Singh", email="owenbksingh@gmail.com" },
 ]

wsba_hockey-1.1.1/src/wsba_hockey/api/api/index.py

@@ -0,0 +1,129 @@
+import pandas as pd
+import numpy as np
+import wsba_main as wsba
+import requests as rs
+from fastapi import FastAPI
+from datetime import datetime
+import pytz
+
+app = FastAPI()
+
+@app.get("/")
+def read_root():
+    return {"WeakSide Breakout Analysis": "Welcome to the API!"}
+
+@app.get("/nhl/players/{player_id}")
+def player(player_id: int):
+    player = rs.get(f'https://api-web.nhle.com/v1/player/{player_id}/landing').json()
+
+    return player
+
+@app.get("/nhl/schedule/{date}")
+def schedule_info(date: str):
+    data = rs.get(f'https://api-web.nhle.com/v1/schedule/{date}').json()
+    
+    eastern = pytz.timezone('US/Eastern')
+    for game in data['gameWeek'][0]['games']:
+        game['startTimeEST'] = datetime.strptime(game['startTimeUTC'],'%Y-%m-%dT%H:%M:%SZ').replace(tzinfo=pytz.UTC).astimezone(eastern).strftime('%I:%M %p')
+
+    return data
+
+@app.get("/nhl/games/{game_id}")
+def pbp(game_id: int):
+    df = wsba.nhl_apply_xG(wsba.nhl_scrape_game([game_id],remove=[]))
+    
+    skater = {}
+    goalie = {}
+    team_stats = {}
+    other = df.loc[~df['strength_state'].isin(['5v5','5v4','4v5']),'strength_state'].drop_duplicates().to_list()
+    for strength in [['5v5'],['5v4'],['4v5'],
+                     other,
+                     'all']:
+        
+        s = wsba.nhl_calculate_stats(df,'skater',[2,3],strength,True).replace([np.inf, -np.inf], np.nan).fillna('').to_dict(orient='records')
+        g = wsba.nhl_calculate_stats(df,'goalie',[2,3],strength,True).replace([np.inf, -np.inf], np.nan).fillna('').to_dict(orient='records')
+        t = wsba.nhl_calculate_stats(df,'team',[2,3],strength,True).replace([np.inf, -np.inf], np.nan).fillna('').to_dict(orient='records')
+
+        if strength != 'all':
+            if len(strength)>1:
+                add = 'Other'
+            else:
+                add = strength[0]
+        else:
+            add = 'All'
+
+        skater.update({add:s})
+        goalie.update({add:g})
+        team_stats.update({add:t})
+
+    df = df.fillna('')
+
+    team_data = pd.read_csv('https://weakside-breakout.s3.us-east-2.amazonaws.com/info/nhl_teaminfo.csv')[['triCode','seasonId','teamName.default','teamLogo','Primary Color','Secondary Color','WSBA']]
+
+    info = df[['season','season_type','game_id','game_date',
+                'venue','venue_location']].drop_duplicates().to_dict(orient='records')[0]
+    
+    info.update({'notice':'All data and materials are from the National Hockey League.'})
+
+    teams = {}
+    for team in ['away','home']:
+        df = pd.merge(df,team_data,how='left',left_on=[f'{team}_team_abbr','season'],right_on=['triCode','seasonId']).fillna('')
+        mod = '' if team == 'away' else '_y'
+        teams.update({team: df[[f'{team}_team_abbr'
+                                ,f'{team}_coach',
+                                f'teamName.default{mod}',
+                                f'teamLogo{mod}',
+                                f'Primary Color{mod}',
+                                f'Secondary Color{mod}',
+                                f'WSBA{mod}']].rename(columns={f'{team}_team_abbr':'team_abbr',f'{team}_coach':'coach',
+                                                         f'teamName.default{mod}':'team_name',
+                                                         f'teamLogo{mod}':'team_logo',
+                                                         f'Primary Color{mod}':'primary_color',
+                                                         f'Secondary Color{mod}':'secondary_color',
+                                                         f'WSBA{mod}':'WSBA'
+                                                         }).drop_duplicates().to_dict(orient='records')[0]})
+
+    play_col = [
+        'event_num','period','period_type',
+        'seconds_elapsed','period_time','game_time',"strength_state","strength_state_venue","home_team_defending_side",
+        "event_type_code","event_type","description","event_reason",
+        "penalty_type","penalty_duration","penalty_attribution",
+        "event_team_abbr","event_team_venue",
+        'num_on', 'players_on','ids_on','num_off','players_off','ids_off','shift_type',
+        "event_player_1_name","event_player_2_name","event_player_3_name",
+        "event_player_1_id","event_player_2_id","event_player_3_id",
+        "event_player_1_pos","event_player_2_pos","event_player_3_pos",
+        "event_goalie_name","event_goalie_id",
+        "shot_type","zone_code","x","y","x_fixed","y_fixed","x_adj","y_adj",
+        "event_skaters","away_skaters","home_skaters",
+        "event_distance","event_angle","event_length","seconds_since_last",
+        "away_score","home_score", "away_fenwick", "home_fenwick",
+        "away_on_1","away_on_2","away_on_3","away_on_4","away_on_5","away_on_6","away_goalie",
+        "home_on_1","home_on_2","home_on_3","home_on_4","home_on_5","home_on_6","home_goalie",
+        "away_on_1_id","away_on_2_id","away_on_3_id","away_on_4_id","away_on_5_id","away_on_6_id","away_goalie_id",
+        "home_on_1_id","home_on_2_id","home_on_3_id","home_on_4_id","home_on_5_id","home_on_6_id","home_goalie_id",
+        "event_coach",'xG'
+    ]
+    
+    def sanitize(value):
+        if isinstance(value, (np.generic, np.ndarray)):
+            return value.item()
+        return value
+
+    plays = [
+        {k: sanitize(v) for k, v in row.items() if v != ''}
+        for row in df[[col for col in play_col if col in df.columns]].to_dict(orient='records')
+    ]
+
+    plays = [
+        {k: sanitize(v) for k, v in row.items() if v != ''}
+        for row in df[[col for col in play_col if col in df.columns]].to_dict(orient='records')
+    ]
+
+    return {'info': info,
+            'teams': teams,
+            'skater_stats':skater,
+            'goalie_stats':goalie,
+            'team_stats':team_stats,
+            'plays': plays
+        }

wsba_hockey-1.1.1/src/wsba_hockey/api/api/main.py

@@ -0,0 +1,4 @@
+import uvicorn
+
+if __name__ == "__main__":
+    uvicorn.run("index:app", reload=True)

{wsba_hockey-1.0.6/src/wsba_hockey → wsba_hockey-1.1.1/src/wsba_hockey/api/api}/tools/plotting.py

@@ -1,3 +1,4 @@
+import os
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
@@ -5,7 +6,7 @@ from hockey_rink import NHLRink
 from hockey_rink import CircularImage
 from scipy.interpolate import griddata
 from scipy.ndimage import gaussian_filter
-from wsba_hockey.tools.xg_model import *
+from tools.xg_model import *
 
 ### PLOTTING FUNCTIONS ###
 # Provided in this file are basic plotting functions for the WSBA Hockey Python package. #
@@ -28,10 +29,9 @@ info_path = os.path.join(dir,'teaminfo\\nhl_teaminfo.csv')
 img_path = os.path.join(dir,'utils\\wsba.png')
 
 def wsba_rink(display_range='offense',rotation = 0):
-    img = 'tools/utils/wsba.png'
     rink = NHLRink(center_logo={
         "feature_class": CircularImage,
-        "image_path": img,
+        "image_path": img_path,
         "length": 25, "width": 25,
         "x": 0, "y": 0,
         "radius": 14,    

{wsba_hockey-1.0.6/src/wsba_hockey → wsba_hockey-1.1.1/src/wsba_hockey/api/api}/tools/scraping.py

@@ -6,7 +6,7 @@ import pandas as pd
 import requests as rs
 import json as json_lib
 from bs4 import BeautifulSoup
-from wsba_hockey.tools.utils.shared import *
+from tools.utils.shared import *
 warnings.filterwarnings('ignore')
 
 ### SCRAPING FUNCTIONS ###
@@ -28,7 +28,7 @@ def get_col():
     return [
         'season','season_type','game_id','game_date',"start_time","venue","venue_location",
         'away_team_abbr','home_team_abbr','event_num','period','period_type',
-        'seconds_elapsed',"strength_state","strength_state_venue","home_team_defending_side",
+        'seconds_elapsed','period_time','game_time',"strength_state","strength_state_venue","home_team_defending_side",
         "event_type_code","event_type","description","event_reason",
         "penalty_type","penalty_duration","penalty_attribution",
         "event_team_abbr","event_team_venue",
@@ -984,7 +984,11 @@ def combine_data(info,sources):
         df[f'{venue}_corsi'] = ((df['event_team_venue']==venue)&(df['event_type'].isin(['blocked-shot','missed-shot','shot-on-goal','goal']))).cumsum()
         df[f'{venue}_fenwick'] = ((df['event_team_venue']==venue)&(df['event_type'].isin(['missed-shot','shot-on-goal','goal']))).cumsum()
         df[f'{venue}_penalties'] = ((df['event_team_venue']==venue)&(df['event_type']=='penalty')).cumsum()
-       
+    
+    #Add time adjustments
+    df['period_time'] = np.trunc((df['seconds_elapsed']-((df['period']-1)*1200))/60).astype(str).str.replace('.0','')+":"+(df['seconds_elapsed'] % 60).astype(str).str.pad(2,'left','0')
+    df['game_time'] = np.trunc(df['seconds_elapsed']/60).astype(str).str.replace('.0','')+":"+(df['seconds_elapsed'] % 60).astype(str).str.pad(2,'left','0')
+
     #Forward fill as necessary
     cols = ['period_type','home_team_defending_side','away_coach','home_coach']
     for col in cols: