Update app.py

app.py

@@ -31,7 +31,7 @@ colour_palette = ['#FFB000','#648FFF','#785EF0',
                   '#DC267F','#FE6100','#3D1EB2','#894D80','#16AA02','#B5592B','#A3C1ED']
 cmap_sum = mcolors.LinearSegmentedColormap.from_list("", ['#648FFF', '#FFFFFF', '#FFB000'])
 
-year_list = [2025,2024,2023,2022,2021,2020,2019,2018,2017]
+year_list = [2026,2025,2024,2023,2022,2021,2020,2019,2018,2017]
 
 
 type_dict =  {'R':'Regular',
@@ -157,73 +157,11 @@ dict_pitch_alpha = dict(sorted(dict_pitch.items(), key=lambda item: item[1]))
 
 import requests
 
-import os
-CAMPAIGN_ID = os.getenv("CAMPAIGN_ID")
-ACCESS_TOKEN = os.getenv("ACCESS_TOKEN")
-BACKUP_PW = os.getenv("BACKUP_PW")
-ADMIN_PW = os.getenv("ADMIN_PW")
-
-url = f"https://www.patreon.com/api/oauth2/v2/campaigns/{CAMPAIGN_ID}/members"
-
-headers = {
-    "Authorization": f"Bearer {ACCESS_TOKEN}"
-}
-
-# Simple parameters, requesting the member's email and currently entitled tiers
-params = {
-    "fields[member]": "full_name,email",  # Request the member's email
-    "include": "currently_entitled_tiers",  # Include the currently entitled tiers
-    "page[size]": 10000  # Fetch up to 1000 patrons per request
-}
-
-response = requests.get(url, headers=headers, params=params)
-
-
-VALID_PASSWORDS = []
-if response.status_code == 200:
-    data = response.json()
-    for patron in data['data']:
-        try:
-            tiers = patron['relationships']['currently_entitled_tiers']['data']
-            if any(tier['id'] == '9078921' for tier in tiers):
-                full_name = patron['attributes']['email']
-                VALID_PASSWORDS.append(full_name)
-        except KeyError:
-            continue
-VALID_PASSWORDS.append(BACKUP_PW)
-VALID_PASSWORDS.append(ADMIN_PW)
-
 
 from shiny import App, reactive, ui, render
 from shiny.ui import h2, tags
 
 
-
-# Define the login UI
-login_ui = ui.page_fluid(
-    ui.card(
-        ui.h2([
-            "TJStats Daily Pitching Summary App ",
-            ui.tags.a("(@TJStats)", href="https://twitter.com/TJStats", target="_blank")
-        ]),
-        ui.p(
-            "This App is available to Superstar Patrons. Please enter your Patreon email address in the box below. If you're having trouble, please refer to the ", 
-            ui.tags.a("Patreon post", href="https://www.patreon.com/posts/122860440", target="_blank"),
-            "."
-        ),
-        ui.input_password("password", "Enter Patreon Email (or Password from Link):", width="25%"),
-        ui.tags.input(
-            type="checkbox",
-            id="authenticated",
-            value=False,
-            disabled=True
-        ),
-        ui.input_action_button("login", "Login", class_="btn-primary"),
-        ui.output_text("login_message"),
-    )
-)
-
-
 # Define the UI layout for the app
 main_ui = ui.page_fluid(
     ui.layout_sidebar(
@@ -249,7 +187,7 @@ main_ui = ui.page_fluid(
                         target="_blank"
                     )))),         
             ui.row(
-                ui.column(4, ui.input_select('year_input', 'Select Season', year_list, selected=2025)),
+                ui.column(4, ui.input_select('year_input', 'Select Season', year_list, selected=2026)),
                 ui.column(4, ui.input_select('level_input', 'Select Level', level_dict)),
                 ui.column(4, ui.input_select('type_input', 'Select Type', type_dict,selected='R'))
             ),
