Update app.py

app.py

@@ -17,7 +17,7 @@ from typing import Optional, List, Dict
 # ==========================================
 CLIENT_ID    = "J4PNT5QI22-100" 
 SECRET_KEY   = "ABRSWC1PMR"
-# Ensure this matches your Space URL exactly
+# IMPORTANT: Ensure this matches your Space URL exactly
 REDIRECT_URI = "https://topsecrettraders-depthchain.hf.space/callback" 
 
 CACHE_FILE = "master_cache.json"
@@ -28,10 +28,8 @@ app = FastAPI()
 # 2. ROBUST DATA LOADER (THREAD SAFE)
 # ==========================================
 
-# Global In-Memory Database
-# Structure: { "NIFTY": { "spot": "NSE:...", "data": [...] }, "RELIANCE": ... }
 MASTER_DB = {}
-SEARCH_INDEX = [] # List of available root symbols for autocomplete
+SEARCH_INDEX = [] 
 
 SYSTEM_STATUS = {
     "ready": False,
@@ -39,7 +37,7 @@ SYSTEM_STATUS = {
 }
 UPDATE_LOCK = threading.Lock()
 
-# Manual mapping for Index Spot symbols (Fyers specific)
+# Manual mapping for Index Spot symbols
 INDEX_MAP = {
     "NIFTY": "NSE:NIFTY50-INDEX",
     "BANKNIFTY": "NSE:NIFTYBANK-INDEX",
@@ -48,27 +46,26 @@ INDEX_MAP = {
 }
 
 def get_root_symbol(desc: str, symbol: str) -> str:
-    """Extracts the root symbol (e.g. 'RELIANCE', 'CRUDEOIL') from description."""
-    # Description format is usually "SYMBOL YY MMM STRIKE TYPE"
-    # e.g., "BANKNIFTY 24 JAN 48000 CE" -> BANKNIFTY
-    # e.g., "M&M 24 JAN ..." -> M&M
+    """Extracts root symbol (e.g. 'RELIANCE', 'CRUDEOIL') from description."""
     try:
+        # MCX often has description "CRUDEOIL 19 JAN 6000 CE"
+        # NSE often has "RELIANCE 24 JAN..."
         parts = desc.strip().split(' ')
         return parts[0].upper()
     except:
-        return symbol.split(':')[1] # Fallback
+        # Fallback to symbol parsing
+        if ':' in symbol:
+            return symbol.split(':')[1]
+        return symbol
 
 def update_master_db():
-    """
-    Downloads NSE and MCX F&O files, processes them, and builds a search index.
-    """
     global SYSTEM_STATUS, MASTER_DB, SEARCH_INDEX
     
     if not UPDATE_LOCK.acquire(blocking=False):
         return
 
     try:
-        SYSTEM_STATUS["message"] = "Downloading Master Data (NSE & MCX)..."
+        SYSTEM_STATUS["message"] = "Downloading Master Data..."
         print(">>> [BG TASK] STARTING DOWNLOAD...")
         
         headers = { "User-Agent": "Mozilla/5.0" }
@@ -81,8 +78,8 @@ def update_master_db():
             header=0, on_bad_lines='skip', storage_options=headers
         )
         
-        # 2. Download MCX F&O
-        url_mcx = "https://public.fyers.in/sym_details/MCX_FO.csv"
+        # 2. Download MCX F&O (Correct URL is MCX_COM.csv)
+        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'], 
@@ -97,86 +94,71 @@ def update_master_db():
         df['Symbol'] = df['Symbol'].astype(str)
         df['Desc'] = df['Desc'].astype(str)
         
-        # Temporary dictionary to build structure
         temp_db = {}
         
-        count = 0
         for _, row in df.iterrows():
             sym = row['Symbol']
             desc = row['Desc']
             
-            # Extract Root
             root = get_root_symbol(desc, sym)
             
-            # Initialize Root Entry if missing
+            # Initialize Root Entry
             if root not in temp_db:
-                # Determine Spot Symbol
                 spot_sym = ""
                 if root in INDEX_MAP:
                     spot_sym = INDEX_MAP[root]
                 elif sym.startswith("MCX"):
-                    spot_sym = "MCX" # Placeholder, MCX uses Future as spot
+                    # MCX has no "Index Spot", usually we track the Future
+                    spot_sym = "MCX" 
                 else:
-                    # Stock Spot assumption
                     spot_sym = f"NSE:{root}-EQ"
                     
-                temp_db[root] = {
-                    "spot": spot_sym,
-                    "items": []
-                }
+                temp_db[root] = { "spot": spot_sym, "items": [] }
 
-            # Parse Details
             try:
                 exp = int(row['Expiry'])
             except:
                 exp = 0
             
             strike = 0.0
-            opt_type = "FUT" # Default
+            opt_type = "FUT"
             
+            # Parse Strike & Option Type
             if "CE" in sym or "PE" in sym:
-                # Logic: Parse Strike from Desc (e.g., "NIFTY 23 JAN 21500 CE")
                 parts = desc.strip().split(' ')
-                # Iterate backwards to find the number before CE/PE
                 if len(parts) >= 2:
                     try:
-                        # Usually the second to last is strike, last is CE/PE
+                        # Logic: "NIFTY 23 JAN 21500 CE" -> 21500 is 2nd last
                         val = parts[-2]
+                        # Remove one decimal point to check isdigit
                         val_clean = val.replace('.', '', 1)
                         if val_clean.isdigit():
                             strike = float(val)
-                        opt_type = parts[-1] # CE or PE
+                        opt_type = parts[-1] 
                     except:
                         pass
             
             temp_db[root]["items"].append({
-                "s": sym,       # Symbol
-                "e": exp,       # Expiry Epoch
-                "k": strike,    # Strike
-                "t": opt_type   # Type: CE, PE, FUT
+                "s": sym, "e": exp, "k": strike, "t": opt_type
             })
-            count += 1
 
-        # Optimize: Sort items by expiry then strike for each root
+        # Final Sort
         final_db = {}
         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"], "items": sorted_items }
 
-        # Update Global State
         MASTER_DB = final_db
         SEARCH_INDEX = sorted(list(MASTER_DB.keys()))
         
-        # Save cache (Optional, for faster reload)
+        # Save cache
         with open(CACHE_FILE, "w") as f:
             json.dump(final_db, f)
 
         SYSTEM_STATUS["ready"] = True
         SYSTEM_STATUS["message"] = "Ready"
-        print(f">>> [BG TASK] COMPLETE. Processed {len(SEARCH_INDEX)} assets ({count} symbols).")
+        print(f">>> [BG TASK] COMPLETE. Loaded {len(SEARCH_INDEX)} symbols.")
 
     except Exception as e:
         print(f">>> [BG TASK] ERROR: {e}")
@@ -189,17 +171,16 @@ def startup_event():
     global MASTER_DB, SEARCH_INDEX
     if os.path.exists(CACHE_FILE):
         try:
-            print(">>> STARTUP: Loading from Cache...")
+            print(">>> STARTUP: Loading Cache...")
             with open(CACHE_FILE, "r") as f:
                 MASTER_DB = json.load(f)
             SEARCH_INDEX = sorted(list(MASTER_DB.keys()))
             SYSTEM_STATUS["ready"] = True
             SYSTEM_STATUS["message"] = "Ready (Cached)"
         except:
-            # If cache fails, start fresh
-            thread = threading.Thread(target=update_master_db)
-            thread.start()
-    else:
+            pass
+            
+    if not SYSTEM_STATUS["ready"]:
         thread = threading.Thread(target=update_master_db)
         thread.start()
 
@@ -225,27 +206,27 @@ def home(access_token: Optional[str] = Cookie(None)):
         </div>
         """)
     
-    rendered_html = HTML_TEMPLATE.replace("{{USER_TOKEN}}", access_token)
-    return HTMLResponse(rendered_html)
+    # Inject token
+    return HTMLResponse(HTML_TEMPLATE.replace("{{USER_TOKEN}}", access_token))
 
 @app.get("/callback")
 def callback(auth_code: Optional[str] = None, code: Optional[str] = None):
     final_code = auth_code if auth_code else code
-    if not final_code: return JSONResponse({"error": "No Code"})
+    if not final_code: return JSONResponse({"error": "No Code Provided"})
 
     app_id_hash = hashlib.sha256(f"{CLIENT_ID}:{SECRET_KEY}".encode()).hexdigest()
     resp = requests.post("https://api-t1.fyers.in/api/v3/validate-authcode", json={
         "grant_type": "authorization_code", "appIdHash": app_id_hash, "code": final_code
     })
-    data = resp.json()
     
+    data = resp.json()
     if "access_token" in data:
         full_token = f"{CLIENT_ID}:{data['access_token']}"
         response = RedirectResponse(url="/")
         response.set_cookie(key="access_token", value=full_token, httponly=True)
         return response
     else:
-        return HTMLResponse(f"Login Failed: {json.dumps(data)}")
+        return HTMLResponse(f"<h3>Login Failed</h3><pre>{json.dumps(data, indent=2)}</pre>")
 
 @app.get("/logout")
 def logout():
@@ -253,43 +234,41 @@ def logout():
     response.delete_cookie("access_token")
     return response
 
-# --- API ENDPOINTS ---
+@app.get("/favicon.ico")
+def favicon():
+    return Response(status_code=204) # No content, stops 404 errors
+
+# --- API ---
 
 @app.get("/api/status")
 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([])
+
 @app.get("/api/search")
 def search_symbol(q: str = Query(..., min_length=1)):
-    """
-    Real-time search against loaded master data.
-    """
     if not SYSTEM_STATUS["ready"]:
         return JSONResponse([])
     
     query = q.upper()
-    # Simple logic: Filter list where root starts with QUERY
+    # 1. Starts with
     results = [x for x in SEARCH_INDEX if x.startswith(query)]
-    
-    # If few results, try 'contains'
-    if len(results) < 5:
+    # 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]
         
-    return JSONResponse(results[:20]) # Limit to 20 results
+    return JSONResponse(results[:20])
 
 @app.get("/api/chain")
 def get_chain(symbol: str):
-    """
-    Returns the option chain structure for a specific root symbol.
-    """
-    if not SYSTEM_STATUS["ready"]:
-        return JSONResponse({"error": "System not ready"}, status_code=503)
-        
     root = symbol.upper()
     if root in MASTER_DB:
         return JSONResponse(MASTER_DB[root])
-    else:
-        return JSONResponse({"error": "Symbol not found"}, status_code=404)
+    return JSONResponse({"error": "Symbol not found"}, status_code=404)
 
 @app.get("/api/refresh")
 def force_refresh(background_tasks: BackgroundTasks):
@@ -307,7 +286,7 @@ HTML_TEMPLATE = """
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>PRO TRADER CHAIN</title>
+    <title>PRO CHAIN (V2)</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>
@@ -325,7 +304,6 @@ 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 BAR */
         .search-box { position: relative; width: 300px; 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); }
