Update src/app.py

src/app.py

@@ -33,10 +33,17 @@ if str(ROOT) not in sys.path:
 for d in ["data/uploads", "data/faiss_index"]:
     Path(d).mkdir(parents=True, exist_ok=True)
 
-# ── Lazy imports (heavier deps) ────────────────────────────────────────────────
-from core.processor import (DocumentProcessor, extract_waste_series,
-                             extract_energy_series, extract_spjimr_metrics_raw)
-from core.consultant import ESGConsultant
+# Heavy deps imported lazily inside @st.cache_resource to avoid blocking startup
+@st.cache_resource(show_spinner="⏳ Loading ESG engine…")
+def _load_modules():
+    from core.processor import (DocumentProcessor, extract_waste_series,
+                                 extract_energy_series, extract_spjimr_metrics_raw)
+    from core.consultant import ESGConsultant
+    return DocumentProcessor, extract_waste_series, extract_energy_series, extract_spjimr_metrics_raw, ESGConsultant
+
+# Unpack — this blocks only on first run, cached on all subsequent reruns
+(DocumentProcessor, extract_waste_series,
+ extract_energy_series, extract_spjimr_metrics_raw, ESGConsultant) = _load_modules()
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -56,7 +63,7 @@ st.set_page_config(
 st.markdown("""
 <style>
 /* ── Import Fonts ── */
-@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@700;900&family=IBM+Plex+Mono:wght@400;600&family=IBM+Plex+Sans:wght@300;400;600&display=swap');
+/* Fonts: system stack — avoids network round-trip on cold start */
 
 /* ── Root Variables ── */
 :root {
@@ -299,14 +306,16 @@ with st.sidebar:
 # Consultant factory (cached per token)
 # ═══════════════════════════════════════════════════════════════════════════════
 
+@st.cache_resource(show_spinner=False)
+def _cached_consultant(token: str) -> ESGConsultant:
+    """One instance per unique token — cached across all reruns."""
+    return ESGConsultant(hf_token=token or "NO_TOKEN")
+
 def _get_consultant() -> ESGConsultant:
-    if (
-        st.session_state.consultant is None
-        or not st.session_state.hf_token
-    ):
-        token = st.session_state.hf_token or "NO_TOKEN"
-        st.session_state.consultant = ESGConsultant(hf_token=token)
-    return st.session_state.consultant
+    token = st.session_state.hf_token or ""
+    c = _cached_consultant(token)
+    st.session_state.consultant = c
+    return c
 
 
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -520,13 +529,10 @@ def page_dashboard():
             line=dict(color="#2ECC71", width=2), marker=dict(size=6)))
         _hline(fig_el)
         fig_el.update_layout(**LAYOUT, height=260,
-            title=dict(text="Renewable Energy % Over Time", font=dict(color="#D4AF37")))
-        # yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="Renewable %", range=[0, 115]) 
-        fig_el.update_yaxes(
-                                gridcolor="rgba(255,255,255,0.06)",
-                                title="Renewable %",
-                                range=[0,115]
-                            )
+            title=dict(text="Renewable Energy % Over Time", font=dict(color="#D4AF37")),
+            yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="Renewable %", range=[0, 115]))
+        st.plotly_chart(fig_el, width="stretch")
+
         with st.expander("📋 Energy Data Table"):
             st.dataframe(edf, width="stretch", hide_index=True)
 
@@ -566,11 +572,8 @@ def page_dashboard():
                 fig_w.add_trace(go.Bar(x=periods, y=wdf["rainwater_kl"],
                     name="Rainwater Harvesting", marker_color="#2ECC71"))
             fig_w.update_layout(**LAYOUT, barmode="stack", height=320,
-                title=dict(text="Water by Source (Kilolitres)", font=dict(color="#D4AF37")))
-            #  yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kL")
-            fig_el.update_yaxes(
-                                gridcolor="rgba(255,255,255,0.06)",
-                                title="kL")
+                title=dict(text="Water by Source (Kilolitres)", font=dict(color="#D4AF37")),
+                yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kL"))
             st.plotly_chart(fig_w, width="stretch")
 
         with wc2:
@@ -623,11 +626,8 @@ def page_dashboard():
                 fig_wst.add_trace(go.Bar(x=periods, y=wst["disposed_kg"],
                     name="Disposed (kg)", marker_color="#E74C3C", opacity=0.8))
             fig_wst.update_layout(**LAYOUT, barmode="group", height=320,
-                title=dict(text="Waste Recovered vs Disposed (kg)", font=dict(color="#D4AF37")))
-            #  yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kg")
-            fig_el.update_yaxes(
-                                gridcolor="rgba(255,255,255,0.06)",
-                                title="kg")
+                title=dict(text="Waste Recovered vs Disposed (kg)", font=dict(color="#D4AF37")),
+                yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kg"))
             st.plotly_chart(fig_wst, width="stretch")
 
         with wst2:
@@ -646,13 +646,8 @@ def page_dashboard():
                 fig_rp.add_hline(y=50, line_dash="dot", line_color="#D4AF37",
                     annotation_text="50% Target", annotation_font=dict(color="#D4AF37"))
                 fig_rp.update_layout(**LAYOUT, height=320,
-                    title=dict(text="Waste Recovery Rate (%)", font=dict(color="#D4AF37")))
-                #  yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="%", range=[0, 110])
-                fig_rp.update_yaxes(
-                                    gridcolor="rgba(255,255,255,0.06)",
-                                    title="%",
-                                    range=[0, 110]
-                                )
+                    title=dict(text="Waste Recovery Rate (%)", font=dict(color="#D4AF37")),
+                    yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="%", range=[0, 110]))
                 st.plotly_chart(fig_rp, width="stretch")
 
         # KPI cards
@@ -677,12 +672,8 @@ def page_dashboard():
             if col in wdf.columns:
                 fig.add_trace(go.Bar(x=wdf["period"], y=wdf[col],
                     name=name, marker_color=color, opacity=0.85))
-        fig.update_layout(**LAYOUT, barmode="group", height=300)
-        #  yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kg")
-        fig.update_yaxes(
-                            gridcolor="rgba(255,255,255,0.06)",
-                            title="kg"
-                                          )                                                           
+        fig.update_layout(**LAYOUT, barmode="group", height=300,
+            yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kg"))
         st.plotly_chart(fig, width="stretch")
     else:
         st.info("No waste data detected. Upload your SPJIMR Environmental Metrics XLSX.")
@@ -774,13 +765,8 @@ def page_dashboard():
         _add_forecast_traces(fig_ef, list(edf_f["period"]), edf_f["renewable_pct"].values, fl, "#2ECC71", "Renewable %")
         _hline(fig_ef)
         fig_ef.update_layout(**LAYOUT, height=320,
-            title=dict(text=f"Renewable Energy % Forecast (next {horizon} months)", font=dict(color="#D4AF37")))
-        # yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="%", range=[0,115])
-        fig_ef.update_yaxes(
-                                gridcolor="rgba(255,255,255,0.06)",
-                                title="%",
-                                range=[0,115]
-                            )
+            title=dict(text=f"Renewable Energy % Forecast (next {horizon} months)", font=dict(color="#D4AF37")),
+            yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="%", range=[0,115]))
         st.plotly_chart(fig_ef, width="stretch")
 
     # Waste forecast
@@ -795,12 +781,8 @@ def page_dashboard():
                     line=dict(color=color, width=2), marker=dict(size=5)))
                 _add_forecast_traces(fig_wf, list(wst_f["period"]), wst_f[col].values, fl, color, name)
         fig_wf.update_layout(**LAYOUT, height=320,
-            title=dict(text=f"Waste Forecast (next {horizon} months)", font=dict(color="#D4AF37")))
-        #   yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kg")
-        fig_wf.update_yaxes(
-                                gridcolor="rgba(255,255,255,0.06)",
-                                title="kg"
-                            )
+            title=dict(text=f"Waste Forecast (next {horizon} months)", font=dict(color="#D4AF37")),
+            yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kg"))
         st.plotly_chart(fig_wf, width="stretch")
 
     # Water forecast
@@ -814,12 +796,8 @@ def page_dashboard():
                 line=dict(color="#3498DB", width=2), marker=dict(size=5)))
             _add_forecast_traces(fig_wtrf, list(wtr_f["period"]), wtr_f["total_kl"].values, fl, "#3498DB", "Total Water")
             fig_wtrf.update_layout(**LAYOUT, height=300,
-                title=dict(text=f"Water Consumption Forecast (next {horizon} months)", font=dict(color="#D4AF37")))
-            # yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kL")
-            fig_wtrf.update_yaxes(
-                                    gridcolor="rgba(255,255,255,0.06)",
-                                    title="kL"
-                                )
+                title=dict(text=f"Water Consumption Forecast (next {horizon} months)", font=dict(color="#D4AF37")),
+                yaxis=dict(gridcolor="rgba(255,255,255,0.06)", title="kL"))
             st.plotly_chart(fig_wtrf, width="stretch")
 
     if not has_fc: