Update eq_html.py

eq_html.py

@@ -1,87 +1,72 @@
 from nsepython import *
-import os
-import pickle
 import pandas as pd
 from datetime import datetime
+import os
 
-# =====================================================
-# CACHE CONFIG (DAILY VALIDITY)
-# =====================================================
-CACHE_DIR = "./cache/eq"
+# ==============================
+# Simple daily cache helpers
+# ==============================
+CACHE_DIR = "./cache_eq"
 os.makedirs(CACHE_DIR, exist_ok=True)
 
+def _cache_path(key):
+    return os.path.join(CACHE_DIR, f"{key}.html")
+
+def _is_today(path):
+    if not os.path.exists(path):
+        return False
+    mtime = datetime.fromtimestamp(os.path.getmtime(path)).date()
+    return mtime == datetime.now().date()
+
+def cache_load(key):
+    path = _cache_path(key)
+    if _is_today(path):
+        try:
+            with open(path, "r", encoding="utf-8") as f:
+                return f.read()
+        except:
+            return False
+    return False
+
+def cache_save(key, html):
+    with open(_cache_path(key), "w", encoding="utf-8") as f:
+        f.write(html)
+
+# ==============================
+# MAIN FUNCTION (CACHED)
+# ==============================
+def build_eq_html(symbol):
+    """
+    Build full HTML page for eq(symbol) output
+    DAILY CACHED
+    """
 
-def _today_key():
-    return datetime.now().strftime("%Y%m%d")
-
-
-def _path(name):
-    return os.path.join(CACHE_DIR, name)
-
-
-def cache_load(name):
-    try:
-        with open(_path(name), "rb") as f:
-            return pickle.load(f)
-    except Exception:
-        return None
-
+    cache_key = f"eq_{symbol.upper()}"
 
-def cache_save(name, obj):
-    with open(_path(name), "wb") as f:
-        pickle.dump(obj, f)
+    # ---------- CACHE HIT ----------
+    cached = cache_load(cache_key)
+    if cached:
+        return cached
 
+    # -------------------------------------------------------
+    # CALL eq() function
+    # -------------------------------------------------------
+    out = eq(symbol)
 
-# =====================================================
-# MAIN FUNCTION (DO NOT RENAME)
-# =====================================================
-def build_eq_html(symbol):
-    """
-    Build full HTML page for eq(symbol)
-    Cache rules:
-    - HTML cached per (symbol + day)
-    - EQ raw output cached per (symbol + day)
-    """
+    if not isinstance(out, dict):
+        return "<h3>Error: EQ data not available</h3>"
 
-    day = _today_key()
-    symbol = symbol.upper()
-
-    html_key = f"eq_html_{symbol}_{day}.pkl"
-    raw_key = f"eq_raw_{symbol}_{day}.pkl"
-
-    # --------------------------------------------------
-    # 1️⃣ HTML CACHE FIRST
-    # --------------------------------------------------
-    html = cache_load(html_key)
-    if html:
-        return html
-
-    # --------------------------------------------------
-    # 2️⃣ RAW EQ CACHE
-    # --------------------------------------------------
-    out = cache_load(raw_key)
-    if not out:
-        out = eq(symbol)   # 🔥 existing nsepython function
-        if not isinstance(out, dict):
-            return "<h3>Error: EQ data not available</h3>"
-        cache_save(raw_key, out)
-
-    # --------------------------------------------------
-    # 3️⃣ DF → HTML TABLE
-    # --------------------------------------------------
+    # -------------------------------------------------------
+    # Helper: DataFrame → HTML table
+    # -------------------------------------------------------
     def df_to_table(df):
         if df is None or df.empty:
             return '<div class="empty">No data</div>'
-        return df.to_html(
-            index=False,
-            escape=False,
-            border=0,
-            classes="tbl"
-        )
-
-    # --------------------------------------------------
-    # 4️⃣ SECTION ORDER (METADATA FIRST)
-    # --------------------------------------------------
+        return df.to_html(index=False, escape=False, border=0, classes="tbl")
+
+    # -------------------------------------------------------
+    # ORDER
+    # -------------------------------------------------------
     section_order = [
         "metadata",
         "securityInfo",
@@ -93,6 +78,7 @@ def build_eq_html(symbol):
         "preOpenMarket"
     ]
 
+    # Normalize to DataFrames
     normalized = {}
     for sec in section_order:
         val = out.get(sec)
@@ -105,18 +91,16 @@ def build_eq_html(symbol):
         else:
             normalized[sec] = pd.DataFrame()
 