@@ -387,9 +365,8 @@ HTML_TEMPLATE = """
 
 <div class="top-nav">
     <div style="display:flex; align-items:center;">
-        <!-- SEARCH BAR -->
         <div class="search-box">
-            <input type="text" class="search-input" id="searchInp" placeholder="SEARCH (e.g., NIFTY, RELIANCE)..." autocomplete="off">
+            <input type="text" class="search-input" id="searchInp" placeholder="SEARCH (e.g., NIFTY, CRUDE)..." autocomplete="off">
             <div class="search-dropdown" id="searchRes"></div>
         </div>
 
@@ -433,33 +410,26 @@ HTML_TEMPLATE = """
 <script>
     const AUTH_TOKEN = "{{USER_TOKEN}}";
     
-    // State
     let CURRENT_ROOT = "";
     let CHAIN_DATA = null;
     let ACTIVE_EXP = 0;
     let SPOT_SYM = "";
     let SPOT_PRICE = 0;
-    
     let FUT_SYMS = [];
     let OPT_SYMS = [];
-    
     let POLLER = null;
     let IS_POLLING = false;
     let SEARCH_TIMER = null;
 
-    // === STARTUP ===
     window.onload = () => { 
         if(AUTH_TOKEN.indexOf("{{") !== -1) { alert("Auth Error"); return; }
         checkStatus();
         
-        // Setup Search
         const inp = document.getElementById('searchInp');
         inp.addEventListener('input', (e) => {
             clearTimeout(SEARCH_TIMER);
             SEARCH_TIMER = setTimeout(() => doSearch(e.target.value), 300);
         });
-        
-        // Hide dropdown on click outside
         document.addEventListener('click', (e) => {
             if(!e.target.closest('.search-box')) document.getElementById('searchRes').style.display = 'none';
         });
@@ -471,7 +441,6 @@ HTML_TEMPLATE = """
             const status = await res.json();
             if(status.ready) {
                 document.getElementById('loader').style.display = 'none';
-                // Default load NIFTY if not loaded
                 if(!CURRENT_ROOT) loadSymbol('NIFTY'); 
             } else {
                 document.getElementById('loaderMsg').innerText = status.message.toUpperCase();
@@ -481,21 +450,18 @@ HTML_TEMPLATE = """
     }
 
     async function refreshDB() {
-        if(!confirm("Download fresh Master Data from Fyers? Takes ~10s.")) return;
+        if(!confirm("Download fresh Master Data? This takes ~10s.")) return;
         document.getElementById('loader').style.display = 'flex';
         await fetch('/api/refresh');
         checkStatus();
     }
 
