Update app.py

app.py

@@ -115,13 +115,15 @@ def plot_ladder(df: pd.DataFrame):
         pivot = df.pivot(index="time_bucket", columns="bucket", values="amount").fillna(0)
         order = ["T+1", "T+2..7", "T+8..30", "T+31+"]
         pivot = pivot.reindex(order)
+        # Convert to millions for plotting
+        pivot = pivot / 1_000_000
         fig, ax = plt.subplots(figsize=(7, 4))
         assets = pivot["Assets"] if "Assets" in pivot.columns else zeros_like_index(pivot.index)
         sof = pivot["SoF"] if "SoF" in pivot.columns else zeros_like_index(pivot.index)
         ax.bar(pivot.index, assets, label="Assets")
         ax.bar(pivot.index, -sof, label="SoF")
         ax.axhline(0, color="gray", lw=1)
-        ax.set_ylabel("LKR")
+        ax.set_ylabel("LKR (mn)")
         ax.set_title("Maturity Ladder (Assets vs SoF)")
         ax.legend()
         fig.tight_layout()
@@ -171,11 +173,9 @@ def irr_sql(cols: List[str]) -> str:
     return f"""
     SELECT
       bucket,
-      SUM(Portfolio_value) AS pv_sum,
-      SUM(Portfolio_value * {t_expr}) / NULLIF(SUM(Portfolio_value),0) AS dur_mac,
-      SUM(Portfolio_value * ({t_expr})/(1+({y_expr}))) / NULLIF(SUM(Portfolio_value),0) AS dur_mod
+      SUM(Portfolio_value) / 1000000.0 AS "Portfolio Value (mn)"
     FROM {VIEW_FQN}
-    GROUP BY bucket;
+    GROUP BY bucket
     """
 
 # =========================
@@ -210,17 +210,20 @@ def run_dashboard() -> Tuple[str, str, str, str, str, Any, pd.DataFrame, pd.Data
         # 4) Ladder & IRR
         ladder = conn.execute(LADDER_SQL).fetchdf()
         irr    = conn.execute(irr_sql(cols)).fetchdf()
+        # Format IRR dataframe to 2 decimal places
+        if "Portfolio Value (mn)" in irr.columns:
+            irr["Portfolio Value (mn)"] = irr["Portfolio Value (mn)"].map('{:,.2f}'.format)
 
         # 5) Chart
         fig = plot_ladder(ladder)
 
-        status = "✅ OK"
+        status = f"✅ OK (as of {pd.Timestamp.now().strftime('%Y-%m-%d %H:%M:%S')})"
         return (
             status,
             as_of,
-            f"{assets_t1:,.0f}",
-            f"{sof_t1:,.0f}",
-            f"{net_gap:,.0f}",
+            f"{(assets_t1 / 1_000_000):,.2f}",
+            f"{(sof_t1 / 1_000_000):,.2f}",
+            f"{(net_gap / 1_000_000):,.2f}",
             fig,
             ladder,
             irr,
@@ -256,9 +259,9 @@ with gr.Blocks(title=APP_TITLE) as demo:
         as_of = gr.Textbox(label="As of date", interactive=False)
 
     with gr.Row():
-        a1 = gr.Textbox(label="Assets T+1 (LKR)", interactive=False)
-        a2 = gr.Textbox(label="SoF T+1 (LKR)", interactive=False)
-        a3 = gr.Textbox(label="Net Gap T+1 (LKR)", interactive=False)
+        a1 = gr.Textbox(label="Assets T+1 (LKR mn)", interactive=False)
+        a2 = gr.Textbox(label="SoF T+1 (LKR mn)", interactive=False)
+        a3 = gr.Textbox(label="Net Gap T+1 (LKR mn)", interactive=False)
 
     chart = gr.Plot(label="Maturity Ladder")
     ladder_df = gr.Dataframe(label="Ladder Detail")