Update app.py

app.py

@@ -5,7 +5,7 @@ import json
 import asyncio
 import re
 from datetime import datetime, timedelta
-from fastapi import FastAPI, Body, HTTPException
+from fastapi import FastAPI, Body, HTTPException, Query
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from typing import Optional, List, Dict, Any
@@ -57,10 +57,14 @@ def get_dates():
     return JSONResponse(sorted(list(dates), reverse=True))
 
 @app.get("/api/roots")
-def get_roots(date: str):
-    """Fetch ALL roots available for a specific date."""
+def get_roots(date: str, q: Optional[str] = None):
+    """Fetch roots. If q is provided, search specifically for that string."""
     start, end = f"{date}T00:00:00", f"{date}T23:59:59"
-    data = sb_get(f"/history_buckets_fyers?select=root&minute=gte.{start}&minute=lte.{end}&limit=50000")
+    endpoint = f"/history_buckets_fyers?select=root&minute=gte.{start}&minute=lte.{end}"
+    if q:
+        endpoint += f"&root=ilike.*{q.upper()}*"
+    
+    data = sb_get(endpoint)
     roots = set()
     for row in data:
         if row.get('root'):
@@ -72,7 +76,7 @@ def get_auto_config(date: str, root: str):
     """Smart helper for defaults (Current/Next expiry)."""
     root = root.upper()
     start, end = f"{date}T00:00:00", f"{date}T23:59:59"
-    data = sb_get(f"/history_buckets_fyers?select=expiry,data&root=eq.{root}&expiry=neq.MARKET&minute=gte.{start}&minute=lte.{end}&limit=200")
+    data = sb_get(f"/history_buckets_fyers?select=expiry,data&root=eq.{root}&expiry=neq.MARKET&minute=gte.{start}&minute=lte.{end}&limit=50")
     
     expiry_map = {} 
     for row in data:
@@ -112,10 +116,11 @@ def get_auto_config(date: str, root: str):
 
 @app.get("/api/expiries")
 def get_expiries(date: str, root: str):
-    """Fetch ALL distinct expiries."""
+    """Fetch LITERALLY all distinct expiries for a specific root."""
     root = root.upper()
     start, end = f"{date}T00:00:00", f"{date}T23:59:59"
-    data = sb_get(f"/history_buckets_fyers?select=expiry&root=eq.{root}&minute=gte.{start}&minute=lte.{end}&limit=50000")
+    # Note: Removed small limit to ensure all expiries are caught
+    data = sb_get(f"/history_buckets_fyers?select=expiry&root=eq.{root}&minute=gte.{start}&minute=lte.{end}")
     exps = set(row['expiry'] for row in data if row.get('expiry'))
     return JSONResponse(sorted(list(exps)))
 
@@ -124,7 +129,7 @@ def get_instruments(date: str, root: str, expiry: str):
     """Fetch instruments and segregate into spot/future vs options."""
     root = root.upper()
     start, end = f"{date}T00:00:00", f"{date}T23:59:59"
-    data = sb_get(f"/history_buckets_fyers?select=data&root=eq.{root}&expiry=eq.{expiry}&minute=gte.{start}&minute=lte.{end}&limit=100")
+    data = sb_get(f"/history_buckets_fyers?select=data&root=eq.{root}&expiry=eq.{expiry}&minute=gte.{start}&minute=lte.{end}&limit=50")
     instruments = set()
     for row in data:
         keys = row.get('data', {}).keys()
@@ -156,11 +161,6 @@ def fetch_series(
     mode: str = Body("normal"),
     atm_range: int = Body(5)
 ):
-    """
-    Fetches 10s data. 
-    - Normal mode uses Postgres JSON filtering.
-    - Advanced mode fetches minute 'data' dict to calculate ATM strikes dynamically.
-    """
     root = root.upper()
     t_start = f"{date}T{start_time}:00"
     t_end = f"{date}T{end_time}:59"
