Update app.py

app.py

@@ -7,11 +7,9 @@ import time
 import urllib.parse
 import os
 import threading
-import asyncio
-from fastapi import FastAPI, Request, Response, Cookie, BackgroundTasks, Query, WebSocket, WebSocketDisconnect
+from fastapi import FastAPI, Request, Response, Cookie, BackgroundTasks, Query
 from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse
 from typing import Optional, List, Dict
-from fyers_apiv3.FyersWebsocket import data_ws
 
 # ==========================================
 # 1. CONFIGURATION
@@ -26,25 +24,17 @@ CACHE_FILE = "master_cache.json"
 app = FastAPI()
 
 # ==========================================
-# 2. GLOBAL DATA & STATE
+# 2. ROBUST DATA LOADER (THREAD SAFE)
 # ==========================================
 
 MASTER_DB = {}
 SEARCH_INDEX = [] 
 
-# LIVE MARKET DATA STORE (The "Scoreboard")
-LIVE_DATA = {}
-LIVE_DATA_LOCK = threading.Lock()
-
 SYSTEM_STATUS = {
     "ready": False,
-    "message": "Booting...",
-    "socket": False
+    "message": "Booting..."
 }
-
-# FYERS SOCKET OBJECT
-FYERS_SOCKET = None
-CURRENT_TOKEN = None
+UPDATE_LOCK = threading.Lock()
 
 # Manual mapping for Index Spot symbols
 INDEX_MAP = {
@@ -57,13 +47,8 @@ INDEX_MAP = {
     "SENSEX50": "BSE:SENSEX50-INDEX"
 }
 
-# ==========================================
-# 3. MASTER DATA LOADER
-# ==========================================
-
-UPDATE_LOCK = threading.Lock()
-
 def get_root_symbol(desc: str, symbol: str) -> str:
+    """Extracts root symbol (e.g. 'RELIANCE', 'SENSEX') from description."""
     try:
         parts = desc.strip().split(' ')
         root = parts[0].upper()
@@ -87,17 +72,29 @@ def update_master_db():
         
         # 1. NSE F&O
         url_nse = "https://public.fyers.in/sym_details/NSE_FO.csv"
-        df_nse = pd.read_csv(url_nse, usecols=[0, 1, 8, 9, 13], names=['Token', 'Desc', 'Expiry', 'Symbol', 'Inst'], header=0, on_bad_lines='skip', storage_options=headers)
+        df_nse = pd.read_csv(
+            url_nse, usecols=[0, 1, 8, 9, 13], 
+            names=['Token', 'Desc', 'Expiry', 'Symbol', 'Inst'], 
+            header=0, on_bad_lines='skip', storage_options=headers
+        )
         df_nse['Exch'] = 'NSE'
         
         # 2. 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 = 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. BSE F&O
         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 = 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..."
@@ -204,84 +201,7 @@ def startup_event():
         thread.start()
 
 # ==========================================
-# 4. WEBSOCKET MANAGER (SERVER <-> FYERS)
-# ==========================================
-
-def on_fyers_msg(msg):
-    global LIVE_DATA
-    # msg format: [{'symbol': 'NSE:SBIN-EQ', 'ltp': 500.0, ...}] or dict
-    # Fyers SDK sometimes returns list, sometimes dict
-    
-    data_list = []
-    if isinstance(msg, list): data_list = msg
-    elif isinstance(msg, dict): data_list = [msg]
-    
-    with LIVE_DATA_LOCK:
-        for tick in data_list:
-            if 'symbol' in tick:
-                sym = tick['symbol']
-                # Create or Update
-                if sym not in LIVE_DATA: LIVE_DATA[sym] = {}
-                
-                # Update fields present in tick
-                if 'ltp' in tick: LIVE_DATA[sym]['ltp'] = tick['ltp']
-                if 'vol_traded_today' in tick: LIVE_DATA[sym]['vol'] = tick['vol_traded_today']
-                if 'oi' in tick: LIVE_DATA[sym]['oi'] = tick['oi']
-                if 'ch' in tick: LIVE_DATA[sym]['ch'] = tick['ch']
-                
-                # Fyers sends BuyQty/SellQty differently sometimes
-                if 'totalbuyqty' in tick: LIVE_DATA[sym]['tbq'] = tick['totalbuyqty']
-                if 'totalsellqty' in tick: LIVE_DATA[sym]['tsq'] = tick['totalsellqty']
-                
-                # Also handle the depth packets if enabled
-                if 'bid' in tick and 'ask' in tick:
-                     LIVE_DATA[sym]['bid'] = tick['bid']
-                     LIVE_DATA[sym]['ask'] = tick['ask']
-
-def on_fyers_error(msg):
-    print(f"!!! FYERS SOCKET ERROR: {msg}")
-
-def on_fyers_open():
-    print(">>> FYERS SOCKET CONNECTED")
-    SYSTEM_STATUS['socket'] = True
-
-def on_fyers_close(msg):
-    print(">>> FYERS SOCKET CLOSED")
-    SYSTEM_STATUS['socket'] = False
-
-def start_fyers_socket(token):
-    global FYERS_SOCKET
-    try:
-        # data_type: SymbolUpdate
-        FYERS_SOCKET = data_ws.FyersDataSocket(
-            access_token=token,
-            log_path="logs",
-            litemode=False, # We want OI and Volume
-            write_to_file=False,
-            reconnect=True,
-            on_connect=on_fyers_open,
-            on_close=on_fyers_close,
-            on_error=on_fyers_error,
-            on_message=on_fyers_msg
-        )
-        FYERS_SOCKET.connect()
-    except Exception as e:
-        print(f"!!! SOCKET START ERROR: {e}")
-
-def subscribe_to_fyers(symbols):
-    global FYERS_SOCKET
-    if FYERS_SOCKET and symbols:
-        # Fyers requires max 50-100 symbols per call usually, batching recommended for massive lists
-        # But for UI usage, simple list is fine
-        try:
-            print(f">>> SUBSCRIBING TO {len(symbols)} SYMBOLS")
-            FYERS_SOCKET.subscribe(symbols=symbols, data_type="SymbolUpdate")
-            FYERS_SOCKET.subscribe(symbols=symbols, data_type="DepthUpdate") # Orderflow need
-        except Exception as e:
-            print(f"!!! SUBSCRIPTION ERROR: {e}")
-
-# ==========================================
-# 5. ROUTES
+# 3. ROUTES
 # ==========================================
 
 @app.get("/")
@@ -302,15 +222,6 @@ def home(access_token: Optional[str] = Cookie(None)):
         </div>
         """)
     
-    # Start Socket if not running
-    global CURRENT_TOKEN
-    if not CURRENT_TOKEN:
-        CURRENT_TOKEN = access_token
-        # Start in thread
-        t = threading.Thread(target=start_fyers_socket, args=(access_token,))
-        t.daemon = True
-        t.start()
-
     return HTMLResponse(HTML_TEMPLATE.replace("{{USER_TOKEN}}", access_token))
 
 @app.get("/callback")
@@ -369,53 +280,7 @@ def force_refresh(background_tasks: BackgroundTasks):
     return JSONResponse({"s": "ok"})
 
 # ==========================================
-# 6. WEBSOCKET BRIDGE FOR FRONTEND
-# ==========================================
-
-@app.websocket("/ws")
-async def websocket_endpoint(websocket: WebSocket):
-    await websocket.accept()
-    active_symbols = set()
-    
-    try:
-        while True:
-            # 1. Check for incoming messages (commands from frontend)
-            try:
-                # Use a timeout so we don't block the sending loop
-                data = await asyncio.wait_for(websocket.receive_text(), timeout=0.1)
-                msg = json.loads(data)
-                
-                if msg.get('t') == 'sub':
-                    # Subscribe command
-                    syms = msg.get('s', [])
-                    active_symbols.update(syms)
-                    # Trigger Fyers Subscription
-                    if syms: subscribe_to_fyers(list(active_symbols))
-                    
-            except asyncio.TimeoutError:
-                pass # No message from client, continue to send data
-            except Exception:
-                break # Client disconnected
-            
-            # 2. Send Data Updates to Client
-            if active_symbols:
-                updates = {}
-                with LIVE_DATA_LOCK:
-                    for s in active_symbols:
-                        if s in LIVE_DATA:
-                            updates[s] = LIVE_DATA[s]
-                
-                if updates:
-                    await websocket.send_text(json.dumps({"t": "d", "d": updates}))
-            
-            # Throttle to avoid freezing browser (100ms updates)
-            await asyncio.sleep(0.1)
-            
-    except WebSocketDisconnect:
-        print(">>> CLIENT DISCONNECTED")
-
-# ==========================================
-# 7. FRONTEND
+# 4. FRONTEND
 # ==========================================
 
 HTML_TEMPLATE = """
@@ -423,7 +288,7 @@ HTML_TEMPLATE = """
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>PRO CHAIN V3 (LIVE WS)</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;700;800&display=swap" rel="stylesheet">
     <style>
@@ -705,12 +570,10 @@ HTML_TEMPLATE = """
     let SPOT_PRICE = 0;
     let FUT_SYMS = [];
     let OPT_SYMS = [];
+    let POLLER = null;
+    let IS_POLLING = false;
     let SEARCH_TIMER = null;
     let ATM_STRIKE = 0;
-    
-    // WS State
-    let WS = null;
-    let WS_CACHE = {}; // Store latest values for smoothing
 
     // Default Configurations
     const DEFAULTS = {
@@ -731,7 +594,6 @@ HTML_TEMPLATE = """
         
         applyConfig();
         checkStatus();
-        initWebSocket(); // START THE SOCKET
         
         const inp = document.getElementById('searchInp');
         inp.addEventListener('input', (e) => {
@@ -742,55 +604,6 @@ HTML_TEMPLATE = """
             if(!e.target.closest('.search-box')) document.getElementById('searchRes').style.display = 'none';
         });
     };
