wsba-hockey 1.0.0__tar.gz → 1.0.2__tar.gz

{wsba_hockey-1.0.0/src/wsba_hockey.egg-info → wsba_hockey-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsba_hockey
-Version: 1.0.0
+Version: 1.0.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/
@@ -78,7 +78,7 @@ skater_dict = {
 }
 pbp = wsba.nhl_scrape_season('20212022',remove=[], local = True)
 
-wsba.nhl_plot_skater_shots(pbp,skater_dict,['5v5'],legend=True)
+wsba.nhl_plot_skaters_shots(pbp,skater_dict,['5v5'],onice='for',legend=True)
 wsba.nhl_plot_games(pbp,legend=True)
 ```
 

{wsba_hockey-1.0.0 → wsba_hockey-1.0.2}/README.md

@@ -63,7 +63,7 @@ skater_dict = {
 }
 pbp = wsba.nhl_scrape_season('20212022',remove=[], local = True)
 
-wsba.nhl_plot_skater_shots(pbp,skater_dict,['5v5'],legend=True)
+wsba.nhl_plot_skaters_shots(pbp,skater_dict,['5v5'],onice='for',legend=True)
 wsba.nhl_plot_games(pbp,legend=True)
 ```
 

{wsba_hockey-1.0.0 → wsba_hockey-1.0.2}/pyproject.toml

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

wsba_hockey-1.0.2/src/wsba_hockey/tools/plotting.py

@@ -0,0 +1,143 @@
+import matplotlib.pyplot as plt
+import matplotlib.image as mpimg
+import numpy as np
+import pandas as pd
+from scipy.interpolate import griddata
+from scipy.ndimage import gaussian_filter
+import urllib.request
+import PIL
+from .xg_model import *
+from hockey_rink import NHLRink
+from hockey_rink import CircularImage
+
+event_markers = {
+    'faceoff':'X',
+    'hit':'P',
+    'blocked-shot':'v',
+    'missed-shot':'H',
+    'shot-on-goal':'D',
+    'goal':'o',
+    'giveaway':'1',
+    'takeaway':'2',
+}
+
+def wsba_rink(display_range='offense',rotation = 0):
+    img = 'tools/utils/wsba.png'
+    rink = NHLRink(center_logo={
+        "feature_class": CircularImage,
+        "image_path": img,
+        "length": 25, "width": 25,
+        "x": 0, "y": 0,
+        "radius": 14,    
+        "zorder": 11,
+        }
+        )
+    rink.draw(
+            display_range=display_range,
+            rotation=rotation,
+            despine=True
+        )
+
+def prep_plot_data(pbp,events,strengths,marker_dict=event_markers,xg='moneypuck'):
+    try: pbp['xG']
+    except:
+        if xg == 'wsba':
+            pbp = wsba_xG(pbp)
+        else:
+            pbp = moneypuck_xG(pbp)
+        pbp['xG'] = np.where(pbp['xG'].isna(),0,pbp['xG'])
+
+    pbp['WSBA'] = pbp['event_player_1_name']+pbp['season'].astype(str)+pbp['event_team_abbr']
+    
+    pbp['x_plot'] = pbp['y_fixed']*-1
+    pbp['y_plot'] = pbp['x_fixed']
+
+    pbp['home_on_ice'] = pbp['home_on_1'].astype(str) + ";" + pbp['home_on_2'].astype(str) + ";" + pbp['home_on_3'].astype(str) + ";" + pbp['home_on_4'].astype(str) + ";" + pbp['home_on_5'].astype(str) + ";" + pbp['home_on_6'].astype(str)
+    pbp['away_on_ice'] = pbp['away_on_1'].astype(str) + ";" + pbp['away_on_2'].astype(str) + ";" + pbp['away_on_3'].astype(str) + ";" + pbp['away_on_4'].astype(str) + ";" + pbp['away_on_5'].astype(str) + ";" + pbp['away_on_6'].astype(str)
+
+    pbp['onice_for'] = np.where(pbp['home_team_abbr']==pbp['event_team_abbr'],pbp['home_on_ice'],pbp['away_on_ice'])
+    pbp['onice_against'] = np.where(pbp['away_team_abbr']==pbp['event_team_abbr'],pbp['home_on_ice'],pbp['away_on_ice'])
+
+    pbp['size'] = np.where(pbp['xG']<=0,40,pbp['xG']*400)
+    pbp['marker'] = pbp['event_type'].replace(marker_dict)
+
+    pbp = pbp.loc[(pbp['event_type'].isin(events))&
+                  (pbp['event_distance']<=89)&
+                  (pbp['x_fixed']<=89)]
+    
+    if strengths != 'all':
+        pbp = pbp.loc[(pbp['strength_state'].isin(strengths))]
+
+    return pbp
+
+def league_shots(pbp,events,strengths):
+    pbp = prep_plot_data(pbp,events,strengths)
+
+    print(pbp[['event_player_1_name','xG','x_plot','y_plot']].head(10))
+
+    [x,y] = np.round(np.meshgrid(np.linspace(-42.5,42.5,85),np.linspace(0,100,100)))
+    xgoals = griddata((pbp[f'x_plot'],pbp[f'y_plot']),pbp['xG'],(x,y),method='cubic',fill_value=0)
+    xgoals_smooth = gaussian_filter(xgoals,sigma = 3)
+
+    return xgoals_smooth
+
+def plot_skater_shots(pbp, player, season, team, strengths, title = None, marker_dict=event_markers, onice='for', legend=False,xg='moneypuck'):
+    shots = ['missed-shot','shot-on-goal','goal']
+    pbp = prep_plot_data(pbp,shots,strengths,marker_dict,xg)
+    pbp = pbp.loc[(pbp['season'].astype(str)==season)&((pbp['away_team_abbr']==team)|(pbp['home_team_abbr']==team))]
+
+    team_data = pd.read_csv('teaminfo/nhl_teaminfo.csv')
+    team_color = list(team_data.loc[team_data['WSBA']==f'{team}{season}','Primary Color'])[0]
+    team_color_2nd = list(team_data.loc[team_data['WSBA']==f'{team}{season}','Secondary Color'])[0]
+
+    if onice in ['for','against']:
+        skater = pbp.loc[(pbp[f'onice_{onice}'].str.contains(player.upper()))]
+        skater['color'] = np.where(skater['event_player_1_name']==player.upper(),team_color,team_color_2nd)
+
+    else:
+        skater = pbp.loc[pbp['event_player_1_name']==player.upper()]
+        skater['color'] = team_color
+
+    fig, ax = plt.subplots()
+    wsba_rink(rotation=90)
+
+    for event in shots:
+        plays = skater.loc[skater['event_type']==event]
+        ax.scatter(plays['x_plot'],plays['y_plot'],plays['size'],plays['color'],marker=event_markers[event],label=event,zorder=5)
+    
+    ax.set_title(title) if title else ''
+    ax.legend().set_visible(legend)
+    ax.legend().set_zorder(1000)
+    
+    return fig
+    
+def plot_game_events(pbp,game_id,events,strengths,marker_dict=event_markers,team_colors={'away':'secondary','home':'primary'},legend=False,xg='moneypuck'):
+    pbp = prep_plot_data(pbp,events,strengths,marker_dict,xg)
+    pbp = pbp.loc[pbp['game_id'].astype(str)==game_id]
+
+    away_abbr = list(pbp['away_team_abbr'])[0]
+    home_abbr = list(pbp['home_team_abbr'])[0]
+    date = list(pbp['game_date'])[0]
+    season = f'{game_id[0:4]}{int(game_id[0:4])+1}'
+
+    team_data = pd.read_csv('teaminfo/nhl_teaminfo.csv')
+    team_info ={
+        'away_color':'#000000' if list(team_data.loc[team_data['WSBA']==f'{away_abbr}{season}','Secondary Color'])[0]=='#FFFFFF' else list(team_data.loc[team_data['WSBA']==f'{away_abbr}{season}',f'{team_colors['away'].capitalize()} Color'])[0],
+        'home_color': list(team_data.loc[team_data['WSBA']==f'{home_abbr}{season}',f'{team_colors['home'].capitalize()} Color'])[0],
+        'away_logo': f'tools/logos/png/{away_abbr}{season}.png',
+        'home_logo': f'tools/logos/png/{home_abbr}{season}.png',
+    }
+
+    pbp['color'] = np.where(pbp['event_team_abbr']==away_abbr,team_info['away_color'],team_info['home_color'])
+
+    fig, ax = plt.subplots()
+    wsba_rink(display_range='full')
+
+    for event in events:
+        plays = pbp.loc[pbp['event_type']==event]
+        ax.scatter(plays['x_adj'],plays['y_adj'],plays['size'],plays['color'],marker=event_markers[event],label=event,zorder=5)
+
+    ax.set_title(f'{away_abbr} @ {home_abbr} - {date}')
+    ax.legend(bbox_to_anchor =(0.5,-0.35), loc='lower center',ncol=1).set_visible(legend)
+
+    return fig

{wsba_hockey-1.0.0 → wsba_hockey-1.0.2}/src/wsba_hockey/tools/scraping.py

@@ -337,7 +337,6 @@ def parse_espn(date,away,home):
     coords_df = coords_df.assign(
         coords_x = coords_df[~pd.isna(coords_df.coordinate)].coordinate.apply(lambda x: x['x']).astype(int),
         coords_y = coords_df[~pd.isna(coords_df.coordinate)].coordinate.apply(lambda y: y['y']).astype(int),
-        event_player_1_name = coords_df[~pd.isna(coords_df.athlete)]['athlete'].apply(lambda x: x['name'])
     )
 
     #Combine
@@ -356,7 +355,7 @@ def parse_espn(date,away,home):
                       coords_y = np.where((pd.isna(espn_events.coords_x)) & (pd.isna(espn_events.coords_y)) &
                 (espn_events.event_type=='Face Off'), 0, espn_events.coords_y))
 
