Update app.py

app.py

@@ -405,8 +405,14 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
             typhoon_search = gr.Textbox(label="Typhoon Search")
         analyze_btn = gr.Button("Generate Tracks")
         tracks_plot = gr.Plot(label="Typhoon Tracks")
+        
+        # Fixed function that extracts only the first return value
+        def get_tracks_plot(*args):
+            results = generate_main_analysis(*args)
+            return results[0]
+            
         analyze_btn.click(
-            fn=lambda *args: generate_main_analysis(*args)[0],  # Only return the tracks plot
+            fn=get_tracks_plot,
             inputs=[start_year, start_month, end_year, end_month, enso_phase, typhoon_search],
             outputs=tracks_plot
         )
@@ -422,8 +428,15 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
         wind_analyze_btn = gr.Button("Generate Wind Analysis")
         wind_scatter = gr.Plot(label="Wind Speed vs ONI")
         wind_regression_results = gr.Textbox(label="Wind Regression Results")
+        
+        # Fixed function for wind analysis
+        def get_wind_analysis(start_year, start_month, end_year, end_month, enso_phase, typhoon_search):
+            results = generate_main_analysis(start_year, start_month, end_year, end_month, enso_phase, typhoon_search)
+            regression = perform_wind_regression(start_year, start_month, end_year, end_month)
+            return results[1], regression
+            
         wind_analyze_btn.click(
-            fn=lambda *args: [generate_main_analysis(*args)[1], perform_wind_regression(args[0], args[1], args[2], args[3])],
+            fn=get_wind_analysis,
             inputs=[wind_start_year, wind_start_month, wind_end_year, wind_end_month, wind_enso_phase, wind_typhoon_search],
             outputs=[wind_scatter, wind_regression_results]
         )
@@ -439,8 +452,15 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
         pressure_analyze_btn = gr.Button("Generate Pressure Analysis")
         pressure_scatter = gr.Plot(label="Pressure vs ONI")
         pressure_regression_results = gr.Textbox(label="Pressure Regression Results")
+        
+        # Fixed function for pressure analysis
+        def get_pressure_analysis(start_year, start_month, end_year, end_month, enso_phase, typhoon_search):
+            results = generate_main_analysis(start_year, start_month, end_year, end_month, enso_phase, typhoon_search)
+            regression = perform_pressure_regression(start_year, start_month, end_year, end_month)
+            return results[2], regression
+            
         pressure_analyze_btn.click(
-            fn=lambda *args: [generate_main_analysis(*args)[2], perform_pressure_regression(args[0], args[1], args[2], args[3])],
+            fn=get_pressure_analysis,
             inputs=[pressure_start_year, pressure_start_month, pressure_end_year, pressure_end_month, pressure_enso_phase, pressure_typhoon_search],
             outputs=[pressure_scatter, pressure_regression_results]
         )
@@ -452,14 +472,21 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
             lon_end_year = gr.Number(label="End Year", value=2024, minimum=1900, maximum=2024, step=1)
             lon_end_month = gr.Dropdown(label="End Month", choices=list(range(1, 13)), value=6)
             lon_enso_phase = gr.Dropdown(label="ENSO Phase", choices=['all', 'El Nino', 'La Nina', 'Neutral'], value='all')
+            lon_typhoon_search = gr.Textbox(label="Typhoon Search (Optional)")
         lon_analyze_btn = gr.Button("Generate Longitude Analysis")
         regression_plot = gr.Plot(label="Longitude vs ONI")
         slopes_text = gr.Textbox(label="Regression Slopes")
         lon_regression_results = gr.Textbox(label="Longitude Regression Results")
+        
+        # Fixed function for longitude analysis
+        def get_longitude_analysis(start_year, start_month, end_year, end_month, enso_phase, typhoon_search):
+            results = generate_main_analysis(start_year, start_month, end_year, end_month, enso_phase, typhoon_search)
+            regression = perform_longitude_regression(start_year, start_month, end_year, end_month)
+            return results[3], results[4], regression
+            
         lon_analyze_btn.click(
-            fn=lambda *args: [generate_main_analysis(*args)[3], generate_main_analysis(*args)[4], 
-                             perform_longitude_regression(args[0], args[1], args[2], args[3])],
-            inputs=[lon_start_year, lon_start_month, lon_end_year, lon_end_month, lon_enso_phase, ""],
+            fn=get_longitude_analysis,
+            inputs=[lon_start_year, lon_start_month, lon_end_year, lon_end_month, lon_enso_phase, lon_typhoon_search],
             outputs=[regression_plot, slopes_text, lon_regression_results]
         )
     
@@ -470,8 +497,11 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
             standard_dropdown = gr.Dropdown(label="Classification Standard", 
                                           choices=['atlantic', 'taiwan'], value='atlantic')
         
-        # Fix the animation with modified function
+        # Fix the animation with improved function
         def generate_fixed_path_animation(year, typhoon, standard):
+            if not typhoon:
+                return None
+                
             typhoon_id = typhoon.split('(')[-1].strip(')')
             storm = ibtracs.get_storm(typhoon_id)
             
@@ -527,7 +557,7 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
                 updatemenus=[{
                     "buttons": [
                         {
-                            "args": [None, {"frame": {"duration": 200, "redraw": True}, "fromcurrent": True}],
+                            "args": [None, {"frame": {"duration": 200, "redraw": True}, "fromcurrent": True, "mode": "immediate"}],
                             "label": "Play",
                             "method": "animate"
                         },
@@ -545,6 +575,15 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
                 }],
                 sliders=[{
                     "active": 0,
+                    "yanchor": "top",
+                    "xanchor": "left",
+                    "currentvalue": {
+                        "prefix": "Frame: "
+                    },
+                    "pad": {"b": 10, "t": 50},
+                    "len": 0.9,
+                    "x": 0.1,
+                    "y": 0,
                     "steps": [
                         {
                             "args": [[f.name], {
@@ -554,10 +593,7 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
                             "label": str(i),
                             "method": "animate"
                         } for i, f in enumerate(frames)
-                    ],
-                    "x": 0.1,
-                    "y": 0,
-                    "len": 0.9
+                    ]
                 }]
             )
             
@@ -571,6 +607,7 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
         2. Click "Generate Animation"
         3. Use the play button to start the animation
         4. Use the slider to scrub through different positions
+        5. If animation doesn't play automatically, try using the slider to view frames
         """)
         
         # Year dropdown change function