-    
-    // ===================================
-    // WEBSOCKET LOGIC (THE HEART)
-    // ===================================
-    function initWebSocket() {
-        const proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
-        WS = new WebSocket(`${proto}//${location.host}/ws`);
-        
-        WS.onopen = () => {
-            document.getElementById('statusDot').classList.add('active');
-            document.getElementById('statusDot').classList.remove('error');
-            // Re-subscribe if we have active symbols
-            if(OPT_SYMS.length > 0) requestSubscription();
-        };
-        
-        WS.onmessage = (evt) => {
-            const msg = JSON.parse(evt.data);
-            if(msg.t === 'd') {
-                updateUI(msg.d); // LIVE UPDATES
-            }
-        };
-        
-        WS.onclose = () => {
-            document.getElementById('statusDot').classList.remove('active');
-            document.getElementById('statusDot').classList.add('error');
-            setTimeout(initWebSocket, 2000); // Auto Reconnect
-        };
-    }
-    
-    function requestSubscription() {
-        if(!WS || WS.readyState !== 1) return;
-        
-        // Calculate symbols needed
-        let symbolsToFetch = [SPOT_SYM, ...FUT_SYMS.map(x => x.s)];
-        
-        // Get Visible Range + Buffer
-        const kList = Array.from(document.querySelectorAll('.row')).map(r => parseFloat(r.dataset.k));
-        
-        if(kList.length > 0) {
-             // Basic Logic: Subscribe to ALL loaded strikes for simplicity in V1
-             // Optimization can be added later (only visible)
-             OPT_SYMS.forEach(o => symbolsToFetch.push(o.s));
-        }
-
-        const uniqueSyms = [...new Set(symbolsToFetch)].filter(s => s && s.length > 2);
-        if(uniqueSyms.length > 0) {
-            WS.send(JSON.stringify({ t: 'sub', s: uniqueSyms }));
-        }
-    }
 
     // ===================================
     // CONFIGURATION LOGIC
