Update app.py

app.py

@@ -170,6 +170,18 @@ team_dict = team_abv.set_index('team_abv').to_dict()['team_name']
 
 yahoo_nhl_df = pd.read_csv('yahoo_to_nhl.csv', encoding='unicode_escape')
 
+
+player_games_df = pd.read_csv('player_games_cards.csv',index_col=[0])
+team_games_df = pd.read_csv('team_games.csv',index_col=[0])
+
+team_games_df['game_count'] = team_games_df.groupby('team')['team'].cumcount()+1
+team_games_df['max_games'] = team_games_df.groupby('team').game_count.transform('max')
+team_games_df['abv'] = team_games_df.team.map(team_abv.set_index('team_name')['team_abv'].to_dict())
+
+#team_abv = pd.read_csv('team_abv.csv')
+
+
+
 def nat_stat_convert(df):
     for i in range(0,len(df.columns)):
         if df.columns[i][-3:]=='/60':
@@ -263,70 +275,69 @@ def server(input, output, session):
         if type(n_1) is not int:
             n_1 = 1
             
-        if n_2 == 0:
+        if (n_2 == 0) or (n_2 == n_1) or (n_2 == None):
             list_of_columns.remove(f'L{str(n_2)} PP TOI')
             list_of_columns.remove(f'L{str(n_2)} PP%')
             list_of_columns_name.remove(f'L{str(n_2)} PP TOI')
             list_of_columns_name.remove(f'L{str(n_2)} PP%')
 
-        if n_3 == 0:
+        if (n_3 == 0) or (n_3 == n_1) or (n_3 == n_2) or (n_3 == None):
             list_of_columns.remove(f'L{str(n_3)} PP TOI')
             list_of_columns.remove(f'L{str(n_3)} PP%')
             list_of_columns_name.remove(f'L{str(n_3)} PP TOI')
             list_of_columns_name.remove(f'L{str(n_3)} PP%')
 
+            
+
         start_date ='2023-09-01'
         end_date = '2024-05-01'
 
