wsba-hockey 1.1.2__tar.gz → 1.1.5__tar.gz

{wsba_hockey-1.1.2/src/wsba_hockey.egg-info → wsba_hockey-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsba_hockey
-Version: 1.1.2
+Version: 1.1.5
 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/
@@ -64,12 +64,18 @@ wsba.nhl_scrape_prospects('BOS')
 
 
 ## DATA ANALYTICS
-### Expected Goals (WeakSide Breakout and MoneyPuck models)
+### Expected Goals
+```python
+pbp = wsba.nhl_scrape_game(['2024020918'],split_shifts=False,remove=['game-end'])
+pbp = wsba.nhl_apply_xG(pbp)
+```
+
 ### Goal Impacts and Shot Analysis
+
 ### Stat Aggregation
 ```python
 pbp = wsba.nhl_scrape_season('20232024',remove=[], local = True)
-wsba.nhl_calculate_stats(pbp,'skater',[2],['5v5','4v4','3v3'],xg='wsba',shot_impact = True)
+wsba.nhl_calculate_stats(pbp,'skater',[2],['5v5','4v4','3v3'],shot_impact = True)
 ```
 ### Shot Plotting (Plots, Heatmaps, etc.)
 ```python
@@ -105,6 +111,4 @@ Dan Morse - Creator of the hockeyR package; another important inspiration and mo
 
 Patrick Bacon - Creator of TopDownHockey package
 
-MoneyPuck - Source of available xG data in the package
-
 Anyone in the NHL Public Analytics community who has stuck around and supported WeakSide Breakout Analysis hockey.

{wsba_hockey-1.1.2 → wsba_hockey-1.1.5}/README.md

@@ -49,12 +49,18 @@ wsba.nhl_scrape_prospects('BOS')
 
 
 ## DATA ANALYTICS
-### Expected Goals (WeakSide Breakout and MoneyPuck models)
+### Expected Goals
+```python
+pbp = wsba.nhl_scrape_game(['2024020918'],split_shifts=False,remove=['game-end'])
+pbp = wsba.nhl_apply_xG(pbp)
+```
+
 ### Goal Impacts and Shot Analysis
+
 ### Stat Aggregation
 ```python
 pbp = wsba.nhl_scrape_season('20232024',remove=[], local = True)
-wsba.nhl_calculate_stats(pbp,'skater',[2],['5v5','4v4','3v3'],xg='wsba',shot_impact = True)
+wsba.nhl_calculate_stats(pbp,'skater',[2],['5v5','4v4','3v3'],shot_impact = True)
 ```
 ### Shot Plotting (Plots, Heatmaps, etc.)
 ```python
@@ -90,6 +96,4 @@ Dan Morse - Creator of the hockeyR package; another important inspiration and mo
 
 Patrick Bacon - Creator of TopDownHockey package
 
-MoneyPuck - Source of available xG data in the package
-
 Anyone in the NHL Public Analytics community who has stuck around and supported WeakSide Breakout Analysis hockey.

{wsba_hockey-1.1.2 → wsba_hockey-1.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wsba_hockey"
-version = "1.1.2"
+version = "1.1.5"
 authors = [
   { name="Owen Singh", email="owenbksingh@gmail.com" },
 ]
@@ -18,7 +18,4 @@ keywords = ["wsba","hockey","scraping","NHL","analytics"]
 Homepage = "https://github.com/owensingh38/wsba_hockey/"
 
 [tool.setuptools]
-include-package-data = true
-
-[tool.setuptools.package-data]
-"wsba_hockey.tools" = ["*"]
+include-package-data = true

{wsba_hockey-1.1.2 → wsba_hockey-1.1.5}/src/wsba_hockey/api/api/index.py

@@ -1,17 +1,70 @@
 import pandas as pd
+import pyarrow.dataset as ds
 import numpy as np
-import wsba_hockey as wsba
 import requests as rs
 from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
 from datetime import datetime
 import pytz
+import feedparser
 
 app = FastAPI()
 
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
 @app.get("/")
 def read_root():
     return {"WeakSide Breakout Analysis": "Welcome to the API!"}
 
+@app.get("/articles")
+def articles():
+    rss = 'https://wsba.substack.com/feed'
+    feed = feedparser.parse(rss)
+
+    output = {}
+    output['articles'] = []
+    
+    for entry in feed['entries']:
+        year = entry['published_parsed'][0]
+        month = entry['published_parsed'][1]
+        day = entry['published_parsed'][2]
+
+        date = f'{year}-{month:02}-{day:02}'
+
+        if len(entry['links']) > 0:
+            for link in entry['links']:
+                if 'image' in link['type']:
+                    image = link['href']
+                else:
+                    image = ''
+        else:
+            if 'image' in link['type']:
+                image = link['href']
+            else:
+                image = ''
+
+        output['articles'].append(
+            {
+                'title': entry['title'],
+                'summary': entry['summary'],
+                'link': entry['link'],
+                'guid': entry['id'].replace('https://wsba.substack.com/p/',''),
+                'author': entry['author'],
+                'published': {'datetime': entry['published'],
+                              'date': date},
+                'thumbnail': image,
+                'content': entry['content'][0]['value']
+            }
+        )
+
+    return output
+
 @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()
@@ -28,33 +81,23 @@ def schedule_info(date: str):
 
     return data
 
+@app.get("/nhl/bracket/{season}")
+def schedule_info(season: int):
+    year = str(season)[4:8]
+    data = rs.get(f'https://api-web.nhle.com/v1/playoff-bracket/{year}').json()
+    
+    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'
+    info = rs.get(f'https://api-web.nhle.com/v1/gamecenter/{game_id}/play-by-play').json()
+
+    season = info['season']
+    dataset = ds.dataset(f's3://weakside-breakout/pbp/parquet/nhl_pbp_{season}.parquet', format='parquet')
+    filter_expr = (ds.field('game_id')==game_id)
 
-        skater.update({add:s})
-        goalie.update({add:g})
-        team_stats.update({add:t})
+    table = dataset.to_table(use_threads=True,filter=filter_expr)
+    df = table.to_pandas()
 
     df = df.fillna('')
 
@@ -122,8 +165,5 @@ def pbp(game_id: int):
 
     return {'info': info,
             'teams': teams,
-            'skater_stats':skater,
-            'goalie_stats':goalie,
-            'team_stats':team_stats,
             'plays': plays
         }

{wsba_hockey-1.1.2 → wsba_hockey-1.1.5}/src/wsba_hockey/data_pipelines.py

@@ -16,8 +16,9 @@ def pbp(seasons):
         for season in seasons:
             data = wsba.nhl_scrape_season(season,remove=[],local=True,sources=True,errors=True)
             errors.append(data['errors'])
-            data['pbp'].to_csv(f'pbp/nhl_pbp_{season}.csv',index=False)
-            pd.read_csv(f'pbp/nhl_pbp_{season}.csv').to_parquet(f'pbp/parquet/nhl_pbp_{season}.parquet',index=False)
+            data['pbp'].to_csv('temp.csv',index=False)
+            pd.read_csv('temp.csv').to_parquet(f'pbp/parquet/nhl_pbp_{season}.parquet',index=False)
+            os.remove('temp.csv')
         print(f'Errors: {errors}')
 
 def pbp_db(seasons):

wsba_hockey-1.1.5/src/wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/duos/app.py

@@ -0,0 +1,210 @@
+import pandas as pd
+import pyarrow.dataset as ds
+import numpy as np
+import calc
+import requests as rs
+from urllib.parse import *
+from shiny import *
+from shinywidgets import output_widget, render_widget 
+
+app_ui = ui.page_fluid(
+    ui.tags.link(
+        rel='stylesheet',
+        href='https://fonts.googleapis.com/css2?family=Bebas+Neue&display=swap'
+    ),
+    ui.tags.style(
+        """
+        body {
+            background-color: #09090b;
+            color: white;
+            font-family: 'Bebas Neue', sans-serif;
+        }
+
+        .custom-input input.form-control,
+        .custom-input .selectize-control,
+        .custom-input .selectize-input {
+            background-color: #09090b !important;  /* black background */
+            color: white !important;               /* white font color */
+            border-radius: 4px;
+            border: 1px solid #444;
+        }
+
+        .custom-input .selectize-dropdown,
+        .custom-input .selectize-dropdown-content {
+            background-color: #09090b !important;
+            color: white !important;
+        }          
+
+        .custom-input .selectize-control.multi .item {
+            background-color: #09090b !important;
+            color: white !important;
+            border-radius: 4px;
+            padding: 2px 6px;
+            margin: 2px 4px 2px 0;
+        }
+
+        label.control-label {
+            color: white !important;
+        }   
+
+        .selectize-control.multi {
+            width: 300px !important;
+        }
+
+        .form-row {
+            display: flex;
+            gap: 12px;
+            flex-wrap: wrap;
+            justify-content: center;
+        }
+
+        .submit-button {
+            display: flex;
+            justify-content: center;
+        }
+
+        .hide {
+            display: none;
+        }
+
+        .table thead tr {
+            white-space: nowrap;
+            text-align: center;
+            color: white;
+            background-color: #09090b;
+        }
+
+        .table thead th {
+            white-space: nowrap;
+            text-align: center;
+            color: #09090b;
+        }
+
+        .table tbody tr {
+            --bs-table-bg: #09090b;
+            --bs-table-color-state: white;
+        }
+
+        .table tbody tr td {
+            white-space: nowrap;
+            text-align: center;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            color: white;
+            background-color: #09090b;
+        }
+        """
+    ),
+    ui.output_data_frame("duos")
+)
+
+def server(input, output, session):
+    col = [
+        'season','season_type','game_id','game_date',
+        'away_team_abbr','home_team_abbr','event_num','period',
+        'seconds_elapsed',"strength_state","strength_state_venue",
+        "event_type","description",
+        "penalty_duration",
+        "event_team_abbr","event_team_venue",
+        "x_adj","y_adj",
+        "event_distance","event_angle","event_length","seconds_since_last",
+        "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",
+        'rush','rebound','empty_net','xG'
+    ]
+
+    @output()
+    @render.data_frame
+    def duos():
+        #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 = {
+            'season':['20182019'],
+            'team':['BOS'],
+            'strength_state':['5v5'],
+            'season_type':['2'],
+            'skaters':['8473419,8470638']
+        }
+        
+        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
+        dataset = ds.dataset(f's3://weakside-breakout/pbp/parquet/nhl_pbp_{season}.parquet', format='parquet')
+        filter_expr = ((ds.field('away_team_abbr') == query['team'][0]) | (ds.field('home_team_abbr') == query['team'][0])) & ((ds.field('season_type') == int(query['season_type'][0])))
+
+        table = dataset.to_table(columns=col,filter=filter_expr)
+        df = table.to_pandas()
+
+        #Prepare dataframe
+        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['onice'] = df['onice_for'] + ';' + df['onice_against']
+        
+        skaters = query['skaters']
+        #Four aggregations to be completed:
+        #Team with both players on the ice
+        #Team with each player on the ice without the other
+        #Team with neither player on the ice
+        both = df.loc[(df['onice'].str.contains(skaters[0]))&(df['onice'].str.contains(skaters[1]))]
+        p1 = df.loc[(df['onice'].str.contains(skaters[0]))&(~(df['onice'].str.contains(skaters[1])))]
+        p2 = df.loc[(~(df['onice'].str.contains(skaters[0])))&(df['onice'].str.contains(skaters[1]))]
+        neither = df.loc[~((df['onice'].str.contains(skaters[0]))&(df['onice'].str.contains(skaters[1])))]
+
+        dfs = []
+        if 'Other' in query['strength_state']:
+            strength_state = query['strength_state'] + df.loc[~(df['strength_state'].isin(['5v5','5v4','4v5'])),'strength_state'].drop_duplicates().to_list()
+        else:
+            strength_state = query['strength_state']
+        
+        skater_names = {}
+        #Find player names
+        for i in range(2):
+            skater = skaters[i]
+            data = rs.get(f'https://api-web.nhle.com/v1/player/{skater}/landing').json()
+
+            name = data['firstName']['default'].upper() + ' ' + data['lastName']['default'].upper()
+
+            skater_names.update({f'skater{i+1}':name})
+
+        team = query['team'][0]
+        
+        #Calculate stats for each df
+        skater1 = skater_names['skater1']
+        skater2 = skater_names['skater2']
+
+        for df, data in zip([both, p1, p2, neither],['With Both',f'With {skater1}, Without {skater2}',f'With {skater2}, Without {skater1}','With Neither']):
+            stats = calc.calculate_stats(df,team,strength_state).replace({team: f'{team} {data}'})
+            dfs.append(stats)
+
+        total = pd.concat(dfs)[['Team',
+                                'TOI',
+                                'GF/60','GA/60',
+                                'SF/60','SA/60',
+                                'FF/60','FA/60',
+                                'xGF/60','xGA/60',
+                                'GF%','SF%',
+                                'FF%','xGF%',
+                                'GSAx']].round(2)
+        
+        return render.DataTable(total)
+
+app = App(app_ui, server)

wsba_hockey-1.1.5/src/wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/duos/calc.py

@@ -0,0 +1,163 @@
+import numpy as np
+import pandas as pd
+
+def calc_team(pbp,game_strength):
+    teams = []
+    fenwick_events = ['missed-shot','shot-on-goal','goal']
+
+    for team in [('away','home'),('home','away')]:
+        #Flip strength state (when necessary) and filter by game strength if not "all"
+        if game_strength != "all":
+            if game_strength not in ['3v3','4v4','5v5']:
+                for strength in game_strength:
+                    pbp['strength_state'] = np.where(np.logical_and(pbp['event_team_venue']==team[1],pbp['strength_state']==strength[::-1]),strength,pbp['strength_state'])
+
+            pbp = pbp.loc[pbp['strength_state'].isin(game_strength)]
+
+        pbp['xGF'] = np.where(pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr'], pbp['xG'], 0)
+        pbp['xGA'] = np.where(pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr'], pbp['xG'], 0)
+        pbp['GF'] = np.where((pbp['event_type'] == "goal") & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['GA'] = np.where((pbp['event_type'] == "goal") & (pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr']), 1, 0)
+        pbp['SF'] = np.where((pbp['event_type'].isin(['shot-on-goal','goal'])) & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['SA'] = np.where((pbp['event_type'].isin(['shot-on-goal','goal'])) & (pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr']), 1, 0)
+        pbp['FF'] = np.where((pbp['event_type'].isin(fenwick_events)) & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['FA'] = np.where((pbp['event_type'].isin(fenwick_events)) & (pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr']), 1, 0)
+        pbp['CF'] = np.where((pbp['event_type'].isin(fenwick_events+['blocked-shot'])) & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['CA'] = np.where((pbp['event_type'].isin(fenwick_events+['blocked-shot'])) & (pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr']), 1, 0)
+        pbp['HF'] =  np.where((pbp['event_type']=='hit') & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['HA'] = np.where((pbp['event_type']=='hit') & (pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr']), 1, 0)
+        pbp['Penl'] = np.where((pbp['event_type']=='penalty') & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['Penl2'] = np.where((pbp['event_type']=='penalty') & (pbp['penalty_duration']==2) & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['Penl5'] = np.where((pbp['event_type']=='penalty') & (pbp['penalty_duration']==5) & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['PIM'] = np.where((pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), pbp['penalty_duration'], 0)
+        pbp['Draw'] = np.where((pbp['event_type']=='penalty') & (pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr']), 1, 0)
+        pbp['Give'] = np.where((pbp['event_type']=='giveaway') & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['Take'] = np.where((pbp['event_type']=='takeaway') & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr']), 1, 0)
+        pbp['Block'] = pbp['CA'] - pbp['FA']
+        pbp['RushF'] = np.where((pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr'])&(pbp['rush']>0), 1, 0)
+        pbp['RushA'] = np.where((pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr'])&(pbp['rush']>0), 1, 0)
+        pbp['RushFxG'] = np.where((pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr'])&(pbp['rush']>0), pbp['xG'], 0)
+        pbp['RushAxG'] = np.where((pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr'])&(pbp['rush']>0), pbp['xG'], 0)
+        pbp['RushFG'] = np.where((pbp['event_type'] == "goal") & (pbp['event_team_abbr'] == pbp[f'{team[0]}_team_abbr'])&(pbp['rush']>0), 1, 0)
+        pbp['RushAG'] = np.where((pbp['event_type'] == "goal") & (pbp['event_team_abbr'] == pbp[f'{team[1]}_team_abbr'])&(pbp['rush']>0), 1, 0)
+
+        stats = pbp.groupby([f'{team[0]}_team_abbr','season']).agg(
+            GP=('game_id','nunique'),
+            TOI=('event_length','sum'),
+            FF=('FF', 'sum'),
+            FA=('FA', 'sum'),
+            GF=('GF', 'sum'),
+            GA=('GA', 'sum'),
+            SF=('SF','sum'),
+            SA=('SA','sum'),
+            xGF=('xGF', 'sum'),
+            xGA=('xGA', 'sum'),
+            CF=('CF','sum'),
+            CA=('CA','sum'),
+            HF=('HF','sum'),
+            HA=('HA','sum'),
+            Penl=('Penl','sum'),
+            Penl2=('Penl2','sum'),
+            Penl5=('Penl5','sum'),
+            PIM=('PIM','sum'),
+            Draw=('Draw','sum'),
+            Give=('Give','sum'),
+            Take=('Take','sum'),
+            Block=('Block','sum'),
+            RushF=('RushF','sum'),
+            RushA=('RushA','sum'),
+            RushFxG=('RushFxG','sum'),
+            RushAxG=('RushAxG','sum'),
+            RushFG=('RushFG','sum'),
+            RushAG=('RushAG','sum'),
+        ).reset_index().rename(columns={f'{team[0]}_team_abbr':"Team",'season':"Season",'game_id':'Game'})
+        teams.append(stats)
+    
+    onice_stats = pd.concat(teams).groupby(['Team','Season']).agg(
+            GP=('GP','sum'),
+            TOI=('TOI','sum'),
+            FF=('FF', 'sum'),
+            FA=('FA', 'sum'),
+            GF=('GF', 'sum'),
+            GA=('GA', 'sum'),
+            SF=('SF','sum'),
+            SA=('SA','sum'),
+            xGF=('xGF', 'sum'),
+            xGA=('xGA', 'sum'),
+            CF=('CF','sum'),
+            CA=('CA','sum'),
+            HF=('HF','sum'),
+            HA=('HA','sum'),
+            Penl=('Penl','sum'),
+            Penl2=('Penl2','sum'),
+            Penl5=('Penl5','sum'),
+            PIM=('PIM','sum'),
+            Draw=('Draw','sum'),
+            Give=('Give','sum'),
+            Take=('Take','sum'),
+            Block=('Block','sum'),
+            RushF=('RushF','sum'),
+            RushA=('RushA','sum'),
+            RushFxG=('RushFxG','sum'),
+            RushAxG=('RushAxG','sum'),
+            RushFG=('RushFG','sum'),
+            RushAG=('RushAG','sum'),
+    ).reset_index()
+
+    for col in onice_stats.columns.to_list()[2:30]:
+        onice_stats[col] = onice_stats[col].astype(float)
+
+    onice_stats['ShF%'] = onice_stats['GF']/onice_stats['SF']
+    onice_stats['xGF/FF'] = onice_stats['xGF']/onice_stats['FF']
+    onice_stats['GF/xGF'] = onice_stats['GF']/onice_stats['xGF']
+    onice_stats['FshF%'] = onice_stats['GF']/onice_stats['FF']
+    onice_stats['ShA%'] = onice_stats['GA']/onice_stats['SA']
+    onice_stats['xGA/FA'] = onice_stats['xGA']/onice_stats['FA']
+    onice_stats['GA/xGA'] = onice_stats['GA']/onice_stats['xGA']
+    onice_stats['FshA%'] = onice_stats['GA']/onice_stats['FA']
+    onice_stats['PM%'] = onice_stats['Take']/(onice_stats['Give']+onice_stats['Take'])
+    onice_stats['HF%'] = onice_stats['HF']/(onice_stats['HF']+onice_stats['HA'])
+    onice_stats['PENL%'] = onice_stats['Draw']/(onice_stats['Draw']+onice_stats['Penl'])
+    onice_stats['GSAx'] = onice_stats['xGA']-onice_stats['GA']
+
+    return onice_stats
+
+
+def calculate_stats(pbp,team,game_strength):
+    per_sixty = ['Fi','xGi','Gi','A1','A2','P1','P','Si','OZF','NZF','DZF','FF','FA','xGF','xGA','GF','GA','SF','SA','CF','CA','HF','HA','Give','Take','Penl','Penl2','Penl5','Draw','Block']
+
+    complete = calc_team(pbp,game_strength)
+
+    #WSBA
+    complete['WSBA'] = complete['Team']+complete['Season'].astype(str)
+
+    #Set TOI to minute
+    complete['TOI'] = complete['TOI']/60
+
+    #Add per 60 stats
+    for stat in per_sixty[11:len(per_sixty)]:
+        complete[f'{stat}/60'] = (complete[stat]/complete['TOI'])*60
+        
+    complete['GF%'] = complete['GF']/(complete['GF']+complete['GA'])
+    complete['SF%'] = complete['SF']/(complete['SF']+complete['SA'])
+    complete['xGF%'] = complete['xGF']/(complete['xGF']+complete['xGA'])
+    complete['FF%'] = complete['FF']/(complete['FF']+complete['FA'])
+    complete['CF%'] = complete['CF']/(complete['CF']+complete['CA'])
+
+    head = ['Team','Game'] if 'Game' in complete.columns else ['Team']
+    complete = complete[head+[
+        'Season','WSBA',
+        'GP','TOI',
+        "GF","SF","FF","xGF","xGF/FF","GF/xGF","ShF%","FshF%",
+        "GA","SA","FA","xGA","xGA/FA","GA/xGA","ShA%","FshA%",
+        'CF','CA',
+        'GF%','SF%','FF%','xGF%','CF%',
+        'HF','HA','HF%',
+        'Penl','Penl2','Penl5','PIM','Draw','PENL%',
+        'Give','Take','PM%',
+        'Block',
+        'RushF','RushA','RushFxG','RushAxG','RushFG','RushAG',
+        'GSAx'
+    ]+[f'{stat}/60' for stat in per_sixty[11:len(per_sixty)]]]
+
+    return complete.loc[complete['Team']==team]