@@ -822,13 +635,14 @@ HTML_TEMPLATE = """
 
     function setFormula(val) {
         const input = document.getElementById('confForm');
+        // If editing Left, defaults use Call variables; Right uses Put variables
         let f = val;
         if(EDITING_COL === 'left') {
             f = f.replace(/S/g, 'CS').replace(/B/g, 'CB');
         } else if(EDITING_COL === 'right') {
             f = f.replace(/S/g, 'PS').replace(/B/g, 'PB');
         } else {
-            f = f.replace(/S/g, 'PS').replace(/B/g, 'CB'); 
+            f = f.replace(/S/g, 'PS').replace(/B/g, 'CB'); // Middle default logic usually mix
         }
         input.value = f;
     }
@@ -848,7 +662,7 @@ HTML_TEMPLATE = """
         
         applyConfig();
         closeModal('confModal');
-        // No polling to restart, UI updates automatically on next tick
+        pollData(); // Force refresh
     }
 
     function saveSideConfig() {
@@ -863,6 +677,7 @@ HTML_TEMPLATE = """
         
         applyConfig();
         closeModal('sideConfModal');
+        pollData();
     }
 
     function resetConfig() {
@@ -871,6 +686,7 @@ HTML_TEMPLATE = """
             localStorage.setItem('tst_chain_config', JSON.stringify(CONFIG));
             applyConfig();
             closeModal('confModal');
+            pollData();
         }
     }
 