@@ -197,7 +197,6 @@ def fetch_series(
                 
                 sorted_strikes = sorted(list(unique_strikes))
 
-                # PER TICK DYNAMIC ATM CALCULATION
                 for i in range(6):
                     p_base = None
                     if base_key and base_key in data_dict:
@@ -224,7 +223,7 @@ def fetch_series(
                             k_data = data_dict[k]
                             bv = k_data.get('b', [0]*6)
                             sv = k_data.get('s', [0]*6)
-                            vv = k_data.get('v',[0]*6)
+                            vv = k_data.get('v', [0]*6)
                             ov = k_data.get('o', [0]*6)
                             
                             b_val = float(bv[i]) if i < len(bv) and bv[i] else 0.0
@@ -259,7 +258,7 @@ def fetch_series(
                 b_arr = inst_data.get('b',[]) or[]
                 s_arr = inst_data.get('s', []) or[]
                 v_arr = inst_data.get('v', []) or[]
-                o_arr = inst_data.get('o',[]) or[]
+                o_arr = inst_data.get('o', []) or[]
                 
                 for i in range(6):
                     if i < len(p_arr) and p_arr[i] is not None:
@@ -287,14 +286,12 @@ def fetch_series(
     }
     panda_tf = tf_map.get(timeframe, "1min")
     
-    # Advanced Aggregation: Last for price/vol/oi, Mean for dynamic orderbook qtys
     agg_dict = {
         "price": "last", "volume": "last", "oi": "last",
         "buy_qty": "mean", "sell_qty": "mean",
         "cb": "mean", "cs": "mean", "pb": "mean", "ps": "mean"
     }
     
-    # Smart gap filling to prevent chart distortion
     resampled = df.resample(panda_tf).agg(agg_dict).ffill().fillna(0)
     
     response_data = {
@@ -647,11 +644,18 @@ document.addEventListener('click', (e) => {
 
 const CustomDD = {
     data: { cfgRoot: [], cfgExp: [], cfgInst:[] },
+    recent: { cfgRoot: [] }, // Persistent memory for symbols
     
+    init() {
+        const saved = localStorage.getItem('dc_recent_symbols');
+        if(saved) this.recent.cfgRoot = JSON.parse(saved);
+    },
+
     clear(id) {
         this.data[id] =[];
         document.getElementById(id).value = '';
     },
+
     set(id, items, groupName = null) {
         if (!groupName) {
             this.data[id] = items.map(i => ({val: i, group: null}));
@@ -659,24 +663,50 @@ const CustomDD = {
             this.data[id].push(...items.map(i => ({val: i, group: groupName})));
         }
     },
-    open(id) {
+
+    async open(id) {
         document.querySelectorAll('.custom-dd').forEach(el => el.style.display = 'none');
         const inp = document.getElementById(id);
         inp.select();
-        this.render(id, ''); // Empty string ignores typed text and shows all options!
+        
+        if(id === 'cfgRoot' && inp.value.length === 0) {
+             // If empty root box, show popular/recent symbols first
+             this.render(id, '');
+        } else {
+             this.render(id, inp.value);
+        }
         document.getElementById(`dd-${id}`).style.display = 'block';
     },
-    filter(id) {
-        this.render(id, document.getElementById(id).value);
+
+    async filter(id) {
+        const query = document.getElementById(id).value.toUpperCase();
+        
+        // Targeted backend search for symbols to minimize egress
+        if(id === 'cfgRoot' && query.length >= 2) {
+            const res = await fetch(`/api/roots?date=${App.state.date}&q=${query}`);
+            const results = await res.json();
+            this.set(id, results);
+        }
+        
+        this.render(id, query);
         document.getElementById(`dd-${id}`).style.display = 'block';
     },
+
     render(id, query) {
         const el = document.getElementById(`dd-${id}`);
         const q = query.toLowerCase();
         let html = '';
         let currentGroup = null;
         
-        const filtered = this.data[id].filter(item => item.val.toLowerCase().includes(q));
+        // Add Recent Symbols to the top of Root list
+        let pool = [...this.data[id]];
+        if(id === 'cfgRoot' && q === '') {
+            const recentItems = this.recent.cfgRoot.map(r => ({val: r, group: 'Recent Search'}));
+            pool = [...recentItems, ...pool];
+        }
+
+        const filtered = pool.filter((v, i, a) => a.findIndex(t => t.val === v.val) === i) // Unique
+                            .filter(item => item.val.toLowerCase().includes(q));
         
         if (filtered.length === 0) {
             el.innerHTML = '<div class="custom-dd-opt" style="color:var(--text-secondary); cursor:default;">No matches found</div>';
@@ -692,27 +722,31 @@ const CustomDD = {
         });
         el.innerHTML = html;
     },
+
     pick(id, val) {
         document.getElementById(id).value = val;
         document.getElementById(`dd-${id}`).style.display = 'none';
-        if(id === 'cfgRoot') Config.onRootChange();
+        
+        if(id === 'cfgRoot') {
+            // Save to recent
+            if(!this.recent.cfgRoot.includes(val)) {
+                this.recent.cfgRoot.unshift(val);
+                if(this.recent.cfgRoot.length > 10) this.recent.cfgRoot.pop();
+                localStorage.setItem('dc_recent_symbols', JSON.stringify(this.recent.cfgRoot));
+            }
+            Config.onRootChange();
+        }
         if(id === 'cfgExp') Config.onExpChange();
     }
 };
-// ----------------------------------------
 
 const App = {
     state: { date: null, mode: 'LIVE', columns: 3, layout: [[],[],[]], charts: {}, refreshRate: 15 },
     presets: {
-        "Standard (Normal Mode)":[
-            { 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' }
-        ],
         "Model 1":[
             { formula: '$P', color1: '#2f81f7', cond: 'none', label: 'Price', axis: 'left' },
-            { formula: '$CB + $PS', color1: '#238636', cond: 'none', label: 'Buy Prs', axis: 'right' },
-            { formula: '$CS + $PB', color1: '#da3633', cond: 'none', label: 'Sell Prs', axis: 'right' }
+            { formula: '$CB + $PS', color1: '#238636', cond: 'none', label: 'Buy', axis: 'right' },
+            { formula: '$CS + $PB', color1: '#da3633', cond: 'none', label: 'Sell', axis: 'right' }
         ],
         "Model 2":[
             { formula: '$P', color1: '#2f81f7', cond: 'none', label: 'Price', axis: 'left' },
@@ -721,6 +755,7 @@ const App = {
     },
 
     async init() {
+        CustomDD.init();
         await this.loadDates();
         const savedPresets = localStorage.getItem('dc_pro_v3_presets');
         if(savedPresets) {
@@ -978,7 +1013,6 @@ const ChartLogic = {
                     borderWidth: 1.5, pointRadius: 0, hitRadius: 10, tension: 0.1, yAxisID: s.axis==='left'?'y':'y1'
                 };
 
-                // Dynamic Segment Coloring using Chart.js Segment
                 if(s.cond && s.cond !== 'none') {
                     let thresh = parseFloat(s.thresh) || 0;
                     let cTrue = s.color1;
@@ -986,16 +1020,15 @@ const ChartLogic = {
                     
                     dataset.segment = {
                         borderColor: ctx => {
-                            let v = ctx.p1.parsed.y; // next point value determines segment color
+                            let v = ctx.p1.parsed.y;
                             if(s.cond === '>') return v > thresh ? cTrue : cFalse;
                             if(s.cond === '<') return v < thresh ? cTrue : cFalse;
                             return cTrue;
                         }
                     };
-                    dataset.borderColor = cTrue; // fallback
+                    dataset.borderColor = cTrue; 
                     dataset.backgroundColor = cTrue;
 
-                    // Dynamically calculate the hover color of each point to match the line segment color exactly
                     const hoverColorCallback = (ctx) => {
                         let v = ctx.raw;
                         if (v === undefined || v === null) return cTrue;
@@ -1053,10 +1086,8 @@ const ChartLogic = {
                                     let c = s.color1;
                                     if(s.cond && s.cond !== 'none') {
                                         let thresh = parseFloat(s.thresh) || 0;
-                                        let cTrue = s.color1;
-                                        let cFalse = s.color2 || s.color1;
-                                        if(s.cond === '>') c = v > thresh ? cTrue : cFalse;
-                                        if(s.cond === '<') c = v < thresh ? cTrue : cFalse;
+                                        if(s.cond === '>') c = v > thresh ? s.color1 : s.color2;
+                                        if(s.cond === '<') c = v < thresh ? s.color1 : s.color2;
                                     }
                                     return { borderColor: c, backgroundColor: c };
                                 }
@@ -1088,7 +1119,7 @@ const Config = {
 
         this.updateInfoTooltip(mode);
         this.updatePresetsDropdown();
-        this.loadPreset(mode === 'advanced' ? "Model 1" : "Standard (Normal Mode)");
+        this.loadPreset("Model 1"); // Model 1 is now the default
     },
 
     updateInfoTooltip(mode) {
@@ -1130,7 +1161,7 @@ const Config = {
 
     deletePreset() {
         const name = document.getElementById('cfgPresetsDropdown').value;
-        if(name.startsWith('Model 1') || name.startsWith('Model 2') || name.startsWith('Standard')) return alert("Cannot delete default models.");
+        if(name.startsWith('Model 1') || name.startsWith('Model 2')) return alert("Cannot delete default models.");
         if(confirm(`Delete model '${name}'?`)) {
             delete App.presets[name];
             localStorage.setItem('dc_pro_v3_presets', JSON.stringify(App.presets));
@@ -1151,6 +1182,7 @@ const Config = {
 
         this.updatePresetsDropdown();
 
+        // Load existing roots once
         CustomDD.clear('cfgRoot');
         const res = await fetch(`/api/roots?date=${App.state.date}`);
         const roots = await res.json();
@@ -1164,7 +1196,6 @@ const Config = {
         this.currentMode = cfg.chartMode || 'normal';
         document.getElementById('cfgAtmRange').value = cfg.atmRange || 5;
         
-        // Setup initial UI states without forcing preset reset if series exist
         const btns = document.querySelectorAll('#cfgModeToggle .seg-btn');
         btns[0].classList.toggle('active', this.currentMode === 'normal');
         btns[1].classList.toggle('active', this.currentMode === 'advanced');
@@ -1173,11 +1204,10 @@ const Config = {
         
         this.updateInfoTooltip(this.currentMode);
 
-        // Override defaults if there is already a saved config
         if (cfg.series && cfg.series.length > 0) {
             this.renderSeries(cfg.series);
         } else {
-            this.loadPreset(this.currentMode === 'advanced' ? "Model 1" : "Standard (Normal Mode)");
+            this.loadPreset("Model 1");
         }
 
         document.getElementById('cfgRoot').value = cfg.root || '';
@@ -1201,7 +1231,7 @@ const Config = {
         document.getElementById('cfgRefresh').value = App.state.refreshRate || 15;
 
         this.updatePresetsDropdown();
-        this.loadPreset("Standard (Normal Mode)");
+        this.loadPreset("Model 1");
     },
 
     close() { document.getElementById('configModal').style.display = 'none'; },
@@ -1216,6 +1246,7 @@ const Config = {
 
         if (!root) return;
 
+        // Fetches ALL available expiries for the root
         const res = await fetch(`/api/expiries?date=${App.state.date}&root=${root}`);
         const exps = await res.json();
         CustomDD.set('cfgExp', exps);