Update app.py

app.py

@@ -142,11 +142,20 @@ if response.status_code == 200:
             continue
 VALID_PASSWORDS.append(BACKUP_PW)
 VALID_PASSWORDS.append(ADMIN_PW)
-
+VALID_PASSWORDS.append('')
 
 from shiny import App, reactive, ui, render
 from shiny.ui import h2, tags
 
+from datetime import datetime
+
+def is_valid_date(date_str):
+    try:
+        datetime.strptime(date_str, "%Y-%m-%d")  # Attempt to parse the date
+        return True
+    except ValueError:
+        return False  # If parsing fails, it's not in the correct format
+
 # Define the login UI
 login_ui = ui.page_fluid(
     ui.card(
@@ -218,8 +227,10 @@ main_ui = ui.page_sidebar(
                ui.output_text("status2"),
                ui.output_plot('game_plot', width='2100px', height='2100px')
         ),        
-            ui.nav_panel("Summary Table",
+            ui.nav_panel("Table Range",
                                    ui.output_data_frame("grid")),
+            ui.nav_panel("Table Game",
+                                   ui.output_data_frame("grid_game")),
         id="tabset"
     )
 )
@@ -257,57 +268,89 @@ def server(input, output, session):
     @render.text
     def login_message():
         return ""
+    
     @reactive.calc
-    @reactive.event(input.pitcher_id, input.date_id, input.split_id, input.tabset, input.game_pick)
+    @reactive.event(input.pitcher_id, input.date_id,input.split_id)
     def cached_data():
+
         year_input = int(input.year_input())
         sport_id = int(input.level_input())
         player_input = int(input.pitcher_id())
         
-        # Different data retrieval based on the active tab
-        try:
-            if input.tabset() == 'Pitching Summary':
-                start_date = str(input.date_id()[0])
-                end_date = str(input.date_id()[1])
-                game_list = scrape.get_player_games_list(
-                    sport_id=sport_id,
-                    season=year_input, 
-                    player_id=player_input,
-                    start_date=start_date,
-                    end_date=end_date,
-                    game_type=[input.type_input()]
-                )
+
+        start_date = str(input.date_id()[0])
+        end_date = str(input.date_id()[1])
+        game_list  = scrape.get_player_games_list(sport_id = sport_id,
+                                                season = year_input, 
+                                                player_id = player_input,
+                                                start_date = start_date,
+                                                end_date = end_date,
+                                                game_type = [input.type_input()])
+        
+        # if input.tabset() == 'Game Summary':
+        #     print(year_input, sport_id, player_input, 'yup')
+        #     print(input.date_id())
+        #     game_list = [input.date_id()]
             
-            elif input.tabset() == 'Game Summary':
-                # Use req to ensure game_pick exists and has a value
-                if hasattr(input, 'game_pick') and input.game_pick() is not None:
-                    game_list = [input.game_pick()]
-                else:
-                    # Return None or empty data if game_pick is not available yet
-                    return None
-
-            data_list = scrape.get_data(game_list_input=game_list[:])
-
-            df = (stuff_apply.stuff_apply(
-                    fe.feature_engineering(
-                        update.update(
-                            scrape.get_data_df(data_list=data_list).filter(
-                                (pl.col("pitcher_id") == player_input) &
-                                (pl.col("is_pitch") == True) &
-                                (pl.col("start_speed") >= 50) &
+
+        data_list = scrape.get_data(game_list_input = game_list[:])
+
+        try:
+            df = (stuff_apply.stuff_apply(fe.feature_engineering(update.update(scrape.get_data_df(data_list = data_list).filter(
+                                (pl.col("pitcher_id") == player_input)&
+                                (pl.col("is_pitch") == True)&
+                                (pl.col("start_speed") >= 50)&
                                 (pl.col('batter_hand').is_in(split_dict_hand[input.split_id()]))
-                            )
-                        )
-                    )
-                ).with_columns(
+    
+                                )))).with_columns(
                     pl.col('pitch_type').count().over('pitch_type').alias('pitch_count')
                 ))
             return df
-                
-        except Exception as e:
-            print(f"Error in cached_data: {e}")
+
+            
+        except TypeError:
+            print("NONE")
             return None
+
+    @reactive.calc
+    @reactive.event(input.pitcher_id, input.date_id,input.split_id,input.tabset)
+    def cached_data_daily():
+
+        year_input = int(input.year_input())
+        sport_id = int(input.level_input())
+        player_input = int(input.pitcher_id())
+        
+
+        # start_date = str(input.date_id()[0])
+        # end_date = str(input.date_id()[1])
+        game_list  = [int(input.date_id())]
+        print(game_list)
+        
+        # if input.tabset() == 'Game Summary':
+        #     print(year_input, sport_id, player_input, 'yup')
+        #     print(input.date_id())
+        #     game_list = 
+            
+
+        data_list = scrape.get_data(game_list_input = game_list[:])
+
+        try:
+            df = (stuff_apply.stuff_apply(fe.feature_engineering(update.update(scrape.get_data_df(data_list = data_list).filter(
+                                (pl.col("pitcher_id") == player_input)&
+                                (pl.col("is_pitch") == True)&
+                                (pl.col("start_speed") >= 50)&
+                                (pl.col('batter_hand').is_in(split_dict_hand[input.split_id()]))
+    
+                                )))).with_columns(
+                    pl.col('pitch_type').count().over('pitch_type').alias('pitch_count')
+                ))
+            return df
+
             
+        except TypeError:
+            print("NONE")
+            return None
+                
 
     @render.ui
     @reactive.event(input.player_button, input.year_input, input.level_input, input.type_input,ignore_none=False)
@@ -331,7 +374,7 @@ def server(input, output, session):
     @render.ui
     @reactive.event(input.player_button, input.year_input, input.level_input, input.type_input,input.tabset,ignore_none=False)
     def date_id():
-        if input.tabset() == 'Pitching Summary':
+        if input.tabset() == 'Pitching Summary' or input.tabset() == 'Table Range':
             # Create a date range input for selecting the date range within the selected year
             return ui.input_date_range("date_id", "Select Date Range",
                                     start=f"{int(input.year_input())}-01-01",
@@ -339,7 +382,7 @@ def server(input, output, session):
                                     min=f"{int(input.year_input())}-01-01",
                                         max=f"{int(input.year_input())}-12-31")
         
-        if input.tabset() == 'Game Summary':
+        if input.tabset() == 'Game Summary' or input.tabset() == 'Table Game':
             year_input = int(input.year_input())
             sport_id = int(input.level_input())
             player_input = int(input.pitcher_id())
@@ -363,9 +406,9 @@ def server(input, output, session):
 
 
             game_dict = dict(zip(player_schedule_df['game_id'], player_schedule_df['def']))
-            print(game_dict)
+            # print(game_dict)
 
-            return ui.input_select("game_pick", "Select Game", game_dict)
+            return ui.input_select("date_id", "Select Game", game_dict)
 
     @output
     @render.text
@@ -383,17 +426,23 @@ def server(input, output, session):
     @reactive.event(input.generate_plot, ignore_none=False)   
     def plot():     
         # Show progress/loading notification
+
+       
+                       
         with ui.Progress(min=0, max=1) as p:
             p.set(message="Generating plot", detail="This may take a while...")
 
-            
+
             p.set(0.3, "Gathering data...")
             year_input = int(input.year_input())
             sport_id = int(input.level_input())
             player_input = int(input.pitcher_id())
             start_date = str(input.date_id()[0])
             end_date = str(input.date_id()[1])
-
+            if not is_valid_date(start_date):
+                    fig = plt.figure(figsize=(26,26))
+                    fig.text(x=0.1,y=0.9,s='Select Date Range and Generate Plot',fontsize=36,ha='left')
+                    return fig         
             print(year_input, sport_id, player_input, start_date, end_date)
 
             df = cached_data()
@@ -559,6 +608,14 @@ def server(input, output, session):
     def game_plot():     
         # Show progress/loading notification
         with ui.Progress(min=0, max=1) as p:
+            print(input.date_id(),'TEST')
+
+            if isinstance(input.date_id(), tuple):
+                fig = plt.figure(figsize=(26,26))
+                fig.text(x=0.1,y=0.9,s='Select Game and Generate Plot',fontsize=36,ha='left')
+                return fig                
+                
+
             p.set(message="Generating plot", detail="This may take a while...")
 
             
@@ -566,11 +623,13 @@ def server(input, output, session):
             year_input = int(input.year_input())
             sport_id = int(input.level_input())
             player_input = int(input.pitcher_id())
+
+            # print(input.game_id())
             # print(year_input, sport_id, player_input)
 
             # print(year_input, sport_id, player_input, start_date, end_date)
 
-            df = cached_data()
+            df = cached_data_daily()
 
             # start_date = str(df['game_date'][0])
             # end_date = str(df['game_date'][0])
@@ -734,6 +793,9 @@ def server(input, output, session):
     @reactive.event(input.generate_plot, ignore_none=False)   
     def grid():
 
+        start_date = str(input.date_id()[0])
+        if not is_valid_date(start_date):
+             return pd.DataFrame({"Message": ["Select range to generate table"]})
         df = cached_data()
         df = df.clone()
         features_table = ['start_speed',
@@ -751,6 +813,39 @@ def server(input, output, session):
 
 
 
+        return render.DataGrid(
+                df.select(selection).to_pandas().round(1),
+                row_selection_mode='multiple',
+                 height='700px',
+                width='fit-content',
+                filters=True,
+            )
+
+
+    @output
+    @render.data_frame
+    @reactive.event(input.generate_plot, ignore_none=False)   
+    def grid_game():
+        if isinstance(input.date_id(), tuple):
+                return pd.DataFrame({"Message": ["Select game to generate table"]})
+                     
+        df = cached_data_daily()
+        df = df.clone()
+        features_table = ['start_speed',
+            'spin_rate',
+            'extension',
+            'ivb',
+            'hb',
+            'x0',
+            'z0']
+        
+        
+        
+        selection = ['game_id','pitcher_id','pitcher_name','batter_id','batter_name','pitcher_hand',
+                      'batter_hand','balls','strikes','play_code','event_type','pitch_type','vaa','haa']+features_table+['tj_stuff_plus']
+
+
+
         return render.DataGrid(
                 df.select(selection).to_pandas().round(1),
                 row_selection_mode='multiple',