-    // === SEARCH LOGIC ===
     async function doSearch(q) {
         const resDiv = document.getElementById('searchRes');
         if(q.length < 2) { resDiv.style.display = 'none'; return; }
-        
         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>`
             ).join('');
@@ -503,7 +469,6 @@ HTML_TEMPLATE = """
         } catch(e) { console.error(e); }
     }
 
-    // === LOAD SYMBOL DATA ===
     async function loadSymbol(root) {
         document.getElementById('searchInp').value = root;
         document.getElementById('searchRes').style.display = 'none';
@@ -519,13 +484,11 @@ HTML_TEMPLATE = """
             CHAIN_DATA = data.items;
             SPOT_SYM = data.spot;
 
-            // Sort futures (filter items ending in FUT, usually no expiry in symbol but checked via type)
-            // Backend provides 't': 'FUT'
+            // 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);
             
-            // If Spot symbol is MCX (placeholder), use nearest Future as spot
             if(SPOT_SYM === "MCX" && FUT_SYMS.length > 0) {
-                SPOT_SYM = FUT_SYMS[0].s;
+                SPOT_SYM = FUT_SYMS[0].s; // Use Near Future as Spot for MCX
             }
 
             document.getElementById('spotLabel').innerText = (SPOT_SYM.includes('INDEX') || SPOT_SYM.includes('-EQ')) ? "SPOT" : "FUT REF";
@@ -534,7 +497,7 @@ HTML_TEMPLATE = """
             document.getElementById('loader').style.display = 'none';
 
         } catch(e) {
-            alert("Error loading symbol: " + e.message);
+            alert("Error: " + e.message);
             document.getElementById('loader').style.display = 'none';
         }
     }
@@ -545,13 +508,11 @@ 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 found."); return; }
+        if(validExps.length === 0) { alert("No active expiries."); return; }
         
-        // Auto select nearest
         ACTIVE_EXP = validExps[0];
         updateExpText(ACTIVE_EXP);
         
-        // Build Grid
         const grid = document.getElementById('expGrid');
         grid.innerHTML = validExps.map(ts => {
             const dStr = new Date(ts*1000).toLocaleDateString('en-GB', {day:'2-digit', month:'short'});
@@ -575,11 +536,8 @@ HTML_TEMPLATE = """
     
     function closeModal() { document.getElementById('expModal').style.display = 'none'; }
 
-    // === BUILD UI ===
     function buildChain() {
         const body = document.getElementById('chainBody');
-        
-        // Filter options for active expiry
         const relevant = CHAIN_DATA.filter(x => x.e === ACTIVE_EXP && (x.t === 'CE' || x.t === 'PE'));
         OPT_SYMS = relevant;
         
@@ -597,7 +555,7 @@ HTML_TEMPLATE = """
             </div>
         `).join('');
         
