Update app.py

app.py

@@ -108,7 +108,7 @@ def get_expiries(date: str, root: str):
 def get_instruments(date: str, root: str, expiry: str):
     root = root.upper()
     data = sb_rpc("get_instruments_for_expiry", {"p_date": date, "p_root": root, "p_expiry": expiry})
-    instruments = [row['instrument_name'] for row in data]
+    instruments =[row['instrument_name'] for row in data]
         
     spot_fut =[]
     options =[]
@@ -121,7 +121,7 @@ def get_instruments(date: str, root: str, expiry: str):
     return JSONResponse({"spot_fut": sorted(spot_fut), "options": sorted(options)})
 
 # ==========================================
-# 4. API ROUTES - DATA FETCHING (EGRESS OPTIMIZED & FIXED)
+# 4. API ROUTES - DATA FETCHING (EGRESS OPTIMIZED)
 # ==========================================
 
 @app.post("/api/fetch_series")
@@ -135,7 +135,7 @@ async def fetch_series(
     end_time: str = Body(...),
     mode: str = Body("normal"),
     atm_range: int = Body(5),
-    req_vars: List[str] = Body([])  # EGRESS REDUCTION: Only mapped vars returned!
+    req_vars: List[str] = Body([])  # EGRESS REDUCTION: Only requested logic passes through
 ):
     root = root.upper()
     t_start_dt = pd.to_datetime(f"{date} {start_time}:00")