-    # --------------------------------------------------
-    # 5️⃣ BUILD SECTION HTML
-    # --------------------------------------------------
+    # -------------------------------------------------------
+    # Sections HTML
+    # -------------------------------------------------------
     section_html = ""
     for sec in section_order:
         section_html += f"""
         <div class="section">
             <div class="section-header">
                 <div class="section-title">{sec}</div>
-                <button class="toggle-btn" onclick="toggleSection('{sec}')">
-                    View / Hide
-                </button>
+                <button class="toggle-btn" onclick="toggleSection('{sec}')">View / Hide</button>
             </div>
             <div id="{sec}" class="section-body">
                 {df_to_table(normalized[sec])}
@@ -124,88 +108,86 @@ def build_eq_html(symbol):
         </div>
         """
 
-    # --------------------------------------------------
-    # 6️⃣ FINAL HTML
-    # --------------------------------------------------
+    # -------------------------------------------------------
+    # FINAL HTML
+    # -------------------------------------------------------
     html = f"""
-    <html>
-    <head>
-    <style>
-        body {{
-            font-family: Arial, sans-serif;
-            background: #fafafa;
-            margin: 0;
-            padding: 12px;
-        }}
-        h2 {{
-            color: #0366d6;
-            margin-bottom: 10px;
-        }}
-        .section {{
-            background: #fff;
-            border: 1px solid #ddd;
-            margin-bottom: 14px;
-            padding: 12px;
-            border-radius: 6px;
-        }}
-        .section-header {{
-            display: flex;
-            justify-content: space-between;
-            margin-bottom: 8px;
-        }}
-        .section-title {{
-            font-weight: bold;
-            color: #0b69a3;
-            font-size: 15px;
-        }}
-        .toggle-btn {{
-            background: #0b69a3;
-            color: #fff;
-            border: none;
-            padding: 6px 10px;
-            font-size: 12px;
-            border-radius: 5px;
-            cursor: pointer;
-        }}
-        .tbl {{
-            border-collapse: collapse;
-            width: 100%;
-            font-size: 13px;
-        }}
-        .tbl th {{
-            background: #0b69a3;
-            color: #fff;
-            padding: 6px;
-            border: 1px solid #ccc;
-        }}
-        .tbl td {{
-            padding: 6px;
-            border: 1px solid #ccc;
-        }}
-        .empty {{
-            padding: 10px;
-            color: #777;
-        }}
-    </style>
-
-    <script>
-        function toggleSection(id) {{
-            const e = document.getElementById(id);
-            e.style.display = (e.style.display === "none") ? "block" : "none";
-        }}
-    </script>
-    </head>
-
-    <body>
-        <h2>Equity Report — {symbol}</h2>
-        {section_html}
-    </body>
-    </html>
-    """
-
-    # --------------------------------------------------
-    # 7️⃣ SAVE HTML CACHE
-    # --------------------------------------------------
-    cache_save(html_key, html)
-
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Equity Report - {symbol}</title>
+<style>
+body {{
+    font-family: Arial, sans-serif;
+    background: #fafafa;
+    margin: 0;
+    padding: 12px;
+}}
+h2 {{
+    color: #0366d6;
+}}
+.section {{
+    background: #fff;
+    border: 1px solid #ddd;
+    margin-bottom: 14px;
+    padding: 12px;
+    border-radius: 6px;
+}}
+.section-header {{
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 8px;
+}}
+.section-title {{
+    font-weight: bold;
+    color: #0b69a3;
+}}
+.toggle-btn {{
+    background: #0b69a3;
+    color: #fff;
+    border: none;
+    padding: 6px 10px;
+    font-size: 12px;
+    border-radius: 5px;
+    cursor: pointer;
+}}
+.tbl {{
+    border-collapse: collapse;
+    width: 100%;
+    font-size: 13px;
+}}
+.tbl th {{
+    background: #0b69a3;
+    color: #fff;
+    padding: 6px;
+    border: 1px solid #ccc;
+}}
+.tbl td {{
+    padding: 6px;
+    border: 1px solid #ccc;
+}}
+.empty {{
+    padding: 10px;
+    color: #777;
+}}
+</style>
+
+<script>
+function toggleSection(id) {{
+    let e = document.getElementById(id);
+    e.style.display = (e.style.display === "none") ? "block" : "none";
+}}
+</script>
+</head>
+
+<body>
+<h2>Equity Report — {symbol}</h2>
+{section_html}
+</body>
+</html>
+"""
+
+    # ---------- SAVE CACHE ----------
+    cache_save(cache_key, html)
     return html