wsba-hockey 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

wsba_hockey/tools/plotting.py

@@ -1,9 +1,11 @@
 import matplotlib.pyplot as plt
-import matplotlib.image as img
+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
@@ -109,7 +111,7 @@ def plot_skater_shots(pbp, player, season, team, strengths, title = None, marker
     
     return fig
     
-def plot_game_events(pbp,game_id,events,strengths,marker_dict=event_markers,legend=False,xg='moneypuck'):
+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]
 
@@ -119,10 +121,14 @@ def plot_game_events(pbp,game_id,events,strengths,marker_dict=event_markers,lege
     season = f'{game_id[0:4]}{int(game_id[0:4])+1}'
 
     team_data = pd.read_csv('teaminfo/nhl_teaminfo.csv')
-    away_color = list(team_data.loc[team_data['WSBA']==f'{away_abbr}{season}','Primary Color'])[0]
-    home_color = list(team_data.loc[team_data['WSBA']==f'{home_abbr}{season}','Primary Color'])[0]
-    
-    pbp['color'] = np.where(pbp['event_team_abbr']==away_abbr,away_color,home_color)
+    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')

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/workspace.py

@@ -1,12 +1,17 @@
 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):
+def workspace(seasons,type,arg = '',start='',end=''):
     if type == 'pbp':
         #Scrape pbp
         errors=[]
@@ -17,51 +22,93 @@ def workspace(seasons,type):
         print(f'Errors: {errors}')
 
     elif type == 'convert':
-        for season in seasons[6:12]:
+        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 == 'standings':
-        #Scrape standings
-        stand = [wsba.nhl_scrape_standings(season) for season in season]
-        pd.concat(stand).to_csv('teaminfo/nhl_standings.csv',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[6:18]:
+        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)
-    else:
-        print('Nothing here.')
+    
+    elif type == 'plot_game':
+        for season in seasons:
+            pbp = wsba.nhl_scrape_season(season,remove=[],start=start,end=end)
 
-pbp = pd.read_parquet('pbp/parquet/nhl_pbp_20242025.parquet')
+            plots = wsba.nhl_plot_games(pbp,wsba.wsba_main.fenwick_events,['5v5'],'all',team_colors=arg,legend=True)
 
-skaters={}
+            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]
+                    })
 
-for shooter,season,team in zip(pbp['event_player_1_name'],pbp['season'].astype(str),pbp['event_team_abbr']):    
-    if shooter is None:
-        continue
+            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:
-        skaters.update({
-            shooter:[season,team]
-        })
+        print('Nothing here.')
 
-plots = wsba.nhl_plot_skaters_shots(pbp,skaters,['5v5'],onice='indv',legend=True)
+def push_to_sheet():
+    spread = Spread('WSBA - NHL 5v5 Shooting Metrics Public v2.0')
 
-items = list(skaters.items())
-for plot,skater in zip(plots,items):
-    plt.title('')
-    plot.savefig(f'plots/{skater[0]}{skater[1][0]}{skater[1][1]}_indv.png',bbox_inches='tight',transparent=True)
+    #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')
 
-plots = wsba.nhl_plot_games(wsba.nhl_scrape_season('20242025',start='04-19',end='04-19'),wsba.wsba_main.fenwick_events,['5v5'],'all',legend=True)
+    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')
 
-i = 1
-for plot in plots:
-    plot.savefig(f'plots/20242025_03_{i}_shotplot.png',bbox_inches='tight',transparent=True)
-    i += 1
+workspace(['20242025'],'plot_game',arg={'away':'secondary','home':'primary'}, start='04-20',end='04-20')

wsba_hockey/wsba_main.py