-        df_pp_1 = nat_stat_trick_range_pp_gp(rookie='n',start_date = start_date,end_date = end_date, sit='pp',gp=n_1)
-        df_pp_2 = nat_stat_trick_range_pp_gp(rookie='n',start_date = start_date,end_date = end_date, sit='pp',gp=n_2)
-        df_pp_3 = nat_stat_trick_range_pp_gp(rookie='n',start_date = start_date,end_date = end_date, sit='pp',gp=n_3)
-
-
-        df_all_pp_1 = nat_stat_convert(df_pp_1)
-        df_all_pp_2 = nat_stat_convert(df_pp_2)
-        df_all_pp_3 = nat_stat_convert(df_pp_3)
-
-        df_final =  df_all_pp_1.merge( df_all_pp_2,how='outer',left_on=['player_id'],right_on=['player_id'],suffixes=("","_2"))
-        df_final =  df_final.merge( df_all_pp_3,how='outer',left_on=['player_id'],right_on=['player_id'],suffixes=("_1","_3"))
-
-        time.sleep(2)
-        team_report_1 = pd.read_html(f'https://www.naturalstattrick.com/teamtable.php?fromseason={season}&thruseason={season}&stype={seasontype}&sit=pp&score=all&rate=n&team=all&loc=B&gpf=c&gp='+str(n_1)+'&fd=&td=')[0]
-        time.sleep(2)
-        team_report_2 = pd.read_html(f'https://www.naturalstattrick.com/teamtable.php?fromseason={season}&thruseason={season}&stype={seasontype}&sit=pp&score=all&rate=n&team=all&loc=B&gpf=c&gp='+str(n_2)+'&fd=&td=')[0]
-        time.sleep(2)
-        team_report_3 = pd.read_html(f'https://www.naturalstattrick.com/teamtable.php?fromseason=fromseason={season}&thruseason={season}&stype={seasontype}&sit=pp&score=all&rate=n&team=all&loc=B&gpf=c&gp='+str(n_3)+'&fd=&td=')[0]
-        team_report_1 = team_report_1.merge(team_abv,left_on=['Team'],right_on=['team_name'],how='left')
-        team_report_2 = team_report_2.merge(team_abv,left_on=['Team'],right_on=['team_name'],how='left')
-        team_report_3 = team_report_3.merge(team_abv,left_on=['Team'],right_on=['team_name'],how='left')
-
-        test = df_final[['player_id','Player_1','Team_1','Position_1','TOI_1','TOI_2','TOI_3',]]
-        test.columns = ['player_id','Player','Team','Position','TOI_1','TOI_2','TOI_3',]
-        test = test.merge(team_report_1[['TOI','team_abv']],how='left',left_on=['Team'],right_on=['team_abv'], suffixes=('','_1_team'))
-        test = test.merge(team_report_2[['TOI','team_abv']],how='left',left_on=['Team'],right_on=['team_abv'], suffixes=('','_2_team'))
-        test = test.merge(team_report_3[['TOI','team_abv']],how='left',left_on=['Team'],right_on=['team_abv'], suffixes=('','_3_team'))
-        test = test.fillna('0:00')
-
-        test['TOI'] = [int(x[:-3])+int(x[-2:])*100/60/100 for x  in test['TOI'] ]
-        test['TOI_1'] = [x if x!='0:00' else 0 for x in test['TOI_1']]
-        test['TOI_2'] = [x if x!='0:00' else 0 for x in test['TOI_2']]
-        test['TOI_3'] = [x if x!='0:00' else 0 for x in test['TOI_3']]
-
-        test['TOI_2_team'] = [int(x[:-3])+int(x[-2:])*100/60/100 for x  in test['TOI_2_team'] ]
-        test['TOI_3_team'] = [int(x[:-3])+int(x[-2:])*100/60/100 for x  in test['TOI_3_team']]
-
-        test['TOI'] = test['TOI'].astype(float)
-
-        test['PP%_1'] = test['TOI_1'].astype(float)/ test['TOI'].astype(float)
-        test['PP%_2'] = test['TOI_2'].astype(float)/ test['TOI_2_team'].astype(float)
-        test['PP%_3'] = test['TOI_3'].astype(float)/ test['TOI_3_team'].astype(float)
-        test = test.fillna(0)
+        df_pp_1 = player_games_df.groupby('Player').head(n_1)
+        df_pp_2 = player_games_df.groupby('Player').head(n_2)
+        df_pp_3 = player_games_df.groupby('Player').head(n_3)
+
+
+        team_games_df_1 = team_games_df.groupby('team').head(n_1)
+        team_games_df_2 = team_games_df.groupby('team').head(n_2)
+        team_games_df_3 = team_games_df.groupby('team').head(n_3)
+
+        df_all_pp_1 = df_pp_1.copy()
+        df_all_pp_2 = df_pp_2.copy()
+        df_all_pp_3 = df_pp_3.copy()
+
+        df_all_pp_1_final = df_all_pp_1.groupby(['player_id','Player','Team','Position']).sum()[['TOI_pp']].reset_index()
+        df_all_pp_2_final = df_all_pp_2.groupby(['player_id','Player','Team','Position']).sum()[['TOI_pp']].reset_index()
+        df_all_pp_3_final = df_all_pp_3.groupby(['player_id','Player','Team','Position']).sum()[['TOI_pp']].reset_index()
+
+        team_games_df_1_final = team_games_df_1.groupby(['abv']).sum()[['pp_toi']].reset_index()
+        team_games_df_2_final = team_games_df_2.groupby(['abv']).sum()[['pp_toi']].reset_index()
+        team_games_df_3_final = team_games_df_3.groupby(['abv']).sum()[['pp_toi']].reset_index()
+
+        df_final =  df_all_pp_1_final.merge( df_all_pp_2_final,how='outer',left_on=['player_id'],right_on=['player_id'],suffixes=("","_2"))
+        df_final =  df_final.merge( df_all_pp_3_final,how='outer',left_on=['player_id'],right_on=['player_id'],suffixes=("_1","_3"))
+
+        team_final =  team_games_df_1_final.merge( team_games_df_2_final,how='outer',left_on=['abv'],right_on=['abv'],suffixes=("","_2"))
+        team_final =  team_final.merge( team_games_df_3_final,how='outer',left_on=['abv'],right_on=['abv'],suffixes=("_1","_3"))
+
+
+        df_final = df_final.merge(team_final,left_on='Team_1',right_on='abv')
+
+        test = df_final[['player_id','Player_1','Team_1','Position_1','TOI_pp_1','TOI_pp_2','TOI_pp_3','pp_toi_1','pp_toi_2','pp_toi_3']]
+        test.columns = ['player_id','Player','Team','Position','TOI_1','TOI_2','TOI_3','pp_toi_1','pp_toi_2','pp_toi_3']
+        test = test.fillna('0')
+
+
+        test['PP%_1'] = test['TOI_1'].astype(float)/ test['pp_toi_1'].astype(float)
+        test['PP%_2'] = test['TOI_2'].astype(float)/ test['pp_toi_2'].astype(float)
+        test['PP%_3'] = test['TOI_3'].astype(float)/ test['pp_toi_3'].astype(float)
+        # test = test.fillna(0)
         test['TOI_1'] = ["%d:%02d" % (int(x),(x*60)%60) for x in test['TOI_1'].astype(float)]
         test['TOI_2'] = ["%d:%02d" % (int(x),(x*60)%60) for x in test['TOI_2'].astype(float)]
         test['TOI_3'] = ["%d:%02d" % (int(x),(x*60)%60) for x in test['TOI_3'].astype(float)]
-        test = test.drop(['team_abv','team_abv_2_team','team_abv_3_team','TOI','TOI_2_team','TOI_3_team'],axis=1)
+        test = test.drop(['pp_toi_1','pp_toi_2','pp_toi_3'],axis=1)
         test.columns = ['player_id','Player','Team','Position','L'+str(n_1)+' PP TOI','L'+str(n_2)+' PP TOI','L'+str(n_3)+' PP TOI','L'+str(n_1)+' PP%','L'+str(n_2)+' PP%','L'+str(n_3)+' PP%']
 
+
         yahoo_df = yahoo_df_2.merge(yahoo_nhl_df,left_on = 'player_id',right_on='player_id_yahoo',suffixes=['','_y'])
         yahoo_df.nhl_id = yahoo_df.nhl_id.astype(float)
         test.player_id = test.player_id.astype(float)
@@ -415,7 +426,8 @@ def server(input, output, session):
                     **{'border': '1px black solid !important'},subset = ((list(top_d_score.index[:]),top_d_score.columns[:]))).set_properties(**{
                                 'color': 'black'},overwrite=False).set_properties(
                     **{'border': '1px black solid !important'},subset = ((list(top_d_score.index[:]),top_d_score.columns[:]))).format(
-            {'L'+str(n_1)+' PP%': '{:.0%}',
+            {
+            'L'+str(n_1)+' PP%': '{:.0%}',
             'L'+str(n_2)+' PP%': '{:.0%}',
             'L'+str(n_3)+' PP%': '{:.0%}',
             'Roster%': '{:.0%}',
@@ -431,4 +443,4 @@ def server(input, output, session):
 
 
 app = App(app_ui, server)
-time.sleep(60)
+#time.sleep(60)