Update app.py

app.py

@@ -1,3 +1,5 @@
+--- START OF FILE app.py.txt ---
+
 import pandas as pd
 import requests
 import uvicorn
@@ -38,22 +40,27 @@ SYSTEM_STATUS = {
 UPDATE_LOCK = threading.Lock()
 
 # Manual mapping for Index Spot symbols
+# Added BSE Indices (SENSEX, BANKEX)
 INDEX_MAP = {
     "NIFTY": "NSE:NIFTY50-INDEX",
     "BANKNIFTY": "NSE:NIFTYBANK-INDEX",
     "FINNIFTY": "NSE:NIFTYFIN-INDEX",
-    "MIDCPNIFTY": "NSE:MIDCPNIFTY-INDEX"
+    "MIDCPNIFTY": "NSE:MIDCPNIFTY-INDEX",
+    "SENSEX": "BSE:SENSEX-INDEX",
+    "BANKEX": "BSE:BANKEX-INDEX",
+    "SENSEX50": "BSE:SENSEX50-INDEX"
 }
 
 def get_root_symbol(desc: str, symbol: str) -> str:
-    """Extracts root symbol (e.g. 'RELIANCE', 'CRUDEOIL') from description."""
+    """Extracts root symbol (e.g. 'RELIANCE', 'SENSEX') from description."""
     try:
-        # MCX often has description "CRUDEOIL 19 JAN 6000 CE"
-        # NSE often has "RELIANCE 24 JAN..."
+        # Standard Format: "SENSEX 19 JAN 72000 CE" or "RELIANCE 24 JAN..."
         parts = desc.strip().split(' ')
-        return parts[0].upper()
+        root = parts[0].upper()
+        # Clean up potential artifacts
+        return root.replace(':', '').replace('-', '')
     except:
-        # Fallback to symbol parsing
+        # Fallback to symbol parsing if description fails
         if ':' in symbol:
             return symbol.split(':')[1]
         return symbol
@@ -65,7 +72,7 @@ def update_master_db():
         return
 
     try:
-        SYSTEM_STATUS["message"] = "Downloading Master Data..."
+        SYSTEM_STATUS["message"] = "Downloading Master Data (NSE, MCX, BSE)..."
         print(">>> [BG TASK] STARTING DOWNLOAD...")
         
         headers = { "User-Agent": "Mozilla/5.0" }
@@ -77,19 +84,30 @@ def update_master_db():
             names=['Token', 'Desc', 'Expiry', 'Symbol', 'Inst'], 
             header=0, on_bad_lines='skip', storage_options=headers
         )
+        df_nse['Exch'] = 'NSE'
         
-        # 2. Download MCX F&O (Correct URL is MCX_COM.csv)
+        # 2. Download MCX F&O
         url_mcx = "https://public.fyers.in/sym_details/MCX_COM.csv"
         df_mcx = pd.read_csv(
             url_mcx, usecols=[0, 1, 8, 9, 13], 
             names=['Token', 'Desc', 'Expiry', 'Symbol', 'Inst'], 
             header=0, on_bad_lines='skip', storage_options=headers
         )
+        df_mcx['Exch'] = 'MCX'
+
+        # 3. Download BSE F&O (For SENSEX etc.)
+        url_bse = "https://public.fyers.in/sym_details/BSE_FO.csv"
+        df_bse = pd.read_csv(
+            url_bse, usecols=[0, 1, 8, 9, 13], 
+            names=['Token', 'Desc', 'Expiry', 'Symbol', 'Inst'], 
+            header=0, on_bad_lines='skip', storage_options=headers
+        )
+        df_bse['Exch'] = 'BSE'
 
         SYSTEM_STATUS["message"] = "Processing Data..."
         
         # Merge Dataframes
-        df = pd.concat([df_nse, df_mcx], ignore_index=True)
+        df = pd.concat([df_nse, df_mcx, df_bse], ignore_index=True)
         
         df['Symbol'] = df['Symbol'].astype(str)
         df['Desc'] = df['Desc'].astype(str)
@@ -99,21 +117,28 @@ def update_master_db():
         for _, row in df.iterrows():
             sym = row['Symbol']
             desc = row['Desc']
+            exch = row['Exch']
             
             root = get_root_symbol(desc, sym)
             
             # Initialize Root Entry
             if root not in temp_db:
                 spot_sym = ""
+                
+                # Check for Index Map match first
                 if root in INDEX_MAP:
                     spot_sym = INDEX_MAP[root]
-                elif sym.startswith("MCX"):
-                    # MCX has no "Index Spot", usually we track the Future
+                elif exch == "MCX":
+                    # MCX has no "Equity Spot", usually we track the Future
                     spot_sym = "MCX" 