-    espn_events = espn_events[(~pd.isna(espn_events.coords_x)) & (~pd.isna(espn_events.coords_y)) & (~pd.isna(espn_events.event_player_1_name))]
+    espn_events = espn_events[(~pd.isna(espn_events.coords_x)) & (~pd.isna(espn_events.coords_y))]
 
     espn_events = espn_events.assign(
         coords_x = espn_events.coords_x.astype(int),
@@ -711,7 +710,7 @@ def combine_pbp(info):
     #Route data combining - json if season is after 2009-2010:
     if str(info['season']) in ['20052006','20062007','20072008','20082009','20092010']:
         #ESPN x HTML
-        espn_pbp = parse_espn(str(info['game_date']),info['away_team_abbr'],info['home_team_abbr']).rename(columns={'coords_x':'x',"coords_y":'y'}).drop(columns=['event_player_1_name'])
+        espn_pbp = parse_espn(str(info['game_date']),info['away_team_abbr'],info['home_team_abbr']).rename(columns={'coords_x':'x',"coords_y":'y'})
         merge_col = ['period','seconds_elapsed','event_type','event_team_abbr']
 
         df = pd.merge(html_pbp,espn_pbp,how='left',on=merge_col)

{wsba_hockey-1.0.0 → wsba_hockey-1.0.2}/src/wsba_hockey/tools/xg_model.py

@@ -38,6 +38,7 @@ def prep_xG_data(pbp):
     data.sort_values(['season','game_id','period','seconds_elapsed','event_num'],inplace=True)
     data['score_state'] = np.where(data['away_team_abbr']==data['event_team_abbr'],data['away_score']-data['home_score'],data['home_score']-data['away_score'])
     data['strength_diff'] = np.where(data['away_team_abbr']==data['event_team_abbr'],data['away_skaters']-data['home_skaters'],data['home_skaters']-data['away_skaters'])
+    data['strength_state_venue'] = data['away_skaters'].astype(str)+'v'+data['home_skaters'].astype(str)
     data['fenwick_state'] = np.where(data['away_team_abbr']==data['event_team_abbr'],data['away_fenwick']-data['home_fenwick'],data['home_fenwick']-data['away_fenwick'])
     data['distance_from_last'] = np.sqrt((data['x_fixed'] - data['x_fixed_last'])**2 + (data['y_fixed'] - data['y_fixed_last'])**2)
 

wsba_hockey-1.0.2/src/wsba_hockey/workspace.py

@@ -0,0 +1,114 @@
+import numpy as np
+import pandas as pd
+import matplotlib
+matplotlib.use('agg')
+import matplotlib.pyplot as plt
+import wsba_hockey as wsba
+from gspread_pandas import Spread, Client
+import urllib.request
+from wand.color import Color
+from wand.image import Image
+
+season_load = wsba.repo_load_seasons()
+
+def workspace(seasons,type,arg = '',start='',end=''):
+    if type == 'pbp':
+        #Scrape pbp
+        errors=[]
+        for season in seasons:
+            data = wsba.nhl_scrape_season(season,remove=[],local=True,errors=True)
+            errors.append(data['errors'])
+            data['pbp'].to_csv(f'pbp/nhl_pbp_{season}.csv',index=False)
+        print(f'Errors: {errors}')
+
+    elif type == 'convert':
+        for season in seasons:
+            data = pd.read_csv(f"pbp/nhl_pbp_{season}.csv")
+            data = wsba.wsba_main.moneypuck_xG(data)
+            data.to_parquet(f'pbp/parquet/nhl_pbp_{season}.parquet',index=False)
+
+    elif type == 'team_info':
+        #Scrape team info
+        stand = [wsba.nhl_scrape_standings(season) for season in seasons]
+        standings = pd.concat(stand)
+        
+        colors = pd.read_csv('teaminfo/nhl_colors.csv')
+        data = pd.merge(colors,standings,how='right',left_on='triCode',right_on='teamAbbrev.default').sort_values(by=['seasonId','triCode'])
+        data['WSBA'] = data['teamAbbrev.default']+data['seasonId'].astype(str)
+
+        data.to_csv('teaminfo/nhl_teaminfo.csv',index=False)
+    
+    elif type == 'stats':
+        #Stats building
+        stats = []
+        for season in seasons:
+            for group in ['skater','team']:
+                pbp = pd.read_parquet(f'pbp/parquet/nhl_pbp_{season}.parquet')
+                stat = wsba.nhl_calculate_stats(pbp,group,[2],['5v5'],shot_impact=True)
+                stat.to_csv(f'stats/{group}/wsba_nhl_{season}_{group}.csv',index=False)
+                stats.append(stat)
+            pd.concat(stats).to_csv(f'stats/db/wsba_nhl_{group}_db.csv',index=False)
+    
+    elif type == 'plot_game':
+        for season in seasons:
+            pbp = wsba.nhl_scrape_season(season,remove=[],start=start,end=end)
+
+            plots = wsba.nhl_plot_games(pbp,wsba.wsba_main.fenwick_events,['5v5'],'all',team_colors=arg,legend=True)
+
+            games = list(pbp['game_id'].astype(str).drop_duplicates())
+            i = 1
+            for plot, game_id in zip(plots,games):
+                plot.savefig(f'plots/games/{game_id[0:4]}{int(game_id[0:4])+1}/{game_id[5:6]}/{game_id}_shotplot.png',bbox_inches='tight',transparent=True)
+                i += 1
+    
+    elif type == 'plot_skater':
+        for season in seasons:
+            pbp = pd.read_parquet(f'pbp/parquet/nhl_pbp_{season}.parquet')
+
+            skaters={}
+
+            for shooter,season,team in zip(pbp['event_player_1_name'],pbp['season'].astype(str),pbp['event_team_abbr']):    
+                if shooter is None:
+                    continue
+                else:
+                    skaters.update({
+                        shooter:[season,team]
+                    })
+
+            plots = wsba.nhl_plot_skaters_shots(pbp,skaters,['5v5'],onice='indv',title=False,legend=True)
+
+            items = list(skaters.items())
+            for plot,skater in zip(plots,items):
+                plot.savefig(f'plots/{skater[1][0]}/{skater[0]}{skater[1][0]}{skater[1][1]}_indv.png',bbox_inches='tight',transparent=True)
+    
+    elif type == 'logos':
+        data = pd.read_csv('teaminfo/nhl_teaminfo.csv')
+        for url, id in zip(data['teamLogo'],data['WSBA']):
+            print(url)
+            urllib.request.urlretrieve(url,f'tools/logos/svg/{id}.svg')
+            with Image(filename=f'tools/logos/svg/{id}.svg') as img:
+                img.format = 'png32'
+                img.background_color = Color('transparent')  
+                img.alpha_channel = 'activate'    
+                img.save(filename=f'tools/logos/png/{id}.png')
+                
+    else:
+        print('Nothing here.')
+
+def push_to_sheet():
+    spread = Spread('WSBA - NHL 5v5 Shooting Metrics Public v2.0')
+
+    #Tables
+    skater = pd.read_csv('stats/db/wsba_nhl_skater_db.csv')
+    team = pd.read_csv('stats/db/wsba_nhl_team_db.csv')
+    team_info = pd.read_csv('teaminfo/nhl_teaminfo.csv')
+    country = pd.read_csv('teaminfo/nhl_countryinfo.csv')
+    schedule = pd.read_csv('schedule/schedule.csv')
+
+    spread.df_to_sheet(skater,index=False,sheet='Skaters DB')
+    spread.df_to_sheet(team,index=False,sheet='Teams DB')
+    spread.df_to_sheet(team_info,index=False,sheet='Team Info')
+    spread.df_to_sheet(country,index=False,sheet='Country Info')
+    spread.df_to_sheet(schedule,index=False,sheet='Schedule')
+
+workspace(['20242025'],'plot_game',arg={'away':'secondary','home':'primary'}, start='04-20',end='04-20')

{wsba_hockey-1.0.0 → wsba_hockey-1.0.2}/src/wsba_hockey/wsba_main.py

@@ -328,8 +328,7 @@ def nhl_scrape_season(season,split_shifts = False, season_types = [2,3], remove
             pbp_dict.update({'errors':data['errors']})
         return pbp_dict
     else:
-        pbp = data['pbp']
-
+        pbp = data
         if errors:
             pbp_dict = {'pbp':pbp,
                         'errors':data['errors']}
@@ -337,13 +336,6 @@ def nhl_scrape_season(season,split_shifts = False, season_types = [2,3], remove
         else:
             return pbp
 
-#errors = []
-#for season in seasons[10:12]:
-#    data = nhl_scrape_season(season,remove=[],local=True,errors=True)
-#    errors.append(data['errors'])
-#    data['pbp'].to_csv(f'pbp/csv/nhl_pbp_{season}.csv',index=False)
-#print(f'Errors: {errors}')
-
 def nhl_scrape_seasons_info(seasons = []):
     #Returns info related to NHL seasons (by default, all seasons are included)
     # param 'season' - list of seasons to include
@@ -394,9 +386,6 @@ def nhl_scrape_standings(arg = "now", season_type = 2):
 
         return pd.json_normalize(data)
 
-#stand = [nhl_scrape_standings(season) for season in seasons]
-#pd.concat(stand).to_csv('teaminfo/nhl_standings.csv',index=False)
-
 def nhl_scrape_roster(season):
     #Given a nhl season, return rosters for all participating teams
     # param 'season' - NHL season to scrape
@@ -671,6 +660,12 @@ def nhl_calculate_stats(pbp,type,season_types,game_strength,roster_path="rosters
     #Filter by season types and remove shootouts
     pbp = pbp.loc[(pbp['season_type'].isin(season_types)) & (pbp['period'] < 5)]
     
+    #Convert all columns with player ids to float in order to avoid merging errors
+    for col in get_col():
+        if "_id" in col:
+            try: pbp[col] = pbp[col].astype(float)
+            except KeyError: continue
+
     # Filter by game strength if not "all"
     if game_strength != "all":
         pbp = pbp.loc[pbp['strength_state'].isin(game_strength)]
@@ -782,20 +777,14 @@ def nhl_calculate_stats(pbp,type,season_types,game_strength,roster_path="rosters
         else:
             return complete
 
-#stats = []
-#for season in seasons[6:18]:
-#    pbp = pd.read_parquet(f'pbp/parquet/nhl_pbp_{season}.parquet')
-#    stat = nhl_calculate_stats(pbp,'skater',[2],['5v5'],shot_impact=True)
-#    stat.to_csv(f'stats/skater/wsba_nhl_{season}.csv',index=False)
-#    stats.append(stat)
-#pd.concat(stats).to_csv('stats/db/wsba_nhl_skater_db.csv',index=False)
-
-def nhl_plot_skaters_shots(pbp,skater_dict,strengths,color_dict=event_colors,legend=False,xg='moneypuck'):
+def nhl_plot_skaters_shots(pbp,skater_dict,strengths,marker_dict=event_markers,onice = 'indv',title = True,legend=False,xg='moneypuck'):
     #Returns list of plots for specified skaters
     # param 'pbp' - pbp to plot data
     # param 'skater_dict' - skaters to plot shots for (format: {'Patrice Bergeron':['20242025','BOS']})
     # param 'strengths' - strengths to include in plotting
-    # param 'color_dict' - dict with colors to use for events
+    # param 'marker_dict' - dict with markers to use for events
+    # param 'onice' - can set which shots to include in plotting for the specified skater ('indv', 'for', 'against')
+    # param 'title' - bool including title when true
     # param 'legend' - bool which includes legend if true
     # param 'xg' - xG model to apply to pbp for plotting
 
@@ -805,19 +794,19 @@ def nhl_plot_skaters_shots(pbp,skater_dict,strengths,color_dict=event_colors,leg
     skater_plots = []
     for skater in skater_dict.keys():
         skater_info = skater_dict[skater]
-        title = f'{skater} Fenwick Shots for {skater_info[1]} in {skater_info[0][2:4]}-{skater_info[0][6:8]}'
-        skater_plots.append(plot_skater_shots(pbp,skater,skater_info[0],skater_info[1],strengths,title,color_dict,legend,xg))
+        title = f'{skater} Fenwick Shots for {skater_info[1]} in {skater_info[0][2:4]}-{skater_info[0][6:8]}' if title else ''
+        skater_plots.append(plot_skater_shots(pbp,skater,skater_info[0],skater_info[1],strengths,title,marker_dict,onice,legend,xg))
 
     #Return: list of plotted skater shot charts
     return skater_plots
 
-def nhl_plot_games(pbp,events,strengths,game_ids='all',color_dict=event_colors,legend=False,xg='moneypuck'):
+def nhl_plot_games(pbp,events,strengths,game_ids='all',marker_dict=event_markers,team_colors={'away':'primary','home':'primary'},legend=False,xg='moneypuck'):
     #Returns list of plots for specified games
     # param 'pbp' - pbp to plot data
     # param 'events' - type of events to plot
     # param 'strengths' - strengths to include in plotting
     # param 'game_ids' - games to plot (list if not set to 'all')
-    # param 'color_dict' - dict with colors to use for events
+    # param 'marker_dict' - dict with colors to use for events
     # param 'legend' - bool which includes legend if true
     # param 'xg' - xG model to apply to pbp for plotting
 
@@ -828,7 +817,7 @@ def nhl_plot_games(pbp,events,strengths,game_ids='all',color_dict=event_colors,l
     print(f'Plotting the following games: {game_ids}...')
 
     #Iterate through games, adding plot to list
-    game_plots = [plot_game_events(pbp,game,events,strengths,color_dict,legend,xg) for game in game_ids]
+    game_plots = [plot_game_events(pbp,game,events,strengths,marker_dict,team_colors,legend,xg) for game in game_ids]
 
     #Return: list of plotted game events
     return game_plots
@@ -878,7 +867,3 @@ def admin_convert_to_parquet(seasons):
         load = pd.read_csv(f'pbp/csv/nhl_pbp_{season}.csv')
 
         load.to_parquet(f'pbp/parquet/nhl_pbp_{season}.parquet',index=False)
-
-#for season in seasons[6:12]:
-#    data = pd.read_csv(f"pbp/csv/nhl_pbp_{season}.csv")
-#    data.to_parquet(f'pbp/parquet/nhl_pbp_{season}.parquet',index=False)

{wsba_hockey-1.0.0 → wsba_hockey-1.0.2/src/wsba_hockey.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsba_hockey
-Version: 1.0.0
+Version: 1.0.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/
@@ -78,7 +78,7 @@ skater_dict = {
 }
 pbp = wsba.nhl_scrape_season('20212022',remove=[], local = True)
 
-wsba.nhl_plot_skater_shots(pbp,skater_dict,['5v5'],legend=True)
+wsba.nhl_plot_skaters_shots(pbp,skater_dict,['5v5'],onice='for',legend=True)
 wsba.nhl_plot_games(pbp,legend=True)
 ```
 

{wsba_hockey-1.0.0 → wsba_hockey-1.0.2}/src/wsba_hockey.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 src/wsba_hockey/__init__.py
+src/wsba_hockey/workspace.py
 src/wsba_hockey/wsba_main.py
 src/wsba_hockey.egg-info/PKG-INFO
 src/wsba_hockey.egg-info/SOURCES.txt

wsba_hockey-1.0.0/src/wsba_hockey/tools/plotting.py

@@ -1,113 +0,0 @@
-import matplotlib.pyplot as plt
-import matplotlib.image as img
-import numpy as np
-import pandas as pd
-pd.options.mode.chained_assignment = None
-from scipy.interpolate import griddata
-from scipy.ndimage import gaussian_filter
-from .xg_model import *
-from hockey_rink import NHLRink
-from hockey_rink import CircularImage
-
-event_colors = {
-    'faceoff':'black',
-    'hit':'yellow',
-    'blocked-shot':'pink',
-    'missed-shot':'red',
-    'shot-on-goal':'purple',
-    'goal':'blue',
-    'giveaway':'orange',
-    'takeaway':'green',
-}
-
-def wsba_rink(display_range='offense',rotation = 0):
-    img = 'tools/utils/wsba.png'
-    rink = NHLRink(center_logo={
-        "feature_class": CircularImage,
-        "image_path": img,
-        "length": 25, "width": 25,
-        "x": 0, "y": 0,
-        "radius": 14,    
-        "zorder": 11,
-        }
-        )
-    rink.draw(
-            display_range=display_range,
-            rotation=rotation,
-            despine=True
-        )
-
-def prep_plot_data(pbp,events,strengths,color_dict=event_colors,xg='moneypuck'):
-    try: pbp['xG']
-    except:
-        if xg == 'wsba':
-            pbp = wsba_xG(pbp)
-        else:
-            pbp = moneypuck_xG(pbp)
-        pbp['xG'] = np.where(pbp['xG'].isna(),0,pbp['xG'])
-
-    pbp['WSBA'] = pbp['event_player_1_name']+pbp['season'].astype(str)+pbp['event_team_abbr']
-    
-    pbp['x_plot'] = pbp['y_fixed']*-1
-    pbp['y_plot'] = pbp['x_fixed']
-
-    pbp['size'] = np.where(pbp['xG']<=0,100,pbp['xG']*1000)
-    pbp['color'] = pbp['event_type'].replace(color_dict)
-
-    pbp = pbp.loc[(pbp['event_type'].isin(events))&
-                  (pbp['event_distance']<=89)&
-                  (pbp['x_fixed']<=89)&
-                  (pbp['strength_state'].isin(strengths))]
-    
-    return pbp
-
-def league_shots(pbp,cord = 'fixed'):
-    [x,y] = np.round(np.meshgrid(np.linspace(0,100,100),np.linspace(-42.5,42.5,85)))
-    xgoals = griddata((pbp[f'x_{cord}'],pbp[f'y_{cord}']),pbp['xG'],(x,y),method='cubic',fill_value=0)
-    xgoals_smooth = gaussian_filter(xgoals,sigma = 3)
-
-    fig = plt.figure(figsize=(10,12), facecolor='w', edgecolor='k')
-    plt.imshow(xgoals_smooth,origin = 'lower')
-    plt.colorbar(orientation = 'horizontal', pad = 0.05)
-    plt.title('xGoal Array',fontdict={'fontsize': 15})
-    plt.show()
-
-    return xgoals_smooth
-
-
-def plot_skater_shots(pbp, player, season, team, strengths, title = None, color_dict=event_colors, legend=False,xg='moneypuck'):
-    shots = ['missed-shot','shot-on-goal','goal']
-    pbp = prep_plot_data(pbp,shots,strengths,color_dict,xg)
-    skater = pbp.loc[pbp['WSBA'] == f'{player.upper()}{season}{team}']
-
-    fig, ax = plt.subplots()
-    wsba_rink(rotation=90)
-
-    for event in shots:
-        plays = skater.loc[skater['event_type']==event]
-        ax.scatter(plays['x_plot'],plays['y_plot'],plays['size'],plays['color'],label=event)
-    
-    ax.set_title(title) if title else ''
-    ax.legend().set_visible(legend)
-    
-    return fig
-    
-def plot_game_events(pbp,game_id,events,strengths,color_dict=event_colors,legend=False,xg='moneypuck'):
-    pbp = prep_plot_data(pbp,events,strengths,color_dict,xg)
-    pbp = pbp.loc[pbp['game_id'].astype(str)==game_id]
-
-    away_abbr = list(pbp['away_team_abbr'])[0]
-    home_abbr = list(pbp['home_team_abbr'])[0]
-    date = list(pbp['game_date'])[0]
-
-    fig, ax = plt.subplots()
-    wsba_rink(display_range='full')
-
-    for event in events:
-        plays = pbp.loc[pbp['event_type']==event]
-        ax.scatter(plays['x_adj'],plays['y_adj'],plays['size'],plays['color'],label=event)
-
-    ax.set_title(f'{away_abbr} @ {home_abbr} - {date}')
-    ax.legend(bbox_to_anchor =(0.5,-0.4), loc='lower center',ncol=1).set_visible(legend)
-
-    return fig