Update app.py

app.py

@@ -939,80 +939,88 @@ HTML_TEMPLATE = """
 
     // --- VALIDATION LOGIC FOR HISTORICAL DATA ---
     function validateSnapshot(data) {
-        // 1. Identify Reference Price (Spot or Future)
+        // 1. Get Reference Price (Spot/Future) from the HISTORICAL packet
         let refPrice = 0;
         
-        // Loop to find Reference
-        for(let sym in data) {
-            // Check for Spot or Index (Priority)
-            if(sym.includes('INDEX') || sym.endsWith('-EQ') || sym.startsWith('BSE:SENSEX')) {
-                if(data[sym].ltp > 0) refPrice = data[sym].ltp;
-            }
-            // Fallback to Future if Spot not found or is 0
-            else if(sym.endsWith('FUT') && refPrice === 0) {
-                if(data[sym].ltp > 0) refPrice = data[sym].ltp;
+        // Try Spot first (using global SPOT_SYM)
+        if (SPOT_SYM && data[SPOT_SYM] && data[SPOT_SYM].ltp > 0) {
+            refPrice = data[SPOT_SYM].ltp;
+        } 
+        
+        // If no spot, try Futures (using global FUT_SYMS)
+        if (refPrice === 0 && FUT_SYMS.length > 0) {
+            for(let f of FUT_SYMS) {
+                if(data[f.s] && data[f.s].ltp > 0) {
+                    refPrice = data[f.s].ltp;
+                    break; 
+                }
             }
         }
 
-        // CRITERIA 1: Missing Reference Price (Corrupted)
+        // CRITERIA 1: Missing Reference Price is a Critical Error
         if(refPrice === 0) return false;
 
-        // 2. Parse and Organize Data by Strike
-        let strikesMap = {}; // { 21000: { CE: obj, PE: obj } }
-        let allStrikes = [];
+        // 2. Identify Target Strikes based on ACTIVE EXPIRY (Selected in UI)
+        if(!ACTIVE_EXP || !CHAIN_DATA) return true; // Cannot validate without Master context
 
-        for(let sym in data) {
-            // Regex to extract Strike + Type (e.g. ...22100CE -> 22100, CE)
-            // Handles potential decimal strikes as well
-            let match = sym.match(/(\d+(?:\.\d+)?)(CE|PE)$/); 
-            if(match && match[1]) {
-                let k = parseFloat(match[1]);
-                let type = match[2]; // 'CE' or 'PE'
-                
-                if(!strikesMap[k]) strikesMap[k] = { CE: null, PE: null };
-                strikesMap[k][type] = data[sym];
-                
-                if(!allStrikes.includes(k)) allStrikes.push(k);
-            }
-        }
+        // Filter Master DB for items belonging to the Selected Expiry only
+        const relevantItems = CHAIN_DATA.filter(x => x.e === ACTIVE_EXP && (x.t === 'CE' || x.t === 'PE'));
+        
+        if(relevantItems.length === 0) return true; 
 
-        if(allStrikes.length === 0) return false; // No options found
+        // Group Master Items by Strike { 21000: { CE: "Sym...", PE: "Sym..." } }
+        let masterMap = {};
+        let allStrikes = [];
 
-        // 3. Find ATM Strike based on Ref Price
+        relevantItems.forEach(item => {
+            if(!masterMap[item.k]) {
+                masterMap[item.k] = { CE: null, PE: null };
+                allStrikes.push(item.k);
+            }
+            masterMap[item.k][item.t] = item.s;
+        });
+        
         allStrikes.sort((a,b) => a - b);
+
+        // 3. Find ATM Strike based on the Historical Reference Price
         let closest = allStrikes.reduce((prev, curr) => 
             Math.abs(curr - refPrice) < Math.abs(prev - refPrice) ? curr : prev
         );
         let atmIdx = allStrikes.indexOf(closest);
 
-        // 4. Validate Range: ATM ± 7 Strikes
-        let start = Math.max(0, atmIdx - 7);
-        let end = Math.min(allStrikes.length - 1, atmIdx + 7);
-        
-        // Iterate through the specific range
-        for(let i = start; i <= end; i++) {
+        // 4. Define Range: ATM ± 7 Strikes
+        let startIdx = Math.max(0, atmIdx - 7);
+        let endIdx = Math.min(allStrikes.length - 1, atmIdx + 7);
+
+        // 5. Strict Validation Loop
+        for(let i = startIdx; i <= endIdx; i++) {
             let k = allStrikes[i];
-            let instruments = strikesMap[k];
+            let requiredSyms = masterMap[k];
 
-            // CRITERIA 2: Missing Instrument (Pair Check)
-            // If either CE or PE is completely missing from the data -> Corrupted
-            if(!instruments.CE || !instruments.PE) {
-                return false; 
+            // --- CHECK A: CALL OPTION ---
+            if(requiredSyms.CE) {
+                let d = data[requiredSyms.CE];
+                
+                // 1. Is the instrument completely MISSING from history packet?
+                if(!d) return false; 
+                
+                // 2. Is data insufficient (Zero Buy Qty AND Zero Sell Qty)?
+                if((d.totalbuyqty || 0) === 0 && (d.totalsellqty || 0) === 0) return false;
             }
 
-            // CRITERIA 3: Data Quality (Zero Qty Check)
-            // Check CE Quality
-            let ceB = instruments.CE.totalbuyqty || 0;
-            let ceS = instruments.CE.totalsellqty || 0;
-            if(ceB === 0 && ceS === 0) return false;
-
-            // Check PE Quality
-            let peB = instruments.PE.totalbuyqty || 0;
-            let peS = instruments.PE.totalsellqty || 0;
-            if(peB === 0 && peS === 0) return false;
+            // --- CHECK B: PUT OPTION ---
+            if(requiredSyms.PE) {
+                let d = data[requiredSyms.PE];
+                
+                // 1. Is the instrument completely MISSING from history packet?
+                if(!d) return false;
+                
+                // 2. Is data insufficient (Zero Buy Qty AND Zero Sell Qty)?
+                if((d.totalbuyqty || 0) === 0 && (d.totalsellqty || 0) === 0) return false;
+            }
         }
 
-        return true; // Data Passed all checks
+        return true; // Passed all checks
     }
 
     function renderSecondBar() {
@@ -1026,7 +1034,7 @@ HTML_TEMPLATE = """
             <div class="sec-pill ${idx===0?'active':''} ${statusClass}" 
                  onclick="selectSnapshot(${idx})" 
                  id="pill-${idx}"
-                 title="${isValid ? 'Data OK' : 'Inefficient Data: Missing Inst/Qty or Ref'}">
+                 title="${isValid ? 'Data OK' : 'MISSING DATA (Ref/Inst) OR ZERO QTY'}">
                  :${item.s}
             </div>
         `}).join('');