Update indices_html.py

indices_html.py

@@ -1,84 +1,79 @@
-import json
 import pandas as pd
 from nsepython import *
 import html
 from datetime import datetime as dt
 from collections import defaultdict
 
-# persist helpers (already exist in your project)
+# persist helpers (HF only)
 from persist import exists, load, save
 
 
 def build_indices_html():
     """
-    Generate HTML:
-      - main table
-      - dates table
-      - tables for all categories
-      - charts ONLY for key == "INDICES ELIGIBLE IN DERIVATIVES"
-      - flexible chart layout (no grid, auto-fit)
-      - DAILY CACHE ENABLED
+    Generates full static HTML for NSE Indices
+    - Tables for all indices
+    - Category-wise tables
+    - Charts ONLY for 'INDICES ELIGIBLE IN DERIVATIVES'
+    - DAILY cache via persist.py (HTML only)
     """
 
-    # ================= CACHE =================
-    today = dt.now().strftime("%Y-%m-%d")
-    cache_key = "indices_html"
+    # ================= CACHE (TTL handled by persist) =================
+    cache_name = "DAILY_INDICES_HTML"
 
-    if exists(cache_key):
-        cached = load(cache_key)
-        if isinstance(cached, dict) and cached.get("date") == today:
-            return cached.get("html")
+    if exists(cache_name, "html"):
+        cached_html = load(cache_name, "html")
+        if isinstance(cached_html, str):
+            return cached_html
 
     # ================= FETCH DATA =================
-    p = indices()  # your existing function
+    p = indices()
     data_df = p.get("data", pd.DataFrame())
     dates_df = p.get("dates", pd.DataFrame())
 
     records = data_df.to_dict(orient="records") if not data_df.empty else []
 
-    # Columns to hide in category tables
     hidden_cols = {
-        "key","chartTodayPath","chart30dPath","chart30Path","chart365dPath",
-        "date365dAgo","date30dAgo","previousDay","oneWeekAgo","oneMonthAgoVal",
-        "oneWeekAgoVal","oneYearAgoVal","index","indicativeClose"
+        "key", "chartTodayPath", "chart30dPath", "chart30Path", "chart365dPath",
+        "date365dAgo", "date30dAgo", "previousDay", "oneWeekAgo",
+        "oneMonthAgoVal", "oneWeekAgoVal", "oneYearAgoVal",
+        "index", "indicativeClose"
     }
 
-    # ----------- BASIC TABLE BUILDER -----------
-    def build_table_from_records(recs, cols=None):
+    # ================= TABLE BUILDER =================
+    def build_table(recs, cols=None):
         if not recs:
             return "<p>No data available.</p>"
 
         if cols is None:
             cols = []
             for r in recs:
-                for k in r.keys():
+                for k in r:
                     if k not in cols:
                         cols.append(k)
 
         header = "".join(f"<th>{html.escape(str(c))}</th>" for c in cols)
 
-        body_rows = []
+        body = []
         for r in recs:
             tds = []
             for c in cols:
                 v = r.get(c, "")
-                if isinstance(v, (list, dict)):
+                if isinstance(v, (dict, list)):
                     v = str(v)
-                tds.append(f"<td>{html.escape('' if v is None else str(v))}</td>")
-            body_rows.append("<tr>" + "".join(tds) + "</tr>")
+                tds.append(f"<td>{html.escape(str(v) if v is not None else '')}</td>")
+            body.append("<tr>" + "".join(tds) + "</tr>")
 
         return f"""
         <table>
             <thead><tr>{header}</tr></thead>
-            <tbody>{''.join(body_rows)}</tbody>
+            <tbody>{''.join(body)}</tbody>
         </table>
         """
 
-    # ----------- FLEXIBLE CHART BLOCK -----------
-    def build_chart_grid_for_record(r):
-
-        def iframe_if_exists(src, label):
-            if src and isinstance(src, str) and src.strip():
+    # ================= CHART BUILDER =================
+    def build_chart_block(r):
+        def iframe(src, label):
+            if src and isinstance(src, str):
                 return f"""
                 <div class="chart-flex-item">
                     <iframe src="{html.escape(src)}" loading="lazy"
@@ -87,101 +82,83 @@ def build_indices_html():
                 """
             return ""
 
