wsba-hockey 1.0.6__py3-none-any.whl → 1.1.1__py3-none-any.whl

wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/pbp/app.py

@@ -109,7 +109,7 @@ def server(input, output, session):
     query = reactive.Value(None)
 
     def schedule():
-        schedule = pd.read_csv('https://f005.backblazeb2.com/file/weakside-breakout/info/schedule.csv')
+        schedule = pd.read_csv('https://weakside-breakout.s3.us-east-2.amazonaws.com/info/schedule.csv')
         
         return schedule.loc[schedule['gameState'].isin(['OFF','FINAL'])]
 
@@ -126,7 +126,8 @@ def server(input, output, session):
             'event_type':['missed-shot,shot-on-goal,goal'],
             'strength_state':['all'],
             'filters':['false'],
-            'table':['false']
+            'table':['false'],
+            'title':['true']
         }
 
         for key in defaults.keys():
@@ -223,7 +224,7 @@ def server(input, output, session):
         front_year = int(query['game_id'][0][0:4])
         season = f'{front_year}{front_year+1}'
         #Load appropriate dataframe
-        df = pd.read_parquet(f'https://f005.backblazeb2.com/file/weakside-breakout/pbp/{season}.parquet')
+        df = pd.read_parquet(f'https://weakside-breakout.s3.us-east-2.amazonaws.com/pbp/{season}.parquet')
 
         #Prepare dataframe for plotting based on URL parameters
         game_data = df.loc[df['game_id'].astype(str).isin(query['game_id'])].replace({np.nan: None})
@@ -255,7 +256,7 @@ def server(input, output, session):
                               color='Team',
                               color_discrete_map=colors,
                               hover_name='Description',