@@ -880,13 +696,20 @@ HTML_TEMPLATE = """
     // MATH ENGINE
     // ===================================
     function evaluateFormula(formula, vars) {
+        // vars: { CS, CB, PS, PB }
         try {
             let exp = formula;
+            // Replace vars with values. We sort by length desc to avoid replacing 'CS' inside 'CSS' if that existed.
+            // But here we have 2-char vars.
             exp = exp.replace(/CS/g, vars.CS || 0);
             exp = exp.replace(/CB/g, vars.CB || 0);
             exp = exp.replace(/PS/g, vars.PS || 0);
             exp = exp.replace(/PB/g, vars.PB || 0);
+            
+            // Safety check: only allow numbers and math ops
             if(/[^0-9+\-*/(). ]/.test(exp)) return 0;
+            
+            // Evaluate
             return new Function('return ' + exp)();
         } catch(e) {
             return 0;
@@ -948,8 +771,7 @@ HTML_TEMPLATE = """
             CURRENT_ROOT = root;
             CHAIN_DATA = data.items;
             SPOT_SYM = data.spot;
-            SPOT_PRICE = 0; 
-            WS_CACHE = {}; // Clear old data
+            SPOT_PRICE = 0; // Reset price on new load
 
             FUT_SYMS = CHAIN_DATA.filter(x => x.t === 'FUT').sort((a,b) => a.e - b.e).slice(0, 3);
             