-        window.scrolled = false; // Reset scroll lock
+        window.scrolled = false;
         restartPoller();
     }
 
@@ -607,27 +565,21 @@ HTML_TEMPLATE = """
         pollData();
     }
 
-    // === POLLING ===
     async function pollData() {
         if(IS_POLLING || !CURRENT_ROOT) return;
         IS_POLLING = true;
         
         try {
-            // Logic to fetch only visible strikes + spot + futures
             let symbolsToFetch = [SPOT_SYM, ...FUT_SYMS.map(x => x.s)];
             
-            // If we have a spot price, filter strikes around it
             if(SPOT_PRICE > 0) {
                 const kList = Array.from(document.querySelectorAll('.row')).map(r => parseFloat(r.dataset.k));
-                
-                // Find closest strike index
                 let closestK = kList[0], minDiff = 999999;
                 kList.forEach(k => {
                    const diff = Math.abs(SPOT_PRICE - k);
                    if(diff < minDiff) { minDiff = diff; closestK = k; }
                 });
                 
-                // Highlight ATM
                 document.querySelectorAll('.atm').forEach(e => e.classList.remove('atm'));
                 const atmRow = document.getElementById(`row-${closestK}`);
                 if(atmRow) {
@@ -635,32 +587,26 @@ HTML_TEMPLATE = """
                     if(!window.scrolled) { atmRow.scrollIntoView({block:'center'}); window.scrolled = true; }
                 }
                 
