wsba-hockey 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

wsba_hockey/wsba_main.py

@@ -4,10 +4,10 @@ import requests as rs
 import pandas as pd
 import time
 from datetime import datetime, timedelta, date
-from .tools.scraping import *
-from .tools.xg_model import *
-from .tools.agg import *
-from .tools.plotting import *
+from wsba_hockey.tools.scraping import *
+from wsba_hockey.tools.xg_model import *
+from wsba_hockey.tools.agg import *
+from wsba_hockey.tools.plotting import *
 
 ### WSBA HOCKEY ###
 ## Provided below are all integral functions in the WSBA Hockey Python package. ##
@@ -59,7 +59,7 @@ convert_team_abbr = {'L.A':'LAK',
                      'T.B':'TBL',
                      'PHX':'ARI'}
 
-per_sixty = ['Fi','xGi','Gi','A1','A2','P1','P','OZF','NZF','DZF','FF','FA','xGF','xGA','GF','GA','CF','CA','HF','HA','Give','Take','Penl','Penl2','Penl5','Draw','Block']
+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','GSAx']
 
 #Some games in the API are specifically known to cause errors in scraping.
 #This list is updated as frequently as necessary
@@ -687,7 +687,7 @@ def nhl_shooting_impacts(agg,type):
                 pos[f'{group[0]}-FNI-T'] = (pos[f'{group[0]}-FNI']/60)*pos['TOI']
        
        #Rank per 60 stats
-        for stat in per_sixty[10:len(per_sixty)]:
+        for stat in per_sixty[11:len(per_sixty)]:
             pos[f'{stat}/60-P'] = pos[f'{stat}/60'].rank(pct=True)
 
         #Flip percentiles for against stats
@@ -964,12 +964,12 @@ def nhl_calculate_stats(pbp,type,season_types,game_strength,split_game=False,ros
             'Height (in)','Weight (lbs)',
             'Birthday','Age','Nationality',
             'GP','TOI',
-            "GF","FF","xGF","xGF/FF","GF/xGF","FshF%",
-            "GA","FA","xGA","xGA/FA","GA/xGA","FshA%",
+            "GF","SF","FF","xGF","xGF/FF","GF/xGF","ShF%","FshF%",
+            "GA","SA","FA","xGA","xGA/FA","GA/xGA","ShA%","FshA%",
             'CF','CA',
             'GSAx',
             'RushF','RushA','RushFxG','RushAxG','RushFG','RushAG'
-        ]+[f'{stat}/60' for stat in ['FF','FA','xGF','xGA','GF','GA','CF','CA','GSAx']]]
+        ]+[f'{stat}/60' for stat in ['FF','FA','xGF','xGA','GF','GA','SF','SA','CF','CA','GSAx']]]
 
         #Apply shot impacts if necessary
         if shot_impact:
@@ -991,10 +991,11 @@ def nhl_calculate_stats(pbp,type,season_types,game_strength,split_game=False,ros
         complete['TOI'] = complete['TOI']/60
 
         #Add per 60 stats
-        for stat in per_sixty[10:len(per_sixty)]:
+        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'])
@@ -1003,16 +1004,17 @@ def nhl_calculate_stats(pbp,type,season_types,game_strength,split_game=False,ros
         complete = complete[head+[
             'Season','WSBA',
             'GP','TOI',
-            "GF","FF","xGF","xGF/FF","GF/xGF","FshF%",
-            "GA","FA","xGA","xGA/FA","GA/xGA","FshA%",
+            "GF","SF","FF","xGF","xGF/FF","GF/xGF","ShF%","FshF%",
+            "GA","SA","FA","xGA","xGA/FA","GA/xGA","ShA%","FshA%",
             'CF','CA',
-            'GF%','FF%','xGF%','CF%',
+            'GF%','SF%','FF%','xGF%','CF%',
             'HF','HA','HF%',
             'Penl','Penl2','Penl5','PIM','Draw','PENL%',
             'Give','Take','PM%',
             'Block',
-            'RushF','RushA','RushFxG','RushAxG','RushFG','RushAG'
-        ]+[f'{stat}/60' for stat in per_sixty[10:len(per_sixty)]]]
+            'RushF','RushA','RushFxG','RushAxG','RushFG','RushAG',
+            'GSAx'
+        ]+[f'{stat}/60' for stat in per_sixty[11:len(per_sixty)]]]
         #Apply shot impacts if necessary
         if shot_impact:
             complete = nhl_shooting_impacts(complete,'team')