@@ -1026,111 +848,148 @@ HTML_TEMPLATE = """
             </div>
         `).join('');
         
-        window.scrolled = false; 
-        requestSubscription(); // Ask for data
+        window.scrolled = false; // Reset scroll state
+        restartPoller();
     }
 
-    // ===================================
-    // UI UPDATER
-    // ===================================
-    function updateUI(newData) {
-        // Merge into cache
-        for(let k in newData) {
-            WS_CACHE[k] = { ...WS_CACHE[k], ...newData[k] };
-        }
+    function restartPoller() {
+        if(POLLER) clearInterval(POLLER);
+        POLLER = setInterval(pollData, 1500);
+        pollData();
+    }
 
-        const data = WS_CACHE; // Use full cache state
+    async function pollData() {
+        if(IS_POLLING || !CURRENT_ROOT) return;
+        IS_POLLING = true;
+        
+        try {
+            let symbolsToFetch = [SPOT_SYM, ...FUT_SYMS.map(x => x.s)];
+            const kList = Array.from(document.querySelectorAll('.row')).map(r => parseFloat(r.dataset.k));
+            
+            if(kList.length > 0) {
+                // LOGIC UPDATE: Select Next Strike just above live price
+                // If price is 0 (first load), fallback to middle temporarily
+                const refPrice = SPOT_PRICE > 0 ? SPOT_PRICE : kList[Math.floor(kList.length/2)];
+                
+                // Find first strike >= refPrice (Next Strike)
+                let selectedK = kList.find(k => k >= refPrice);
+                
+                // Edge Case: If price is higher than all strikes, take the last one
+                if (selectedK === undefined) selectedK = kList[kList.length - 1];
 
-        // 1. Update SPOT
+                ATM_STRIKE = selectedK;
+                const atmIdx = kList.indexOf(selectedK);
+                
+                document.querySelectorAll('.atm').forEach(e => e.classList.remove('atm'));
+                const atmRow = document.getElementById(`row-${selectedK}`);
+                
+                if(atmRow) {
+                    atmRow.classList.add('atm');
+                    // SCROLL UPDATE: Only scroll if we have a valid LIVE price
+                    if(!window.scrolled && SPOT_PRICE > 0) { 
+                        atmRow.scrollIntoView({block:'center', behavior:'auto'}); 
+                        window.scrolled = true; 
+                    }
+                }
+
+                // Range settings for Side Panel
+                const sideRange = CONFIG.side.range;
+                
+                // Visible Range (Fixed)
+                const start = Math.max(0, atmIdx - 20);
+                const end = Math.min(kList.length, atmIdx + 20);
+                const viewKs = kList.slice(start, end);
+
+                // Side Calculation Range
+                const rangeStart = Math.max(0, atmIdx - sideRange);
+                const rangeEnd = Math.min(kList.length, atmIdx + sideRange + 1);
+                const calcKs = kList.slice(rangeStart, rangeEnd);
+                
+                const allNeededKs = new Set([...viewKs, ...calcKs]);
+
+                OPT_SYMS.forEach(o => {
+                    if(allNeededKs.has(o.k)) symbolsToFetch.push(o.s);
+                });
+            }
+
+            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 }});
+            
+            if(res.status === 401) { location.href = '/logout'; return; }
+            
+            const json = await res.json();
+            if(json.s === 'ok') {
+                updateUI(json.d);
+                const dot = document.getElementById('statusDot');
+                dot.classList.add('active');
+                dot.classList.remove('error');
+            }
+        } catch(e) { 
+            console.error(e); 
+            const dot = document.getElementById('statusDot');
+            dot.classList.remove('active');
+            dot.classList.add('error');
+        } 
+        finally { IS_POLLING = false; }
+    }
+
+    function updateUI(data) {
         if(data[SPOT_SYM] && typeof data[SPOT_SYM].ltp === 'number') {
             SPOT_PRICE = data[SPOT_SYM].ltp;
             document.getElementById('spotPrice').innerText = SPOT_PRICE.toFixed(2);
         }
         
-        // 2. Update Futures
+        // Futures
         const futHTML = FUT_SYMS.map(f => {
             const d = data[f.s];
             if(!d || typeof d.ltp !== 'number') return '';
             const dt = new Date(f.e*1000).toLocaleDateString('en-GB', {day:'numeric', month:'short'});
-            
-            // Handle incomplete data gracefully
-            const tbq = d.tbq || d.vol || 1; // Fallback
-            const tsq = d.tsq || d.vol || 1; 
-            const tot = tbq + tsq;
-            const bPct = (tbq/tot)*100;
-            const ch = d.ch || 0;
-
+            const tot = (d.totalbuyqty + d.totalsellqty) || 1;
+            const bPct = (d.totalbuyqty/tot)*100;
             return `
             <div class="fut-card">
                 <div style="display:flex; justify-content:space-between; font-weight:700;">
-                    <span>${dt} FUT</span> <span style="color:${ch>=0?'var(--green)':'var(--red)'}">${d.ltp}</span>
+                    <span>${dt} FUT</span> <span style="color:${d.ch>=0?'var(--green)':'var(--red)'}">${d.ltp}</span>
                 </div>
                 <div class="meter-bg">
                     <div style="width:${bPct}%; background:var(--green)"></div>
                     <div style="width:${100-bPct}%; background:var(--red)"></div>
                 </div>
                 <div style="display:flex; justify-content:space-between; font-size:10px; color:#666; margin-top:4px;">
-                    <span>B: ${fmt(tbq)}</span> <span>S: ${fmt(tsq)}</span>
+                    <span>B: ${fmt(d.totalbuyqty)}</span> <span>S: ${fmt(d.totalsellqty)}</span>
                 </div>
             </div>`;
         }).join('');
         if(futHTML) document.getElementById('futBody').innerHTML = futHTML;
 
-        // 3. Process Options
+        // Process Options
         const rowData = {};
         
+        // Populate raw data first
         for(const item of OPT_SYMS) {
             const d = data[item.s];
             if(!d) continue;
 
             if(!rowData[item.k]) rowData[item.k] = { CS:0, CB:0, PS:0, PB:0 };
             
-            // Fyers logic: We use OI (Open Interest) or Volume based on availability
-            // Often 'totalsellqty' is not sent in basic feed, we use OI for sellers proxy
-            // But user wants OI specifically
-            const oi = d.oi || 0; 
-            const vol = d.vol || 0;
-            
-            // Simplified Logic for Demo: 
-            // In reality, OI is just a single number. We can't split OI into Buyer/Seller perfectly without Orderflow.
-            // PRO TRICK: We use the 'Total Sell Qty' if available (Depth) else we use OI.
-            // Since we enabled Depth in backend, let's try to use Bid/Ask sums if available, or just OI.
-            
-            let sellPressure = d.tsq || (oi / 2); // Approximate if depth missing
-            let buyPressure = d.tbq || (oi / 2);
-
             if(item.t === 'CE') {
-                rowData[item.k].CS = sellPressure;
-                rowData[item.k].CB = buyPressure;
+                rowData[item.k].CS = d.totalsellqty;
+                rowData[item.k].CB = d.totalbuyqty;
             }
             if(item.t === 'PE') {
-                rowData[item.k].PS = sellPressure;
-                rowData[item.k].PB = buyPressure;
+                rowData[item.k].PS = d.totalsellqty;
+                rowData[item.k].PB = d.totalbuyqty;
             }
         }
 
-        // 4. Update Strike Row Classes (ATM)
-        const kList = Array.from(document.querySelectorAll('.row')).map(r => parseFloat(r.dataset.k));
-        if(kList.length > 0 && SPOT_PRICE > 0) {
-             let selectedK = kList.find(k => k >= SPOT_PRICE);
-             if (selectedK === undefined) selectedK = kList[kList.length - 1];
-             
-             ATM_STRIKE = selectedK;
-             document.querySelectorAll('.atm').forEach(e => e.classList.remove('atm'));
-             const atmRow = document.getElementById(`row-${selectedK}`);
-             if(atmRow) {
-                 atmRow.classList.add('atm');
-                 if(!window.scrolled) { 
-                    atmRow.scrollIntoView({block:'center', behavior:'auto'}); 
-                    window.scrolled = true; 
-                 }
-             }
-        }
-
-        // 5. Render Chain Values
+        // --- RENDER CHAIN ---
         let maxMidVal = 0;
         const processedRows = {};
 
+        // Calculate Formula values first
         for(const k in rowData) {
             const vars = rowData[k];
             processedRows[k] = {
@@ -1143,6 +1002,7 @@ HTML_TEMPLATE = """
 
         for(const k in processedRows) {
             const r = processedRows[k];
+            
             const lEl = document.getElementById(`colL-${k}`);
             if(lEl) {
                 lEl.querySelector('.col-val').innerText = fmt(r.left);
@@ -1170,19 +1030,19 @@ HTML_TEMPLATE = """
             }
         }
 
-        // 6. Sidebar Aggregation
+        // --- SIDEBAR AGGREGATION ---
         if(ATM_STRIKE > 0) {
             let totalFlow = 0;
-            const kListSorted = Object.keys(rowData).map(parseFloat).sort((a,b)=>a-b);
-            const atmIdx = kListSorted.indexOf(ATM_STRIKE);
+            const kList = Object.keys(rowData).map(parseFloat).sort((a,b)=>a-b);
+            const atmIdx = kList.indexOf(ATM_STRIKE);
             const sideRange = CONFIG.side.range;
 
             if(atmIdx !== -1) {
                 const start = Math.max(0, atmIdx - sideRange);
-                const end = Math.min(kListSorted.length, atmIdx + sideRange + 1);
+                const end = Math.min(kList.length, atmIdx + sideRange + 1);
                 
                 for(let i=start; i<end; i++) {
-                    const k = kListSorted[i];
+                    const k = kList[i];
                     if(rowData[k]) {
                         totalFlow += evaluateFormula(CONFIG.side.formula, rowData[k]);
                     }
@@ -1194,8 +1054,14 @@ HTML_TEMPLATE = """
             
             nfEl.innerText = (totalFlow > 0 ? "+" : "") + fmt(totalFlow);
             nfEl.style.color = totalFlow >= 0 ? 'var(--green)' : 'var(--red)';
-            nfSig.innerText = totalFlow >= 0 ? "POSITIVE FLOW" : "NEGATIVE FLOW";
-            nfSig.style.color = totalFlow >= 0 ? "var(--green)" : "var(--red)";
+            
+            if(totalFlow > 0) {
+                nfSig.innerText = "POSITIVE FLOW";
+                nfSig.style.color = "var(--green)";
+            } else {
+                nfSig.innerText = "NEGATIVE FLOW";
+                nfSig.style.color = "var(--red)";
+            }
         }
     }