@@ -189,7 +189,7 @@ async def fetch_series(
     if not all_records: return JSONResponse({"error": "No valid data found in range.", "labels":[]})
 
     df = pd.DataFrame(all_records)
-    df.rename(columns={"tick_ts": "ts", "b_qty": "buy_qty", "s_qty": "sell_qty", "vol": "volume"}, inplace=True)
+    df.rename(columns={"tick_ts": "ts"}, inplace=True)
     
     df['ts'] = pd.to_datetime(df['ts'])
     df.drop_duplicates(subset=['ts'], inplace=True)
@@ -199,19 +199,19 @@ async def fetch_series(
     tf_map = {"1min": "1min", "3min": "3min", "5min": "5min", "15min": "15min", "30min": "30min", "1hour": "1h"}
     panda_tf = tf_map.get(timeframe, "1min")
     
-    # FIX: Fyers is completely Cumulative! Taking "last" resolves the chart corruption directly.
-    # Price is standard point-in-time, "last" applies correctly for the timeframe candle close.
-    agg_dict = { col: "last" for col in["price", "volume", "oi", "buy_qty", "sell_qty", "cb", "cs", "pb", "ps"] if col in df.columns }
+    # Strictly take the LAST cumulative Fyers variable output for the candle
+    agg_dict = { col: "last" for col in["price", "vol", "oi", "cb", "cs", "pb", "ps"] if col in df.columns }
     
     resampled = df.resample(panda_tf).agg(agg_dict).ffill().fillna(0)
     
-    # EGRESS OPTIMIZATION: Process Only Required Arrays dynamically parsed from formula!
     response_data = {"labels": resampled.index.strftime('%H:%M').tolist(), "P": resampled['price'].tolist() if 'price' in resampled else[]}
     
+    # Maps what frontend asks for (e.g., 'V') to the database columns (e.g., 'vol')
+    col_map = {"V": "vol", "OI": "oi", "CB": "cb", "CS": "cs", "PB": "pb", "PS": "ps"}
     for req in req_vars:
-        col_map = {"V": "volume", "B": "buy_qty", "S": "sell_qty", "OI": "oi"}
-        col = col_map.get(req.upper(), req.lower())
-        if col in resampled.columns: response_data[req.upper()] = resampled[col].tolist()
+        col = col_map.get(req.upper())
+        if col and col in resampled.columns: 
+            response_data[req.upper()] = resampled[col].tolist()
 
     return JSONResponse(response_data)
 
@@ -524,22 +524,17 @@ const CustomDD = {
 const App = {
     state: { date: null, mode: 'LIVE', columns: 3, layout: [[],[],[]], charts: {}, refreshRate: 15 },
     presets: {
-        "Model 1":[
+        "Default Flow":[
             { formula: 'P', color1: '#2f81f7', cond: 'none', label: 'Price', axis: 'left' },
-            { formula: 'B', color1: '#238636', cond: 'none', label: 'Buy', axis: 'right' },
-            { formula: 'S', color1: '#da3633', cond: 'none', label: 'Sell', axis: 'right' }
-        ],
-        "Advanced Option Model":[
-            { formula: 'P', color1: '#2f81f7', cond: 'none', label: 'Spot Price', axis: 'left' },
-            { formula: 'CB + PS', color1: '#238636', cond: 'none', label: 'Net Buy Flow', axis: 'right' },
-            { formula: 'CS + PB', color1: '#da3633', cond: 'none', label: 'Net Sell Flow', axis: 'right' }
+            { formula: 'CB + PS', color1: '#238636', cond: 'none', label: 'Bullish Flow', axis: 'right' },
+            { formula: 'PB + CS', color1: '#da3633', cond: 'none', label: 'Bearish Flow', axis: 'right' }
         ]
     },
     async init() {
         CustomDD.init(); await this.loadDates();
-        const storedPresets = localStorage.getItem('dc_pro_v4_presets');
+        const storedPresets = localStorage.getItem('dc_pro_v5_presets');
         if(storedPresets) try { this.presets = { ...this.presets, ...JSON.parse(storedPresets) }; } catch(e){}
-        const saved = localStorage.getItem('dc_pro_v4_final');
+        const saved = localStorage.getItem('dc_pro_v5_final');
         if (saved) {
             try { this.state = { ...this.state, ...JSON.parse(saved) }; if(this.state.layout.length !== this.state.columns) this.setLayout(this.state.columns); } 
             catch(e) { this.initDefault(); }
@@ -570,9 +565,9 @@ const App = {
     },
     save() {
         const cleanCharts = {}; for(let id in this.state.charts) cleanCharts[id] = { config: this.state.charts[id].config };
-        localStorage.setItem('dc_pro_v4_final', JSON.stringify({ ...this.state, charts: cleanCharts }));
+        localStorage.setItem('dc_pro_v5_final', JSON.stringify({ ...this.state, charts: cleanCharts }));
     },
-    reset() { if(confirm("Reset Workspace?")) { localStorage.removeItem('dc_pro_v4_final'); location.reload(); } },
+    reset() { if(confirm("Reset Workspace?")) { localStorage.removeItem('dc_pro_v5_final'); location.reload(); } },
     setLayout(n) {
         const all = this.state.layout.flat(); this.state.columns = n; this.state.layout = Array.from({length: n}, () =>[]);
         all.forEach((id, i) => this.state.layout[i % n].push(id));
@@ -640,7 +635,7 @@ const App = {
 
 const ChartLogic = {
     extractVars(formula) {
-        const validVars =['CB','CS','PB','PS','P','V','OI','B','S'];
+        const validVars =['CB','CS','PB','PS','P','V','OI'];
         let requested =[];
         validVars.forEach(v => { if (new RegExp('\\b' + v + '\\b').test(formula)) requested.push(v); });
         return requested;
@@ -802,25 +797,24 @@ const Config = {
         document.getElementById('lblInst').innerText = mode === 'normal' ? 'Instrument' : 'Reference Spot/Fut (For ATM Calc)';
         document.getElementById('advInstHint').style.display = mode === 'advanced' ? 'block' : 'none';
         this.updateInfoTooltip(mode); this.updatePresetsDropdown();
-        this.loadPreset(mode === 'advanced' ? "Advanced Option Model" : "Model 1"); 
+        this.loadPreset("Default Flow"); 
     },
 
     updateInfoTooltip(mode) {
         const icon = document.getElementById('infoIcon'); if (!icon) return;
-        if (mode === 'advanced') { icon.title = "Standard: P, V, OI, B, S \\nAdvanced Options ONLY: CB, CS, PB, PS\\nSupports Natural Formulas: e.g. CB + PS"; icon.style.color = "var(--accent)"; icon.style.borderColor = "var(--accent)"; } 
-        else { icon.title = "Standard: P, V, OI, B, S \\nSpecific Option Selected: CB/CS or PB/PS are automatically mapped from B/S."; icon.style.color = "var(--text-secondary)"; icon.style.borderColor = "var(--border)"; }
+        icon.title = "Standard Variables Available:\\nP, V, OI, CB, CS, PB, PS\\nSupports Natural Formulas: e.g. CB + PS"; 
     },
 
     updatePresetsDropdown() { document.getElementById('cfgPresetsDropdown').innerHTML = Object.keys(App.presets).map(k => `<option value="${k}">${k}</option>`).join(''); },
     loadPreset(presetName = null) { const name = presetName || document.getElementById('cfgPresetsDropdown').value; if(name && App.presets[name]) { document.getElementById('cfgPresetsDropdown').value = name; this.renderSeries(App.presets[name]); } },
     savePreset() {
         const name = prompt("Enter a name for this Quick Configuration:", "Custom Model"); if(!name) return;
-        App.presets[name] = this.extractSeriesFromDOM(); localStorage.setItem('dc_pro_v4_presets', JSON.stringify(App.presets));
+        App.presets[name] = this.extractSeriesFromDOM(); localStorage.setItem('dc_pro_v5_presets', JSON.stringify(App.presets));
         this.updatePresetsDropdown(); document.getElementById('cfgPresetsDropdown').value = name;
     },
     deletePreset() {
-        const name = document.getElementById('cfgPresetsDropdown').value; if(name.startsWith('Model 1') || name.startsWith('Advanced Option')) return alert("Cannot delete default models.");
-        if(confirm(`Delete model '${name}'?`)) { delete App.presets[name]; localStorage.setItem('dc_pro_v4_presets', JSON.stringify(App.presets)); this.updatePresetsDropdown(); this.loadPreset(); }
+        const name = document.getElementById('cfgPresetsDropdown').value; if(name.startsWith('Default Flow')) return alert("Cannot delete default models.");
+        if(confirm(`Delete model '${name}'?`)) { delete App.presets[name]; localStorage.setItem('dc_pro_v5_presets', JSON.stringify(App.presets)); this.updatePresetsDropdown(); this.loadPreset(); }
     },
 
     async open(id) {
@@ -843,7 +837,7 @@ const Config = {
         document.getElementById('advInstHint').style.display = this.currentMode === 'advanced' ? 'block' : 'none';
 
         this.updateInfoTooltip(this.currentMode);
-        if (cfg.series && cfg.series.length > 0) this.renderSeries(cfg.series); else this.loadPreset(this.currentMode === 'advanced' ? "Advanced Option Model" : "Model 1");
+        if (cfg.series && cfg.series.length > 0) this.renderSeries(cfg.series); else this.loadPreset("Default Flow");
 
         document.getElementById('cfgRoot').value = cfg.root || ''; document.getElementById('cfgExp').value = cfg.expiry || ''; document.getElementById('cfgInst').value = cfg.instrument || '';
         if(cfg.root) { await this.onRootChange(cfg.expiry, cfg.instrument); }
@@ -855,7 +849,7 @@ const Config = {
         document.getElementById('cfgLoading').style.display = 'none'; document.getElementById('cfgContent').style.display = 'block';
         document.getElementById('cfgGlobalOnly').style.display = 'block'; document.getElementById('cfgChartOnly').style.display = 'none';
         document.getElementById('cfgRefresh').value = App.state.refreshRate || 15;
-        this.updatePresetsDropdown(); this.loadPreset("Model 1");
+        this.updatePresetsDropdown(); this.loadPreset("Default Flow");
     },
     close() { document.getElementById('configModal').style.display = 'none'; },