+                elif exch == "BSE":
+                    # BSE Equity Spot usually "BSE:Symbol"
+                    spot_sym = f"BSE:{root}"
                 else:
+                    # NSE Equity Spot
                     spot_sym = f"NSE:{root}-EQ"
                     
-                temp_db[root] = { "spot": spot_sym, "items": [] }
+                temp_db[root] = { "spot": spot_sym, "exch": exch, "items": [] }
 
             try:
                 exp = int(row['Expiry'])
@@ -124,13 +149,14 @@ def update_master_db():
             opt_type = "FUT"
             
             # Parse Strike & Option Type
+            # Logic handles "SENSEX 23 JAN 72000 CE"
             if "CE" in sym or "PE" in sym:
                 parts = desc.strip().split(' ')
                 if len(parts) >= 2:
                     try:
-                        # Logic: "NIFTY 23 JAN 21500 CE" -> 21500 is 2nd last
+                        # Logic: val is usually 2nd last item
                         val = parts[-2]
-                        # Remove one decimal point to check isdigit
+                        # Remove decimal for digit check
                         val_clean = val.replace('.', '', 1)
                         if val_clean.isdigit():
                             strike = float(val)
@@ -142,19 +168,32 @@ def update_master_db():
                 "s": sym, "e": exp, "k": strike, "t": opt_type
             })
 
-        # Final Sort
+        # Final Sort & Search Index Creation
         final_db = {}
+        search_list = []
+        
         for root, data in temp_db.items():
             # Sort by Expiry (asc) then Strike (asc)
             sorted_items = sorted(data["items"], key=lambda x: (x['e'], x['k']))
-            final_db[root] = { "spot": data["spot"], "items": sorted_items }
+            final_db[root] = { 
+                "spot": data["spot"], 
+                "exch": data["exch"],
+                "items": sorted_items 
+            }
+            # Create a rich search object
+            search_list.append({
+                "root": root,
+                "exch": data["exch"],
+                "display": f"{root}"
+            })
 
         MASTER_DB = final_db
-        SEARCH_INDEX = sorted(list(MASTER_DB.keys()))
+        # Sort search index alphabetically
+        SEARCH_INDEX = sorted(search_list, key=lambda x: x['root'])
         
         # Save cache
         with open(CACHE_FILE, "w") as f:
-            json.dump(final_db, f)
+            json.dump({"db": final_db, "idx": SEARCH_INDEX}, f)
 
         SYSTEM_STATUS["ready"] = True
         SYSTEM_STATUS["message"] = "Ready"
@@ -173,8 +212,9 @@ def startup_event():
         try:
             print(">>> STARTUP: Loading Cache...")
             with open(CACHE_FILE, "r") as f:
-                MASTER_DB = json.load(f)
-            SEARCH_INDEX = sorted(list(MASTER_DB.keys()))
+                data = json.load(f)
+                MASTER_DB = data["db"]
+                SEARCH_INDEX = data["idx"]
             SYSTEM_STATUS["ready"] = True
             SYSTEM_STATUS["message"] = "Ready (Cached)"
         except:
@@ -236,7 +276,7 @@ def logout():
 
 @app.get("/favicon.ico")
 def favicon():
-    return Response(status_code=204) # No content, stops 404 errors
+    return Response(status_code=204)
 
 # --- API ---
 
@@ -244,7 +284,6 @@ def favicon():
 def get_status():
     return JSONResponse(SYSTEM_STATUS)
 
-# COMPATIBILITY ROUTE: Returns empty list to stop 404s on old clients
 @app.get("/api/init")
 def legacy_init():
     return JSONResponse([])
@@ -255,11 +294,14 @@ def search_symbol(q: str = Query(..., min_length=1)):
         return JSONResponse([])
     
     query = q.upper()
+    # SEARCH_INDEX is now a list of dicts: {'root': 'NIFTY', 'exch': 'NSE', 'display': 'NIFTY'}
+    
     # 1. Starts with
-    results = [x for x in SEARCH_INDEX if x.startswith(query)]
+    results = [x for x in SEARCH_INDEX if x['root'].startswith(query)]
+    
     # 2. Contains (if few results)
     if len(results) < 10:
-        results += [x for x in SEARCH_INDEX if query in x and x not in results]
+        results += [x for x in SEARCH_INDEX if query in x['root'] and x not in results]
         
     return JSONResponse(results[:20])
 