@@ -263,6 +201,22 @@ main_ui = ui.page_fluid(
             ui.row(
                 ui.column(6, ui.input_select('split_id', 'Select Split', split_dict, multiple=False)),
             ),
+            
+            # Comparison mode toggle and options
+            ui.hr(),
+            ui.row(
+                ui.column(12, ui.input_switch("compare_mode", "Compare to Another Year", value=False)),
+            ),
+            ui.panel_conditional(
+                "input.compare_mode",
+                ui.row(
+                    ui.column(6, ui.input_select('compare_year', 'Compare Year', year_list, selected=2024)),
+                    ui.column(6, ui.input_select('compare_type', 'Compare Type', type_dict, selected='R')),
+                ),
+                ui.row(ui.column(12, ui.output_ui('compare_date_id', 'Compare Date Range'))),
+            ),
+            ui.hr(),
+            
             ui.row( ui.column(6,ui.input_select(
                     "new_pitch_type",
                     "Update Pitch Type",
@@ -439,14 +393,8 @@ app_ui = ui.page_fluid(
         ui.tags.script(src="script.js")
     ),
 
-    ui.panel_conditional(
-        "!input.authenticated",
-        login_ui
-    ),
-    ui.panel_conditional(
-        "input.authenticated",
         main_ui
-    )
+    
 )
 
 
@@ -454,20 +402,6 @@ app_ui = ui.page_fluid(
 def server(input, output, session):
 # This code should be inserted in your server function
 
-    @reactive.Effect
-    @reactive.event(input.login)
-    def check_password():
-        if input.password() in VALID_PASSWORDS:
-            ui.update_checkbox("authenticated", value=True)
-            ui.update_text("login_message", value="")
-        else:
-            ui.update_text("login_message", value="Invalid password!")
-            ui.update_text("password", value="")
-
-    @output
-    @render.text
-    def login_message():
-        return ""
 
 
     
@@ -669,6 +603,19 @@ def server(input, output, session):
                                    end=f"{int(input.year_input())}-12-31",
                                    min=f"{int(input.year_input())}-01-01",
                                     max=f"{int(input.year_input())}-12-31")
+
+    @render.ui
+    @reactive.event(input.compare_year, input.compare_mode, ignore_none=False)
+    def compare_date_id():
+        # Create a date range input for the comparison year
+        if not input.compare_mode():
+            return None
+        return ui.input_date_range("compare_date_id", "Compare Date Range",
+                                   start=f"{int(input.compare_year())}-01-01",
+                                   end=f"{int(input.compare_year())}-12-31",
+                                   min=f"{int(input.compare_year())}-01-01",
+                                   max=f"{int(input.compare_year())}-12-31")
+
     @output
     @render.text
     def status():
@@ -954,6 +901,50 @@ def server(input, output, session):
                     return fig
                     
                 df = df.clone()
+            
+            # Fetch comparison data if compare_mode is enabled
+            compare_df = None
+            if input.compare_mode():
+                try:
+                    p.set(0.5, "Fetching comparison data...")
+                    compare_year = int(input.compare_year())
+                    compare_game_type = [input.compare_type()]
+                    compare_start = str(input.compare_date_id()[0])
+                    compare_end = str(input.compare_date_id()[1])
+                    
+                    compare_game_list = scrape.get_player_games_list(
+                        sport_id=sport_id,
+                        season=compare_year,
+                        player_id=player_input,
+                        start_date=compare_start,
+                        end_date=compare_end,
+                        game_type=compare_game_type
+                    )
+                    
+                    compare_data_list = scrape.get_data(game_list_input=compare_game_list[:])
+                    
+                    compare_df = (stuff_apply.stuff_apply(
+                        fe.feature_engineering(
+                            update.update(
+                                scrape.get_data_df(data_list=compare_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')
+                    )
+                    
+                    compare_df = compare_df.with_columns(
+                        prop_percent=(pl.col('is_pitch') / pl.col('is_pitch').sum()).over("pitch_type"),
+                        prop=pl.col('is_pitch').sum().over("pitch_type")
+                    )
+                except Exception as e:
+                    print(f"Error fetching comparison data: {e}")
+                    compare_df = None
                 
             # Create plot
             p.set(0.6, "Creating plot...")
@@ -962,7 +953,8 @@ def server(input, output, session):
                 pitcher_id=player_input,
                 plot_picker='short_form_movement',
                 sport_id=sport_id,
-                game_type=[input.type_input()]
+                game_type=[input.type_input()],
+                compare_df=compare_df
             )