-                              hover_data=['Event Num.', 'Period', 'Time (in seconds)',
+                              hover_data=['Event Num.', 'Period', 'Time (in Period)',
                                           'Strength',
                                           'Away Score', 'Home Score', 'x', 'y',
                                           'Event Distance from Attacking Net',
@@ -265,28 +266,44 @@ def server(input, output, session):
             for trace in plot.data:
                 rink.add_trace(trace)
 
-            return rink.update_layout(
-                title=dict(
-                    text=game_title,
-                    x=0.5, y=0.94,
-                    xanchor='center',
-                    yanchor='top',
-                    font=dict(color='white')
-                ),
-                           
-                legend=dict(
-                    orientation='h',
-                    x=0.49,
-                    y=-0.04,
-                    xanchor='center',
-                    yanchor='bottom',
-                    font=dict(color='white')
-                ),
+            if active_params()['title'][0]=='false':
+                return rink.update_layout(                                
+                    legend=dict(
+                        orientation='h',
+                        x=0.49,
+                        y=-0.04,
+                        xanchor='center',
+                        yanchor='bottom',
+                        font=dict(color='white')
+                    ),
 
-                hoverlabel=dict(
-                    font_size=10
+                    hoverlabel=dict(
+                        font_size=10
+                    )
+                )
+            else:
+                return rink.update_layout(
+                    title=dict(
+                        text=game_title,
+                        x=0.5, y=0.94,
+                        xanchor='center',
+                        yanchor='top',
+                        font=dict(color='white')
+                    ),
+                                
+                    legend=dict(
+                        orientation='h',
+                        x=0.49,
+                        y=-0.04,
+                        xanchor='center',
+                        yanchor='bottom',
+                        font=dict(color='white')
+                    ),
+
+                    hoverlabel=dict(
+                        font_size=10
+                    )
                 )
-            )
 
     @output
     @render.ui
@@ -322,10 +339,9 @@ def server(input, output, session):
             if input.metric_select()=='Timelines':
                 return None
             else:
-                df = game_df.get().copy()[['event_num','period','seconds_elapsed','strength_state','event_type','Description','event_team_abbr','event_player_1_name','shot_type','zone_code','x','y','away_score','home_score','xG']].rename(columns={
+                df = game_df.get().copy()[['event_num','period','Time (in Period)','strength_state','event_type','Description','event_team_abbr','event_player_1_name','shot_type','zone_code','x','y','away_score','home_score','xG']].rename(columns={
                     'event_num':'#',
                     'period':'Period',
-                    'seconds_elapsed':'Seconds',
                     'strength_state':'Strength State',
                     'event_type':'Event',
                     'event_team_abbr':'Team',
@@ -352,7 +368,7 @@ def server(input, output, session):
                 data = wsba_plt.timelines(game_df.get().copy())
                 colors = wsba_plt.colors(data)
                 timelines = px.line(data,
-                                    x='Time (in seconds)',
+                                    x='Time (in Period)',
                                     y=input.timeline_select(),
                                     color='Team',
                                     color_discrete_map=colors,
@@ -368,7 +384,7 @@ def server(input, output, session):
                     paper_bgcolor="rgba(0,0,0,0)", 
                     plot_bgcolor="rgba(0,0,0,0)",  
                     font_color='white',         
-                    xaxis=dict(title=dict(text='Time (in seconds)'),showgrid=False),
+                    xaxis=dict(title=dict(text='Time (in Period)'),showgrid=False),
                     yaxis=dict(title=dict(text=input.timeline_select()),showgrid=False),
 
                     legend=dict(

wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/pbp/plot.py

@@ -23,7 +23,7 @@ def colors(df):
     away_abbr = list(df['away_team_abbr'])[0]
     home_abbr = list(df['home_team_abbr'])[0]
     season = list(df['season'])[0]
-    team_data = pd.read_csv('https://f005.backblazeb2.com/file/weakside-breakout/info/nhl_teaminfo.csv')
+    team_data = pd.read_csv('https://weakside-breakout.s3.us-east-2.amazonaws.com/info/nhl_teaminfo.csv')
 
     team_info ={
         away_abbr: list(team_data.loc[team_data['WSBA']==f'{away_abbr}{season}','Primary Color'])[0],
@@ -32,13 +32,21 @@ def colors(df):
 
     return team_info
 
+def convert_time(seconds,period):
+    period_seconds = seconds - ((period-1)*1200)
+    minutes = int(period_seconds/60)
+    seconds = int(((period_seconds/60)-minutes)*60)
+
+    return f'{minutes}:{seconds:02}'
+
 def prep(df,events,strengths):
     df = df.loc[(df['event_type'].isin(events))]
-    
+
+    df['strength_state'] = np.where(df['strength_state'].isin(['5v5','5v4','4v5']),df['strength_state'],'Other')
     if 'all' not in strengths:
         df = df.loc[((df['strength_state'].isin(strengths)))]
 
-    df['xG'] = df['xG'].fillna(0)
+    df = df.fillna(0)
     df['size'] = np.where(df['xG']<=0,40,df['xG']*400)
     
     df['marker'] = df['event_type'].replace(event_markers)
@@ -48,6 +56,7 @@ def prep(df,events,strengths):
     df['Event Num.'] = df['event_num']
     df['Period'] = df['period']
     df['Time (in seconds)'] = df['seconds_elapsed']
+    df['Time (in Period)'] = df.apply(lambda x: convert_time(x['Time (in seconds)'],x['Period']), axis=1)
     df['Strength'] = df['strength_state']
     df['Away Score'] = df['away_score']
     df['Home Score'] = df['home_score']

wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/pbp/rink_plot.py

@@ -222,7 +222,7 @@ def rink(setting = "full", vertical = False):
         )
 
     # Add logo
-    logo = Image.open(rs.get('https://f005.backblazeb2.com/file/weakside-breakout/utils/wsba.png',stream=True).raw)
+    logo = Image.open(rs.get('https://weakside-breakout.s3.us-east-2.amazonaws.com/utils/wsba.png',stream=True).raw)
 
     fig.add_layout_image(
         dict(

wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/skater/app.py

@@ -46,7 +46,7 @@ def server(input, output, session):
         #Determine which season to load based on the input
         season = query['season'][0]
         #Load appropriate dataframe
-        df = pd.read_parquet(f'https://f005.backblazeb2.com/file/weakside-breakout/pbp/{season}.parquet')
+        df = pd.read_parquet(f'https://weakside-breakout.s3.us-east-2.amazonaws.com/pbp/{season}.parquet')
     
         #Prepare dataframe for plotting based on URL parameters
         df = df.loc[(df['event_player_1_id'].astype(str).str.replace('.0','').isin(query['skater']))&(df['season'].astype(str).isin(query['season']))&(df['event_team_abbr'].astype(str).isin(query['team']))&(df['season_type'].astype(str).isin(query['season_type']))].replace({np.nan: None})

wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/skater/plot.py

@@ -20,9 +20,9 @@ def wsba_rink(setting='full', vertical=False):
     return rink_plot.rink(setting=setting, vertical=vertical)
 
 def colors(df):
-    team = list(df['away_team_abbr'])[0]
+    team = list(df['event_team_abbr'])[0]
     season = list(df['season'])[0]
-    team_data = pd.read_csv('https://f005.backblazeb2.com/file/weakside-breakout/info/nhl_teaminfo.csv')
+    team_data = pd.read_csv('https://weakside-breakout.s3.us-east-2.amazonaws.com/info/nhl_teaminfo.csv')
 
     team_info ={
         team: list(team_data.loc[team_data['WSBA']==f'{team}{season}','Primary Color'])[0],
@@ -37,7 +37,7 @@ def prep(df,events,strengths):
     if strengths != 'all':
         df = df.loc[((df['strength_state'].isin(strengths)))]
 
-    df['xG'] = df['xG'].fillna(0)
+    df = df.fillna(0)
     df['size'] = np.where(df['xG']<=0,40,df['xG']*400)
     
     df['marker'] = df['event_type'].replace(event_markers)
@@ -50,9 +50,10 @@ def prep(df,events,strengths):
     df['Strength'] = df['strength_state']
     df['Away Score'] = df['away_score']
     df['Home Score'] = df['home_score']
-    df['x'] = np.where(df['x_adj']<0,-df['y_adj'],df['y_adj'])
+    df['x'] = np.where(df['x_adj']<0,df['y_adj'],-df['y_adj'])
     df['y'] = abs(df['x_adj'])
     df['Event Distance from Attacking Net'] = df['event_distance']
     df['Event Angle to Attacking Net'] = df['event_angle']
     df['xG'] = df['xG']*100
+
     return df

wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/skater/rink_plot.py

@@ -222,7 +222,7 @@ def rink(setting = "full", vertical = False):
         )
 
     # Add logo
-    logo = Image.open(rs.get('https://f005.backblazeb2.com/file/weakside-breakout/utils/wsba.png',stream=True).raw)
+    logo = Image.open(rs.get('https://weakside-breakout.s3.us-east-2.amazonaws.com/utils/wsba.png',stream=True).raw)
 
     fig.add_layout_image(
         dict(

wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/team_heatmaps/app.py

@@ -0,0 +1,103 @@
+import pandas as pd
+import plot as wsba_plt
+import numpy as np
+from urllib.parse import *
+from shiny import *
+from shinywidgets import output_widget, render_widget
+
+app_ui = ui.page_fluid(
+    ui.tags.style(
+    "body {background:#09090b"
+    "}"
+    ),
+    output_widget("plot_skater"),
+)
+
+def server(input, output, session):
+    @output()
+    @render_widget
+    def plot_skater():
+        #Retreive query parameters
+        search = session.input[".clientdata_url_search"]()
+        query = parse_qs(urlparse(search).query)
+        
+        print(query)
+        #If no input data is provided automatically provide a select skater and plot all 5v5 fenwick shots
+        defaults = {
+            'team':['BOS'],
+            'season':['20222023'],
+            'strength_state':['5v5'],
+            'season_type':['2']
+        }
+        
+        for key in defaults.keys():
+            if key not in query.keys():
+                query.update({key:defaults[key]})
+
+        #Iterate through query and parse params with multiple selections
+        for param in query.keys():
+            q_string = query[param][0]
+            query[param] = q_string.split(',')
+
+        print(query)
+        #Determine which season to load based on the input
+        season = query['season'][0]
+        #Load appropriate dataframe
+        df = pd.read_parquet(f'https://weakside-breakout.s3.us-east-2.amazonaws.com/pbp/{season}.parquet')
+        
+        #Prepare dataframe for plotting based on URL parameters
+        df = df.loc[(df['season'].astype(str).isin(query['season']))&(df['season_type'].astype(str).isin(query['season_type']))].replace({np.nan: None})
+        #Return empty rink if no data exists else continue
+        if df.empty:
+            return wsba_plt.wsba_rink()
+        else:
+            rink = wsba_plt.wsba_rink()
+
+            try:
+                for_plot = wsba_plt.heatmap(df,team=query['team'][0],events=['missed-shot','shot-on-goal','goal'],strengths=query['strength_state'],onice='for')
+                against_plot = wsba_plt.heatmap(df,team=query['team'][0],events=['missed-shot','shot-on-goal','goal'],strengths=query['strength_state'],onice='against')
+
+                for trace in for_plot.data:
+                    rink.add_trace(trace)
+                
+                for trace in against_plot.data:
+                    rink.add_trace(trace)
+
+                season = int(season[0:4])
+                team = query['team'][0]
+                strengths = 'All Situations' if len(query['strength_state']) == 4 else query['strength_state']
+                span = 'Regular Season' if query['season_type'][0]=='2' else 'Playoffs'
+
+                return rink.update_layout( 
+                    title=dict(
+                        text=f'{team} On-Ice xG at {strengths}; {season}-{season+1}, {span}',
+                        x=0.5, y=0.96,
+                        xanchor='center',
+                        yanchor='top',
+                        font=dict(color='white')
+                    ),
+                ).add_annotation(
+                    text='Lower xG',
+                    xref="paper",
+                    yref="paper",
+                    xanchor='right',
+                    yanchor='top',
+                    font=dict(color='white'),
+                    x=0.3,
+                    y=0.04,
+                    showarrow=False
+                ).add_annotation(
+                    text='Higher xG',
+                    xref="paper",
+                    yref="paper",
+                    xanchor='right',
+                    yanchor='top',
+                    font=dict(color='white'),
+                    x=0.76,
+                    y=0.04,
+                    showarrow=False
+                )
+            except:
+                return wsba_plt.wsba_rink()
+
+app = App(app_ui, server)

wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/team_heatmaps/plot.py

@@ -0,0 +1,95 @@
+import pandas as pd
+import numpy as np
+import plotly.graph_objects as go
+import matplotlib.pyplot as plt
+import rink_plot
+from scipy.interpolate import griddata
+from scipy.ndimage import gaussian_filter
+
+def wsba_rink(setting='full', vertical=False):
+    return rink_plot.rink(setting=setting, vertical=vertical)
+
+def heatmap(df,team,events,strengths,onice):
+    df['event_team_abbr_2'] = np.where(df['home_team_abbr']==df['event_team_abbr'],df['away_team_abbr'],df['home_team_abbr'])
+    df['strength_state_2'] = df['strength_state'].str[::-1]
+
+    df = df.fillna(0)
+    df = df.loc[(df['event_type'].isin(events))&(df['x_adj'].notna())&(df['y_adj'].notna())]
+    if onice == 'for':
+        df['x'] = abs(df['x_adj'])
+        df['y'] = np.where(df['x_adj']<0,-df['y_adj'],df['y_adj'])
+        df['event_distance'] = abs(df['event_distance'].fillna(0))
+        df = df.loc[(df['event_distance']<=89)&(df['x']<=89)&(df['empty_net']==0)]
+
+        x_min = 0
+        x_max = 100
+    else:
+        df['x'] = -abs(df['x_adj'])
+        df['y'] = np.where(df['x_adj']>0,-df['y_adj'],df['y_adj'])
+        df['event_distance'] = -abs(df['event_distance'])
+        df = df.loc[(df['event_distance']>-89)&(df['x']>-89)&(df['empty_net']==0)]
+
+        x_min = -100
+        x_max = 0
+
+    df['home_on_ice'] = df['home_on_1_id'].astype(str) + ";" + df['home_on_2_id'].astype(str) + ";" + df['home_on_3_id'].astype(str) + ";" + df['home_on_4_id'].astype(str) + ";" + df['home_on_5_id'].astype(str) + ";" + df['home_on_6_id'].astype(str)
+    df['away_on_ice'] = df['away_on_1_id'].astype(str) + ";" + df['away_on_2_id'].astype(str) + ";" + df['away_on_3_id'].astype(str) + ";" + df['away_on_4_id'].astype(str) + ";" + df['away_on_5_id'].astype(str) + ";" + df['away_on_6_id'].astype(str)
+
+    df['onice_for'] = np.where(df['home_team_abbr']==df['event_team_abbr'],df['home_on_ice'],df['away_on_ice'])
+    df['onice_against'] = np.where(df['away_team_abbr']==df['event_team_abbr'],df['home_on_ice'],df['away_on_ice'])
+
+    df['strength_state'] = np.where(df['strength_state'].isin(['5v5','5v4','4v5']),df['strength_state'],'Other')
+    df['strength_state_2'] = np.where(df['strength_state_2'].isin(['5v5','5v4','4v5']),df['strength_state_2'],'Other')
+        
+    if strengths != 'all':
+        if onice == 'against':
+            df = df.loc[((df['strength_state_2'].isin(strengths)))]
+        else:
+            df = df.loc[((df['strength_state'].isin(strengths)))]
+
+    [x,y] = np.round(np.meshgrid(np.linspace(x_min,x_max,(x_max-x_min)),np.linspace(-42.5,42.5,85)))
+    xgoals = griddata((df['x'],df['y']),df['xG'],(x,y),method='cubic',fill_value=0)
+    xgoals = np.where(xgoals < 0,0,xgoals)
+    xgoals_smooth = gaussian_filter(xgoals,sigma=3)
+
+    if onice == 'for':
+        player_shots = df.loc[(df['event_team_abbr']==team)]
+    else:
+        player_shots = df.loc[(df['event_team_abbr_2']==team)]
+    [x,y] = np.round(np.meshgrid(np.linspace(x_min,x_max,(x_max-x_min)),np.linspace(-42.5,42.5,85)))
+    xgoals_player = griddata((player_shots['x'],player_shots['y']),player_shots['xG'],(x,y),method='cubic',fill_value=0)
+    xgoals_player = np.where(xgoals_player < 0,0,xgoals_player)
+
+    difference = (gaussian_filter(xgoals_player,sigma = 3)) - xgoals_smooth
+    data_min= difference.min()
+    data_max= difference.max()
+   
+    if abs(data_min) > data_max:
+        data_max = data_min * -1
+    elif data_max > abs(data_min):
+        data_min = data_max * -1
+
+    fig = go.Figure(
+        data = go.Contour(  x=np.linspace(x_min,x_max,(x_max-x_min)),
+                            y=np.linspace(-42.5,42.5,85),
+                            z=difference,
+                            colorscale=[[0.0,'red'],[0.5,'#09090b'],[1.0,'blue']],
+                            connectgaps=True,
+                            contours=dict(
+                                type='levels',
+                                start = data_min,
+                                end = data_max,
+                                size=(data_max-data_min)/11
+                            ),
+                            colorbar=dict(
+                                len = 0.7,
+                                orientation='h',
+                                showticklabels=False,
+                                thickness=15,
+                                yref='paper',
+                                yanchor='top',
+                                y=0
+                            ))
+    )
+
+    return fig