@@ -286,7 +328,7 @@ HTML_TEMPLATE = """
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>PRO CHAIN (V2)</title>
+    <title>PRO CHAIN (V3)</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@500;800&family=Inter:wght@400;600;800&display=swap" rel="stylesheet">
     <style>
@@ -296,6 +338,10 @@ HTML_TEMPLATE = """
             --accent: #2962ff; --green: #00c853; --red: #d50000;
             --green-soft: rgba(0, 200, 83, 0.3); --red-soft: rgba(213, 0, 0, 0.3);
             --atm-bg: rgba(41, 98, 255, 0.1);
+            /* Badge Colors */
+            --badge-nse: #00c853;
+            --badge-bse: #ff6d00;
+            --badge-mcx: #2962ff;
         }
         * { box-sizing: border-box; }
         body { margin: 0; background: var(--bg); color: var(--text-main); font-family: 'Inter', sans-serif; height: 100vh; display: flex; flex-direction: column; overflow: hidden; }
@@ -304,12 +350,18 @@ HTML_TEMPLATE = """
         .btn { background: #fff; border: 1px solid var(--border); padding: 8px 16px; font-size: 12px; border-radius: 6px; cursor: pointer; font-weight: 700; display: flex; gap: 8px; align-items: center; transition:0.2s; white-space:nowrap; }
         .btn:hover { border-color: var(--accent); color: var(--accent); background:#f0f7ff; }
         
-        .search-box { position: relative; width: 300px; margin-right: 20px; }
+        .search-box { position: relative; width: 350px; margin-right: 20px; }
         .search-input { width: 100%; padding: 10px 15px; border: 2px solid var(--border); border-radius: 6px; font-family: 'JetBrains Mono', monospace; font-weight: bold; font-size: 14px; outline: none; transition: 0.3s; }
         .search-input:focus { border-color: var(--accent); }
-        .search-dropdown { position: absolute; top: 100%; left: 0; width: 100%; background: white; border: 1px solid var(--border); border-top: none; max-height: 300px; overflow-y: auto; display: none; box-shadow: 0 10px 20px rgba(0,0,0,0.1); border-radius: 0 0 6px 6px; }
-        .search-item { padding: 10px 15px; cursor: pointer; border-bottom: 1px solid #eee; font-size: 13px; font-weight: 600; }
+        .search-dropdown { position: absolute; top: 100%; left: 0; width: 100%; background: white; border: 1px solid var(--border); border-top: none; max-height: 400px; overflow-y: auto; display: none; box-shadow: 0 10px 20px rgba(0,0,0,0.1); border-radius: 0 0 6px 6px; }
+        
+        .search-item { padding: 12px 15px; cursor: pointer; border-bottom: 1px solid #eee; font-size: 13px; font-weight: 700; display: flex; justify-content: space-between; align-items: center; }
         .search-item:hover { background: #f0f7ff; color: var(--accent); }
+        
+        .exch-badge { font-size: 10px; padding: 2px 6px; border-radius: 4px; color: white; font-weight: 800; min-width: 40px; text-align: center; }
+        .badge-NSE { background: var(--badge-nse); }
+        .badge-BSE { background: var(--badge-bse); }
+        .badge-MCX { background: var(--badge-mcx); }
 
         .grid-layout { display: flex; height: calc(100vh - 60px); }
         .chain-panel { flex: 1; display: flex; flex-direction: column; position: relative; }
@@ -366,7 +418,7 @@ HTML_TEMPLATE = """
 <div class="top-nav">
     <div style="display:flex; align-items:center;">
         <div class="search-box">
-            <input type="text" class="search-input" id="searchInp" placeholder="SEARCH (e.g., NIFTY, CRUDE)..." autocomplete="off">
+            <input type="text" class="search-input" id="searchInp" placeholder="SEARCH (e.g., SENSEX, NIFTY)..." autocomplete="off">
             <div class="search-dropdown" id="searchRes"></div>
         </div>
 