-        today_src   = r.get("chartTodayPath")  or r.get("chartToday")  or ""
-        month30_src = r.get("chart30dPath")    or r.get("chart30Path") or ""
-        year365_src = r.get("chart365dPath")   or r.get("chart365")   or ""
-
-        block = (
-            iframe_if_exists(today_src, "Today Chart") +
-            iframe_if_exists(month30_src, "30d Chart") +
-            iframe_if_exists(year365_src, "365d Chart")
+        charts = (
+            iframe(r.get("chartTodayPath"), "Today") +
+            iframe(r.get("chart30dPath"), "30 Days") +
+            iframe(r.get("chart365dPath"), "1 Year")
         )
 
-        if not block.strip():
+        if not charts.strip():
             return ""
 
-        title = r.get("index") or r.get("indexSymbol") or r.get("symbol") or ""
+        title = r.get("indexSymbol") or r.get("index") or r.get("symbol") or ""
 
         return f"""
         <div class="chart-flex-block">
-            <div class="chart-title"><strong>{html.escape(str(title))}</strong></div>
-            <div class="chart-flex-container">
-                {block}
-            </div>
+            <div class="chart-title"><strong>{html.escape(title)}</strong></div>
+            <div class="chart-flex-container">{charts}</div>
         </div>
         """
 
-    # ----------- MAIN TABLE -----------
-    main_table_html = build_table_from_records(records)
+    # ================= MAIN TABLE =================
+    main_table_html = build_table(records)
 
-    # ----------- DATES TABLE -----------
+    # ================= DATES TABLE =================
     dates_table_html = ""
     if not dates_df.empty:
-        dates_table_html = build_table_from_records(
+        dates_table_html = build_table(
             dates_df.to_dict(orient="records")
         )
 
-    # ----------- GROUP BY KEY ----------
+    # ================= GROUP BY CATEGORY =================
     groups = defaultdict(list)
     for r in records:
         groups[r.get("key") or "UNCLASSIFIED"].append(r)
 
-    per_key_sections = []
+    sections = []
 
-    # ----------- PER CATEGORY SECTIONS ----------
     for key_name, recs in groups.items():
-
         first = recs[0]
-        cols = [c for c in first.keys() if c not in hidden_cols]
+        cols = [c for c in first if c not in hidden_cols]
 
         preferred = ["indexSymbol", "index", "symbol", "name"]
-        ordered = [c for c in preferred if c in cols] + [c for c in cols if c not in preferred]
+        ordered_cols = (
+            [c for c in preferred if c in cols] +
+            [c for c in cols if c not in preferred]
+        )
 
-        table_html = build_table_from_records(recs, ordered)
+        table_html = build_table(recs, ordered_cols)
 
-        # Charts only for derivative-eligible indices
+        charts_html = ""
         if str(key_name).strip().upper() == "INDICES ELIGIBLE IN DERIVATIVES":
-            charts_html = "\n".join(build_chart_grid_for_record(r) for r in recs)
-        else:
-            charts_html = ""
+            charts_html = "\n".join(build_chart_block(r) for r in recs)
 
-        per_key_sections.append(f"""
+        sections.append(f"""
         <section class="key-section">
-            <h3>Category: {html.escape(str(key_name))} (Total: {len(recs)})</h3>
-            <div class="key-table">{table_html}</div>
+            <h3>{html.escape(str(key_name))} (Total: {len(recs)})</h3>
+            {table_html}
             {charts_html}
         </section>
         """)
 
-    # ----------- CSS -----------
+    # ================= CSS =================
     css = """
     <style>
     body { font-family: Arial; padding: 16px; background: #fff; color: #111; }
-    table { border-collapse: collapse; width: 100%; margin-bottom: 14px; }
+    table { border-collapse: collapse; width: 100%; margin-bottom: 12px; }
     th, td { border: 1px solid #ccc; padding: 6px 8px; font-size: 13px; }
-    th { background: #007bff; color: white; position: sticky; top: 0; }
+    th { background: #007bff; color: #fff; position: sticky; top: 0; }
 
-    .scroll { max-height: 420px; overflow: auto; padding: 6px; background: #fafafa;
-              margin-bottom: 16px; border: 1px solid #ddd; }
+    .scroll { max-height: 420px; overflow: auto; margin-bottom: 20px; }
 
     .key-section {
-        border: 1px solid #e6eef6;
-        background: #fbfeff;
+        border: 1px solid #e0e0e0;
         border-radius: 6px;
         padding: 10px;
         margin-bottom: 30px;
+        background: #fafcff;
     }
 
-    .chart-flex-block {
-        border: 1px solid #ddd;
-        background: #fff;
-        padding: 8px;
-        border-radius: 6px;
-        margin-bottom: 14px;
-    }
-
-    .chart-title { margin-bottom: 6px; font-size: 14px; }
-
     .chart-flex-container {
         display: flex;
         flex-wrap: wrap;
@@ -201,32 +178,38 @@ def build_indices_html():
         height: 100%;
         border: 0;
     }
+
+    .chart-title {
+        font-size: 14px;
+        margin-bottom: 6px;
+    }
     </style>
     """
 
-    # ----------- FINAL HTML -----------
+    # ================= FINAL HTML =================
     html_out = "\n".join([
         "<!DOCTYPE html>",
-        "<html><head><meta charset='utf-8'><title>NSE Indices</title>",
+        "<html>",
+        "<head>",
+        "<meta charset='utf-8'>",
+        "<title>NSE Indices</title>",
         css,
-        "</head><body>",
-        "<h1>NSE Indices — Full Static Render</h1>",
-        f"<div class='meta'>Generated: {html.escape(dt.now().strftime('%Y-%m-%d %H:%M:%S'))}</div>",
-        "<h2>Main Indices Table</h2>",
+        "</head>",
+        "<body>",
+        "<h1>NSE Indices</h1>",
+        f"<div>Generated: {dt.now().strftime('%Y-%m-%d %H:%M:%S')}</div>",
+        "<h2>Main Indices</h2>",
         "<div class='scroll'>", main_table_html, "</div>",
-        "<h2>Dates / Meta</h2>" if dates_table_html else "",
+        "<h2>Dates</h2>" if dates_table_html else "",
         "<div class='scroll'>" if dates_table_html else "",
         dates_table_html,
         "</div>" if dates_table_html else "",
         "<h2>Categories</h2>",
-        *per_key_sections,
+        *sections,
         "</body></html>"
     ])
 
-    # ================= SAVE CACHE =================
-    save(cache_key, {
-        "date": today,
-        "html": html_out
-    })
+    # ================= SAVE HTML (HF only) =================
+    save(cache_name, html_out, "html")
 
-    return html_out
+    return html_out