Update app.py

app.py

@@ -449,7 +449,6 @@ def compute(
     pick_band_to_show: str,  # "Low" | "Medium" | "High"
     progress=gr.Progress(track_tqdm=True),
 ):
-    # progress UI
     progress(0.03, desc="Validating tickers...")
 
     # sanitize table
@@ -490,7 +489,6 @@ def compute(
     moms = estimate_all_moments_aligned(symbols, years_lookback, rf_ann)
     betas, covA, erp_ann, sigma_mkt = moms["betas"], moms["cov_ann"], moms["erp_ann"], moms["sigma_m_ann"]
 
-    # Weights
     gross = sum(abs(v) for v in amounts.values())
     if gross <= 1e-12:
         return (
@@ -588,17 +586,12 @@ def compute(
 # -------------- UI --------------
 with gr.Blocks(
     title="Efficient Portfolio Advisor",
-    css="""
-/* make the left column occupy full width until results are visible */
-"""
 ) as demo:
     gr.Markdown(
         "## Efficient Portfolio Advisor\n"
         "Search symbols, enter **dollar amounts**, set horizon. Returns use Yahoo Finance monthly data; risk-free from FRED."
     )
 
-    # Two-column layout, but right column hidden initially.
-    # When right column is hidden, the left column visually fills the page.
     with gr.Row():
         with gr.Column(scale=5) as left_col:
             # --- Vertical flow: Search -> Button -> Matches -> Add ---
@@ -607,7 +600,6 @@ with gr.Blocks(
             search_note = gr.Markdown()
             matches = gr.Dropdown(choices=[], label="Matches")
             add_btn = gr.Button("Add selected to portfolio")
-            # ----------------------------------------------------------
 
             gr.Markdown("### Portfolio positions")
             table = gr.Dataframe(
@@ -620,6 +612,9 @@ with gr.Blocks(
             horizon = gr.Number(label="Horizon in years (1–100)", value=HORIZON_YEARS, precision=0)
             lookback = gr.Slider(1, 15, value=DEFAULT_LOOKBACK_YEARS, step=1, label="Lookback years for betas & covariances")
 
+            # Loading banner (appears instantly on click, hidden after results show)
+            loading_md = gr.Markdown("⏳ Working... fetching data and computing suggestions...", visible=False)
+
             # Compute button directly under lookback slider
             run_btn = gr.Button("Compute (build dataset & suggest)")
 
@@ -663,8 +658,19 @@ with gr.Blocks(
     table.change(fn=lock_ticker_column, inputs=table, outputs=table)
     horizon.change(fn=set_horizon, inputs=horizon, outputs=[])
 
-    # Compute (default to Medium band) — shows built-in progress bar
-    compute_evt = run_btn.click(
+    # Small helpers to toggle the loading banner
+    def _show_loading():
+        return gr.update(visible=True)
+    def _hide_loading():
+        return gr.update(visible=False)
+
+    # 1) Show loading immediately
+    # 2) Run compute (with full-page progress bar) 
+    # 3) Reveal results and suggestion controls
+    # 4) Hide loading banner
+    show_evt = run_btn.click(_show_loading, inputs=[], outputs=[loading_md])
+
+    compute_evt = show_evt.then(
         fn=compute,
         inputs=[lookback, table, gr.State("Medium")],
         outputs=[
@@ -672,25 +678,27 @@ with gr.Blocks(
             low_txt, med_txt, high_txt,
             gr.State(), gr.State(), gr.State(), gr.State(), gr.State(), gr.State(), gr.State(),
             gr.State(), gr.State()
-        ]
+        ],
+        show_progress="full",   # <-- full-page progress overlay
     )
 
-    # After compute finishes, reveal all results + Suggestions UI + right column
     def _reveal():
         up = gr.update(visible=True)
         return (up, up, up, up, up, up, up, up, up, up, up, up, up)
 
-    compute_evt.then(
+    after_compute = compute_evt.then(
         _reveal,
         inputs=[],
         outputs=[
-            right_col,            # show right column (so layout "shrinks" to two columns)
+            right_col,
             plot, summary, positions, sugg_table, dl,
             sugg_hdr, btn_low, btn_med, btn_high, low_txt, med_txt, high_txt
         ]
     )
 
-    # Band buttons (work once they’re revealed)
+    after_compute.then(_hide_loading, inputs=[], outputs=[loading_md])
+
+    # Band buttons (after reveal). Also request full progress overlay.
     btn_low.click(
         fn=compute,
         inputs=[lookback, table, gr.State("Low")],
@@ -699,7 +707,8 @@ with gr.Blocks(
             low_txt, med_txt, high_txt,
             gr.State(), gr.State(), gr.State(), gr.State(), gr.State(), gr.State(), gr.State(),
             gr.State(), gr.State()
-        ]
+        ],
+        show_progress="full",
     )
     btn_med.click(
         fn=compute,
@@ -709,7 +718,8 @@ with gr.Blocks(
             low_txt, med_txt, high_txt,
             gr.State(), gr.State(), gr.State(), gr.State(), gr.State(), gr.State(), gr.State(),
             gr.State(), gr.State()
-        ]
+        ],
+        show_progress="full",
     )
     btn_high.click(
         fn=compute,
@@ -719,7 +729,8 @@ with gr.Blocks(
             low_txt, med_txt, high_txt,
             gr.State(), gr.State(), gr.State(), gr.State(), gr.State(), gr.State(), gr.State(),
             gr.State(), gr.State()
-        ]
+        ],
+        show_progress="full",
     )
 
 # initialize risk-free at launch
@@ -727,4 +738,6 @@ RF_CODE = fred_series_for_horizon(HORIZON_YEARS)
 RF_ANN = fetch_fred_yield_annual(RF_CODE)
 
 if __name__ == "__main__":
+    # enable event queue so progress bar + async UI updates work properly
+    demo.queue()
     demo.launch(server_name="0.0.0.0", server_port=7860, show_api=False)