@@ -660,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)]
@@ -794,7 +800,7 @@ def nhl_plot_skaters_shots(pbp,skater_dict,strengths,marker_dict=event_markers,o
     #Return: list of plotted skater shot charts
     return skater_plots
 
-def nhl_plot_games(pbp,events,strengths,game_ids='all',marker_dict=event_markers,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
@@ -811,7 +817,7 @@ def nhl_plot_games(pbp,events,strengths,game_ids='all',marker_dict=event_markers
     print(f'Plotting the following games: {game_ids}...')
 
     #Iterate through games, adding plot to list
-    game_plots = [plot_game_events(pbp,game,events,strengths,marker_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

{wsba_hockey-1.0.1.dist-info → wsba_hockey-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsba_hockey
-Version: 1.0.1
+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/

{wsba_hockey-1.0.1.dist-info → wsba_hockey-1.0.2.dist-info}/RECORD

@@ -1,19 +1,19 @@
 wsba_hockey/__init__.py,sha256=QXyc8FFlCDWQuECyyEbj80ASHEbTFj4R13DOFOY9nJg,353
-wsba_hockey/workspace.py,sha256=XS4ppyjUWY_NmMA47ge_idvgcFp8E7vkXrTxB5T5wNI,2478
-wsba_hockey/wsba_main.py,sha256=YGisPPO2GJo1e-53ppb_nYB-ujbSkn7WljY-maKQBEI,36783
+wsba_hockey/workspace.py,sha256=HJ4ZJyL8OwrtknXKAqiptW8WxbJZp3kc0bobDwpKcLY,4875
+wsba_hockey/wsba_main.py,sha256=ZYfYpqJeUBnVHAjGrDWkEjoYW_8qWCilYukGuKUkJA4,37073
 wsba_hockey/stats/calculate_viz/shot_impact.py,sha256=7zxf64yt87YDucUBG31W75u951AUbMC7a3x5ClNIxYI,39
 wsba_hockey/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wsba_hockey/tools/agg.py,sha256=WRfuxJt0OgDSEkqHtuGql9nZrQnLGzkm6DUFVbDXayE,9560
-wsba_hockey/tools/plotting.py,sha256=RZ5lx2H8MlUu72fP2sOM36ceorpDqYpRA7Afv-m1Frw,5557
+wsba_hockey/tools/plotting.py,sha256=mOkXO-ZWFTblsGpYSOZFxFJFad4sZBr62prVaatoLEw,6003
 wsba_hockey/tools/scraping.py,sha256=hZv1XMtQjsVSSVwN6Fzw7FuT94zSQGyX1WupTjUjUuU,48548
-wsba_hockey/tools/xg_model.py,sha256=qjScRMzLOkVsv6zVzJJxHBlbBPF6xg6_koncMCyYGYE,15052
+wsba_hockey/tools/xg_model.py,sha256=vdmDq9CWFr-2AKUrnorjUyweUf9_NMdq5Xf3mbPserw,15158
 wsba_hockey/tools/archive/old_scraping.py,sha256=hEjMI1RtfeZnf0RBiJFI38oXkLZ3WofeH5xqcF4pzgM,49585
 wsba_hockey/tools/utils/__init__.py,sha256=vccXhOtzARoR99fmEWU1OEI3qCIdQ9Z42AlRA_BUhrs,114
 wsba_hockey/tools/utils/config.py,sha256=D3Uk05-YTyrhfReMTTLfNI3HN_rON2uo_CDE9oER3Lg,351
 wsba_hockey/tools/utils/save_pages.py,sha256=CsyL_0n-b-4pJoUauwU3HpnCO6n69-RlBMJQBd_qGDc,4979
 wsba_hockey/tools/utils/shared.py,sha256=dH_JwZfia5fib8rksy5sW-mBp0pluBPvw37Vdr8Kap0,14211
-wsba_hockey-1.0.1.dist-info/licenses/LICENSE,sha256=Nr_Um1Pd5FQJTWWgm7maZArdtYMbDhzXYSwyJIZDGik,1114
-wsba_hockey-1.0.1.dist-info/METADATA,sha256=IVhe2jlgHHLLeVXL4tITxUsBrCT3eiT-4mHoeZryxJk,3547
-wsba_hockey-1.0.1.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-wsba_hockey-1.0.1.dist-info/top_level.txt,sha256=acU7s3x-RZC1zGiqCOmO0g267iqCg34lzIfdmYxxGmQ,12
-wsba_hockey-1.0.1.dist-info/RECORD,,
+wsba_hockey-1.0.2.dist-info/licenses/LICENSE,sha256=Nr_Um1Pd5FQJTWWgm7maZArdtYMbDhzXYSwyJIZDGik,1114
+wsba_hockey-1.0.2.dist-info/METADATA,sha256=fBFZblpMy7vFKcM9MN4JBjJYSIIljdfVNd4GusrpbKU,3547
+wsba_hockey-1.0.2.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+wsba_hockey-1.0.2.dist-info/top_level.txt,sha256=acU7s3x-RZC1zGiqCOmO0g267iqCg34lzIfdmYxxGmQ,12
+wsba_hockey-1.0.2.dist-info/RECORD,,