@@ -1038,6 +1040,7 @@ def nhl_calculate_stats(pbp,type,season_types,game_strength,split_game=False,ros
         complete['FC%'] = complete['Fi']/complete['FF']
         complete['xGC%'] = complete['xGi']/complete['xGF']
         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'])
@@ -1098,11 +1101,11 @@ def nhl_calculate_stats(pbp,type,season_types,game_strength,split_game=False,ros
             'Height (in)','Weight (lbs)',
             'Birthday','Age','Nationality',
             'GP','TOI',
-            "Gi","A1","A2",'P1','P',
+            "Gi","A1","A2",'P1','P','Si','Sh%',
             'Give','Take','PM%','HF','HA','HF%',
             "Fi","xGi",'xGi/Fi',"Gi/xGi","Fshi%",
-            "GF","FF","xGF","xGF/FF","GF/xGF","FshF%",
-            "GA","FA","xGA","xGA/FA","GA/xGA","FshA%",
+            "GF","SF","FF","xGF","xGF/FF","GF/xGF","ShF%","FshF%",
+            "GA","SA","FA","xGA","xGA/FA","GA/xGA","ShA%","FshA%",
             'Ci','CF','CA','CF%',
             'FF%','xGF%','GF%',
             'Rush',"Rush xG",'Rush G',"GC%","AC%","GI%","FC%","xGC%",
@@ -1112,6 +1115,7 @@ def nhl_calculate_stats(pbp,type,season_types,game_strength,split_game=False,ros
             'Block',
             'OZF','NZF','DZF',
             'OZF%','NZF%','DZF%',
+            'GSAx'
         ]+[f'{stat}/60' for stat in per_sixty]+type_metrics].fillna(0).sort_values(['Player','Season','Team','ID'])
         
         #Apply shot impacts if necessary (Note: this will remove skaters with fewer than 150 minutes of TOI due to the shot impact TOI rule)

{wsba_hockey-1.1.3.dist-info → wsba_hockey-1.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wsba_hockey
-Version: 1.1.3
+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.3.dist-info → wsba_hockey-1.1.5.dist-info}/RECORD

@@ -1,8 +1,8 @@
 wsba_hockey/__init__.py,sha256=yfr8z5PA503iaIQv30ngancwT_WnsuK-tZETKlHcI0M,377
-wsba_hockey/data_pipelines.py,sha256=wjyxw1ikv4N3kmfTuHxdHj7_W5bz0wAM-DIgxvJVg2s,10852
-wsba_hockey/workspace.py,sha256=ECScWNqkmx8SDoxTtZYZtM1K1_oX-wQSXXsb_1Bjca4,2014
-wsba_hockey/wsba_main.py,sha256=c8KEXBpjHHEadMMStMRXsNYqbvtoYdZbmOl8_FBmHQg,53761
-wsba_hockey/api/api/index.py,sha256=b2QEOJ72TxOCZT9KsHvIPPow0RwLRCOUyeyrIrSqb6o,5926
+wsba_hockey/data_pipelines.py,sha256=SITapG3nbea6-_EsXujMW2JBQxtRaQ33XMcE6ohn2Ko,10853
+wsba_hockey/workspace.py,sha256=MwuyqyLW0dHNa06WEm60RkvbFoCn8LBXhnki66V-ttY,954
+wsba_hockey/wsba_main.py,sha256=RCjq0NwB82P1fXoghFp2HtDyYX5nWZQHFMQvM67Fnuk,54115
+wsba_hockey/api/api/index.py,sha256=tABWg5cYCY-fPaNJ6W_bMJKEYrjn93YGy84VlkHzIXA,6853
 wsba_hockey/evidence/weakside-breakout/node_modules/duckdb/vendor.py,sha256=lmu0TB0rIYkAuV9-csFJgW-1hJojso_-EZpEoorUUKM,4949
 wsba_hockey/evidence/weakside-breakout/node_modules/flatted/python/flatted.py,sha256=ke8FuEflns-WlphCcQ9CC0qJqWqX3zEEuak74o6rgE8,3879
 wsba_hockey/evidence/weakside-breakout/node_modules/flatted/python/test.py,sha256=uTOn6HJd7KeY_PTRvvufv60dmvON3KWp3nnqACj8IlA,2129
@@ -105,6 +105,8 @@ wsba_hockey/evidence/weakside-breakout/node_modules/sqlite3/node_modules/node-gy
 wsba_hockey/evidence/weakside-breakout/node_modules/sqlite3/node_modules/node-gyp/gyp/tools/pretty_sln.py,sha256=b_Fxm-SXUCPL3Tix4EyNwZNmQ-zkeRIFFmuL0R5wFhw,5482
 wsba_hockey/evidence/weakside-breakout/node_modules/sqlite3/node_modules/node-gyp/gyp/tools/pretty_vcproj.py,sha256=AwQrxK1F-jhjsbbT35XQjrvWNbc3IBFaKXoJogqMh_o,10633
 wsba_hockey/evidence/weakside-breakout/node_modules/sqlite3/node_modules/node-gyp/test/fixtures/test-charmap.py,sha256=5raXzaQnO2eJnrlFtlDtWftryhZX7Fj0amFW3hdSnhE,547
+wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/duos/app.py,sha256=PBdVi5qnR3Ye_dNjgqxmh5LIe6Tu_yu9-gebaaQnTfA,7947
+wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/duos/calc.py,sha256=5T_TselP85ofTwf0inl3P7dtyRcosWg5ngUUL95jzLw,8789
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/game_stats/app.py,sha256=P3vDaWyuij-DXlwk6XJ0aiAjrfs-NHi5hmngk-c9r8U,12704
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/game_stats/name_fix.py,sha256=v7IN4JWrudeFuIsBdjLLlHsr9wU65jYi9-34pI_ZpoM,1488
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/goalie/app.py,sha256=f5uwSvNKbtud91e7B17zC0HbPnYIvUgnShhdJZCOtkE,3820
@@ -113,10 +115,13 @@ wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/goalie/rink_p
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/heatmaps/app.py,sha256=XDoZ6-uTgT1vCAOjJ8KjW3r7T0eNDfShGScDxY95HyU,4255
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/heatmaps/plot.py,sha256=QERvb9I_OJPhrz84Omsf9Mq6JjaECark_ql1KfWha-I,4648
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/heatmaps/rink_plot.py,sha256=RB_csrnTxlFR4OyFEhZXbHDSR3dP-KgME0xGBR2JE-4,11994
-wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/matchups/app.py,sha256=JFWhfsyMhCnvLVyIfYzgZE2xT8_mnsOVWVXNi2EF9rM,6136
+wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/line-combos/app.py,sha256=V9tcLkASOpvlnYNYwjYhxi5CgL1S8NUBmbnYcWjBSQ0,9457
+wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/line-combos/plot.py,sha256=r-kPrlup8WrfKs5-Q0RGnLmF0hCOy7zWA_uKDvGy18o,14552
+wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/line-combos/rink_plot.py,sha256=RB_csrnTxlFR4OyFEhZXbHDSR3dP-KgME0xGBR2JE-4,11994
+wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/matchups/app.py,sha256=dRpnCLE9G2H7VOCBgHUOfEmoruEkUcnS2qhyiV54dQ8,6136
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/matchups/plot.py,sha256=t3XRT88L0lh5jE-PSSboLZZ-Yg_u8L4gzJh-egWiRcY,3935
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/matchups/rink_plot.py,sha256=RB_csrnTxlFR4OyFEhZXbHDSR3dP-KgME0xGBR2JE-4,11994
-wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/pbp/app.py,sha256=oH_Su2Z9iCfwsgW2aINzzxlo1fCq6dnEkTMbngjw9vg,13811
+wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/pbp/app.py,sha256=hbMBjctovACO6KXswvb6gsN8AwQCOtT0BHHKR_EGBQM,13841
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/pbp/plot.py,sha256=zfUTSic2M1AfXufvLFDTxxvpqQXw0RzwwQTGxALjjSw,2779
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/pbp/rink_plot.py,sha256=RB_csrnTxlFR4OyFEhZXbHDSR3dP-KgME0xGBR2JE-4,11994
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/skater/app.py,sha256=fNGWRHgqZr2G_QgACzh1l93ob-ugik1F9Wnq-sowWKU,4308
@@ -127,17 +132,17 @@ wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/team_heatmaps
 wsba_hockey/evidence/weakside-breakout/wsba_nhl_apps/wsba_nhl_apps/team_heatmaps/rink_plot.py,sha256=RB_csrnTxlFR4OyFEhZXbHDSR3dP-KgME0xGBR2JE-4,11994
 wsba_hockey/flask/app.py,sha256=J51iA65h9xyJfLgdH0h2sVSbfIR7xgGd2Oy8bJsmpAk,1873
 wsba_hockey/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wsba_hockey/tools/agg.py,sha256=SYZDykUQFygDfRaazlBMKcfs_1eYP7GTJNpUnNKHH-8,21409
+wsba_hockey/tools/agg.py,sha256=0tO-clSQBloG4YHXuaqFqllew3mU95YU6torJAIOZmM,23320
 wsba_hockey/tools/plotting.py,sha256=81hBaM7tcwUNB4-tovPn7QreOUz6B2NuI_SR4-djVSk,6029
-wsba_hockey/tools/scraping.py,sha256=y6vvotniMaGS6-bNg0Vct1gUN3gAsKEy5FLXGkgi1w0,45657
+wsba_hockey/tools/scraping.py,sha256=h6C016U0qmNQpHWMh7Xvn3ud57zKzRbRQ06Odl-rC_I,52573
 wsba_hockey/tools/xg_model.py,sha256=nOr_2RBijLgPmJ0TTs4wbSsORYmRqWCKRjLKDm7sAhI,18342
 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.1.3.dist-info/licenses/LICENSE,sha256=Nr_Um1Pd5FQJTWWgm7maZArdtYMbDhzXYSwyJIZDGik,1114
-wsba_hockey-1.1.3.dist-info/METADATA,sha256=pGBQxsZfILi46XgUEfLDk3Q5TEadxe3pJNxCDGFZVpk,3542
-wsba_hockey-1.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wsba_hockey-1.1.3.dist-info/top_level.txt,sha256=acU7s3x-RZC1zGiqCOmO0g267iqCg34lzIfdmYxxGmQ,12
-wsba_hockey-1.1.3.dist-info/RECORD,,
+wsba_hockey-1.1.5.dist-info/licenses/LICENSE,sha256=Nr_Um1Pd5FQJTWWgm7maZArdtYMbDhzXYSwyJIZDGik,1114
+wsba_hockey-1.1.5.dist-info/METADATA,sha256=nvE9FZLlmofZ-X6LG2RM4dYGbZWDbIsbafZbaDrZ6qk,3566
+wsba_hockey-1.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wsba_hockey-1.1.5.dist-info/top_level.txt,sha256=acU7s3x-RZC1zGiqCOmO0g267iqCg34lzIfdmYxxGmQ,12
+wsba_hockey-1.1.5.dist-info/RECORD,,