-                // Get range of strikes to fetch (ATM +/- 12)
                 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);
                 
-                // Add option symbols to fetch list
                 OPT_SYMS.forEach(o => {
                     if(viewKs.includes(o.k)) symbolsToFetch.push(o.s);
                 });
             } else {
-                 // First run, fetch middle strikes
                  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);
                  OPT_SYMS.forEach(o => { if(viewKs.includes(o.k)) symbolsToFetch.push(o.s); });
             }
 
-            const uniqueSyms = [...new Set(symbolsToFetch)];
+            const uniqueSyms = [...new Set(symbolsToFetch)].filter(s => s && s.length > 2);
             if(uniqueSyms.length === 0) return;
             
             const url = `https://api-t1.fyers.in/data/depth?symbol=${uniqueSyms.join(',')}&ohlcv_flag=1`;
-            
-            const res = await fetch(url, {
-                headers: { 'Authorization': AUTH_TOKEN, 'Content-Type': 'application/json' }
-            });
+            const res = await fetch(url, { headers: { 'Authorization': AUTH_TOKEN, 'Content-Type': 'application/json' }});
             
             if(res.status === 401) { location.href = '/logout'; return; }
             
@@ -672,22 +618,16 @@ HTML_TEMPLATE = """
                 dot.classList.add('live');
                 setTimeout(()=>dot.classList.remove('live'), 500);
             }
-        } catch(e) {
-            console.error(e);
-            document.getElementById('statusDot').style.background = 'var(--red)';
-        } finally {
-            IS_POLLING = false;
-        }
+        } catch(e) { console.error(e); document.getElementById('statusDot').style.background = 'var(--red)'; } 
+        finally { IS_POLLING = false; }
     }
 
     function updateUI(data) {
-        // 1. Spot
         if(data[SPOT_SYM]) {
             SPOT_PRICE = data[SPOT_SYM].ltp;
             document.getElementById('spotPrice').innerText = SPOT_PRICE.toFixed(2);
         }
         
-        // 2. Futures
         const futHTML = FUT_SYMS.map(f => {
             const d = data[f.s];
             if(!d) return '';
@@ -710,13 +650,10 @@ HTML_TEMPLATE = """
         }).join('');
         if(futHTML) document.getElementById('futBody').innerHTML = futHTML;
 
-        // 3. Chain
         const rowData = {};
         for(const [sym, d] of Object.entries(data)) {
-            // Find which option this is
             const meta = OPT_SYMS.find(x => x.s === sym);
             if(!meta) continue;
-            
             if(!rowData[meta.k]) rowData[meta.k] = { ce:0, pe:0 };
             if(meta.t === 'CE') rowData[meta.k].ce = d.totalsellqty;
             if(meta.t === 'PE') rowData[meta.k].pe = d.totalsellqty;
@@ -728,17 +665,13 @@ HTML_TEMPLATE = """
         for(const k in rowData) {
             const r = rowData[k];
             const delta = r.pe - r.ce;
-            
-            // Update Text
             const ceEl = document.getElementById(`ce-${k}`);
             const peEl = document.getElementById(`pe-${k}`);
             if(ceEl) ceEl.innerHTML = `<span>S: <strong>${fmt(r.ce)}</strong></span>`;
             if(peEl) peEl.innerHTML = `<span>S: <strong>${fmt(r.pe)}</strong></span>`;
             
-            // Update Bars
             const bar = document.getElementById(`bar-${k}`);
             const val = document.getElementById(`val-${k}`);
-            
             if(bar && maxDiff > 0) {
                 const pct = (Math.abs(delta) / maxDiff) * 100;
                 if(delta >= 0) {