@@ -450,7 +502,7 @@ HTML_TEMPLATE = """
     }
 
     async function refreshDB() {
-        if(!confirm("Download fresh Master Data? This takes ~10s.")) return;
+        if(!confirm("Download fresh Master Data (NSE, MCX, BSE)? This takes ~15s.")) return;
         document.getElementById('loader').style.display = 'flex';
         await fetch('/api/refresh');
         checkStatus();
@@ -462,8 +514,12 @@ HTML_TEMPLATE = """
         try {
             const res = await fetch(`/api/search?q=${q}`);
             const data = await res.json();
-            resDiv.innerHTML = data.map(sym => 
-                `<div class="search-item" onclick="loadSymbol('${sym}')">${sym}</div>`
+            // Data is now list of {root, exch, display}
+            resDiv.innerHTML = data.map(item => 
+                `<div class="search-item" onclick="loadSymbol('${item.root}')">
+                    <span>${item.display}</span>
+                    <span class="exch-badge badge-${item.exch}">${item.exch}</span>
+                </div>`
             ).join('');
             resDiv.style.display = 'block';
         } catch(e) { console.error(e); }
@@ -487,11 +543,12 @@ HTML_TEMPLATE = """
             // Sort futures: Filter items with type 'FUT'
             FUT_SYMS = CHAIN_DATA.filter(x => x.t === 'FUT').sort((a,b) => a.e - b.e).slice(0, 3);
             
+            // Handle MCX specific spot logic
             if(SPOT_SYM === "MCX" && FUT_SYMS.length > 0) {
-                SPOT_SYM = FUT_SYMS[0].s; // Use Near Future as Spot for MCX
+                SPOT_SYM = FUT_SYMS[0].s; 
             }
 
-            document.getElementById('spotLabel').innerText = (SPOT_SYM.includes('INDEX') || SPOT_SYM.includes('-EQ')) ? "SPOT" : "FUT REF";
+            document.getElementById('spotLabel').innerText = (SPOT_SYM.includes('INDEX') || SPOT_SYM.includes('-EQ') || SPOT_SYM.startsWith('BSE:')) ? "SPOT" : "FUT REF";
 
             setupExpiries();
             document.getElementById('loader').style.display = 'none';
@@ -508,7 +565,13 @@ HTML_TEMPLATE = """
         const today = Math.floor(Date.now()/1000) - 86400;
         
         const validExps = exps.filter(ts => ts > today);
-        if(validExps.length === 0) { alert("No active expiries."); return; }
+        if(validExps.length === 0) { 
+            alert("No active options found for this symbol."); 
+            // Still render Futures if available
+            document.getElementById('chainBody').innerHTML = '<div style="padding:20px; text-align:center;">NO OPTIONS DATA</div>';
+            updateUI({}); 
+            return; 
+        }
         
         ACTIVE_EXP = validExps[0];
         updateExpText(ACTIVE_EXP);
@@ -572,30 +635,34 @@ HTML_TEMPLATE = """
         try {
             let symbolsToFetch = [SPOT_SYM, ...FUT_SYMS.map(x => x.s)];
             
+            // Logic to fetch only visible/near options
             if(SPOT_PRICE > 0) {
                 const kList = Array.from(document.querySelectorAll('.row')).map(r => parseFloat(r.dataset.k));
-                let closestK = kList[0], minDiff = 999999;
-                kList.forEach(k => {
-                   const diff = Math.abs(SPOT_PRICE - k);
-                   if(diff < minDiff) { minDiff = diff; closestK = k; }
-                });
-                
-                document.querySelectorAll('.atm').forEach(e => e.classList.remove('atm'));
-                const atmRow = document.getElementById(`row-${closestK}`);
-                if(atmRow) {
-                    atmRow.classList.add('atm');
-                    if(!window.scrolled) { atmRow.scrollIntoView({block:'center'}); window.scrolled = true; }
+                if(kList.length > 0) {
+                    let closestK = kList[0], minDiff = 999999;
+                    kList.forEach(k => {
+                       const diff = Math.abs(SPOT_PRICE - k);
+                       if(diff < minDiff) { minDiff = diff; closestK = k; }
+                    });
+                    
+                    document.querySelectorAll('.atm').forEach(e => e.classList.remove('atm'));
+                    const atmRow = document.getElementById(`row-${closestK}`);
+                    if(atmRow) {
+                        atmRow.classList.add('atm');
+                        if(!window.scrolled) { atmRow.scrollIntoView({block:'center'}); window.scrolled = true; }
+                    }
+                    
+                    const centerIdx = kList.indexOf(closestK);
+                    const start = Math.max(0, centerIdx - 12);
+                    const end = Math.min(kList.length, centerIdx + 12);
+                    const viewKs = kList.slice(start, end);
+                    
+                    OPT_SYMS.forEach(o => {
+                        if(viewKs.includes(o.k)) symbolsToFetch.push(o.s);
+                    });
                 }
-                
-                const centerIdx = kList.indexOf(closestK);
-                const start = Math.max(0, centerIdx - 12);
-                const end = Math.min(kList.length, centerIdx + 12);
-                const viewKs = kList.slice(start, end);
-                
-                OPT_SYMS.forEach(o => {
-                    if(viewKs.includes(o.k)) symbolsToFetch.push(o.s);
-                });
             } else {
+                 // Fallback if no spot price yet (initial load)
                  const kList = Array.from(document.querySelectorAll('.row')).map(r => parseFloat(r.dataset.k));
                  const mid = Math.floor(kList.length/2);
                  const viewKs = kList.slice(Math.max(0, mid-10), mid+10);