Update app.py

app.py

@@ -28,18 +28,28 @@ app = FastAPI()
 # 2. HELPER FUNCTIONS
 # ==========================================
 def sb_get(endpoint: str, params: dict = None):
-    """Generic Supabase GET helper."""
     try:
         url = f"{SB_URL}/rest/v1{endpoint}"
         r = requests.get(url, headers=HEADERS, params=params)
         r.raise_for_status()
         return r.json()
     except Exception as e:
-        print(f"DB Error ({endpoint}): {e}")
+        print(f"DB Error GET ({endpoint}): {e}")
+        return[]
+
+def sb_rpc(func_name: str, params: dict = {}):
+    """Executes a Supabase Postgres Function (RPC) for Zero Egress"""
+    try:
+        url = f"{SB_URL}/rest/v1/rpc/{func_name}"
+        r = requests.post(url, headers=HEADERS, json=params)
+        r.raise_for_status()
+        return r.json()
+    except Exception as e:
+        print(f"DB Error RPC ({func_name}): {e}")
         return[]
 
 # ==========================================
-# 3. API ROUTES - METADATA
+# 3. API ROUTES - METADATA (NOW USING RPC!)
 # ==========================================
 
 @app.get("/")
@@ -48,93 +58,66 @@ def home():
 
 @app.get("/api/dates")
 def get_dates():
-    """Fetch distinct dates."""
-    data = sb_get("/history_buckets_fyers", {"select": "minute", "order": "minute.desc", "limit": "50000"})
-    dates = set()
-    for row in data:
-        if row.get('minute'):
-            dates.add(row['minute'].split('T')[0])
-    return JSONResponse(sorted(list(dates), reverse=True))
+    """Fetch last 30 distinct dates via RPC."""
+    data = sb_rpc("get_available_dates", {"p_limit": 30})
+    dates = [row['available_date'] for row in data]
+    return JSONResponse(dates)
 
 @app.get("/api/roots")
 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"
-    # Added 50000 limit to ensure we load ALL roots without Supabase 1000 row truncation
-    endpoint = f"/history_buckets_fyers?select=root&minute=gte.{start}&minute=lte.{end}&limit=50000"
+    """Fetch roots via RPC. Zero egress!"""
+    params = {"p_date": date}
     if q:
-        endpoint += f"&root=ilike.*{q.upper()}*"
+        params["p_q"] = q.upper()
     
-    data = sb_get(endpoint)
-    roots = set()
-    for row in data:
-        if row.get('root'):
-            roots.add(row['root'])
-    return JSONResponse(sorted(list(roots)))
+    data = sb_rpc("get_roots_for_date", params)
+    roots = [row['root_name'] for row in data]
+    return JSONResponse(roots)
 
 @app.get("/api/auto_config")
 def get_auto_config(date: str, root: str):
-    """Smart helper for defaults (Current/Next expiry)."""
+    """Smart helper for defaults using RPCs."""
     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=50")
+    exps_data = sb_rpc("get_expiries_for_root", {"p_date": date, "p_root": root})
+    all_expiries = [row['expiry_date'] for row in exps_data if row['expiry_date'] != 'MARKET']
     
-    expiry_map = {} 
-    for row in data:
-        exp = row.get('expiry')
-        if not exp: continue
-        if exp not in expiry_map:
-            keys = list(row.get('data', {}).keys())
-            expiry_map[exp] = keys
-        else:
-            existing = set(expiry_map[exp])
-            new_keys = row.get('data', {}).keys()
-            expiry_map[exp] = list(existing.union(new_keys))
-
-    all_expiries = sorted(expiry_map.keys())
     valid_expiries =[e for e in all_expiries if e >= date]
     if not valid_expiries:
         valid_expiries = all_expiries
 
     response = {"expiries": all_expiries, "current": None, "next": None}
 
-    def find_fut(instruments):
+    def find_fut_rpc(exp):
+        inst_data = sb_rpc("get_instruments_for_expiry", {"p_date": date, "p_root": root, "p_expiry": exp})
+        instruments = [r['instrument_name'] for r in inst_data]
         for i in instruments:
             if 'FUT' in i: return i
         return instruments[0] if instruments else None
 
     if len(valid_expiries) > 0:
         exp_c = valid_expiries[0]
-        inst_c = find_fut(expiry_map[exp_c])
-        response["current"] = {"expiry": exp_c, "instrument": inst_c}
+        response["current"] = {"expiry": exp_c, "instrument": find_fut_rpc(exp_c)}
 
     if len(valid_expiries) > 1:
         exp_n = valid_expiries[1]
-        inst_n = find_fut(expiry_map[exp_n])
-        response["next"] = {"expiry": exp_n, "instrument": inst_n}
+        response["next"] = {"expiry": exp_n, "instrument": find_fut_rpc(exp_n)}
 
     return JSONResponse(response)
 
 @app.get("/api/expiries")
 def get_expiries(date: str, root: str):
-    """Fetch LITERALLY all distinct expiries for a specific root."""
+    """Fetch distinct expiries via RPC."""
     root = root.upper()
-    start, end = f"{date}T00:00:00", f"{date}T23:59:59"
-    # Added limit 50000 to ensure all expiries are caught
-    data = sb_get(f"/history_buckets_fyers?select=expiry&root=eq.{root}&minute=gte.{start}&minute=lte.{end}&limit=50000")
-    exps = set(row['expiry'] for row in data if row.get('expiry'))
-    return JSONResponse(sorted(list(exps)))
+    data = sb_rpc("get_expiries_for_root", {"p_date": date, "p_root": root})
+    exps = [row['expiry_date'] for row in data]
+    return JSONResponse(exps)
 
 @app.get("/api/instruments")
 def get_instruments(date: str, root: str, expiry: str):
-    """Fetch instruments and segregate into spot/future vs options."""
+    """Fetch instruments via RPC."""
     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=50")
-    instruments = set()
-    for row in data:
-        keys = row.get('data', {}).keys()
-        instruments.update(keys)
+    data = sb_rpc("get_instruments_for_expiry", {"p_date": date, "p_root": root, "p_expiry": expiry})
+    instruments = [row['instrument_name'] for row in data]
         
     spot_fut = []
     options =[]
@@ -201,7 +184,7 @@ def fetch_series(
                 for i in range(6):
                     p_base = None
                     if base_key and base_key in data_dict:
-                        p_arr = data_dict[base_key].get('p', [])
+                        p_arr = data_dict[base_key].get('p',[])
                         if i < len(p_arr) and p_arr[i] is not None:
                             p_base = float(p_arr[i])
                     
@@ -255,10 +238,10 @@ def fetch_series(
             else: 
                 inst_data = data_dict.get(instrument)
                 if not inst_data: continue
-                p_arr = inst_data.get('p', []) or[]
+                p_arr = inst_data.get('p', []) or []
                 b_arr = inst_data.get('b', []) or[]
-                s_arr = inst_data.get('s', []) or []
-                v_arr = inst_data.get('v',[]) or []
+                s_arr = inst_data.get('s', []) or[]
+                v_arr = inst_data.get('v', []) or []
                 o_arr = inst_data.get('o', []) or[]
                 
                 for i in range(6):
@@ -644,7 +627,7 @@ document.addEventListener('click', (e) => {
 });
 
 const CustomDD = {
-    data: { cfgRoot: [], cfgExp: [], cfgInst:[] },
+    data: { cfgRoot: [], cfgExp:[], cfgInst:[] },
     recent: { cfgRoot:[] }, // Persistent memory for symbols
     
     init() {
@@ -668,10 +651,9 @@ const CustomDD = {
     async open(id) {
         document.querySelectorAll('.custom-dd').forEach(el => el.style.display = 'none');
         const inp = document.getElementById(id);
-        inp.select(); // Select current text for easy typing over
+        inp.select(); 
         
-        // ✨ FIX: Always show ALL items (empty query string) when opening the dropdown.
-        // It ignores the current value (like "2026-03-24") so you don't have to backspace!
+        // Always show ALL items when opening
         this.render(id, '');
         
         document.getElementById(`dd-${id}`).style.display = 'block';
@@ -680,8 +662,12 @@ const CustomDD = {
     async filter(id) {
         const query = document.getElementById(id).value.toUpperCase();
         
-        // ✨ FIX: We already load all roots/expiries when the modal opens or root changes.
-        // We no longer trigger backend calls on every keystroke. It just filters cleanly on frontend.
+        // Fetch from DB only when typing roots to save 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';
@@ -693,14 +679,14 @@ const CustomDD = {
         let html = '';
         let currentGroup = null;
         
-        // 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
+        const filtered = pool.filter((v, i, a) => a.findIndex(t => t.val === v.val) === i) 
                             .filter(item => item.val.toLowerCase().includes(q));
         
         if (filtered.length === 0) {
@@ -723,7 +709,6 @@ const CustomDD = {
         document.getElementById(`dd-${id}`).style.display = 'none';
         
         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();
@@ -1081,8 +1066,10 @@ const ChartLogic = {
                                     let c = s.color1;
                                     if(s.cond && s.cond !== 'none') {
                                         let thresh = parseFloat(s.thresh) || 0;
-                                        if(s.cond === '>') c = v > thresh ? s.color1 : s.color2;
-                                        if(s.cond === '<') c = v < thresh ? s.color1 : s.color2;
+                                        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;
                                     }
                                     return { borderColor: c, backgroundColor: c };
                                 }
@@ -1114,7 +1101,7 @@ const Config = {
 
         this.updateInfoTooltip(mode);
         this.updatePresetsDropdown();
-        this.loadPreset("Model 1"); // Model 1 is now the default
+        this.loadPreset("Model 1"); // Default to Model 1 always when switching modes
     },
 
     updateInfoTooltip(mode) {
@@ -1177,7 +1164,7 @@ const Config = {
 
         this.updatePresetsDropdown();
 
-        // Load ALL existing roots once into frontend memory
+        // Load roots logic (RPC)
         CustomDD.clear('cfgRoot');
         const res = await fetch(`/api/roots?date=${App.state.date}`);
         const roots = await res.json();
@@ -1241,7 +1228,7 @@ const Config = {
 
         if (!root) return;
 
-        // Fetches ALL available expiries for the root into memory
+        // Fetches ALL available expiries for the root via RPC
         const res = await fetch(`/api/expiries?date=${App.state.date}&root=${root}`);
         const exps = await res.json();
         CustomDD.set('cfgExp', exps);
@@ -1266,7 +1253,7 @@ const Config = {
         
         if (!root || !exp) return;
 
-        // Fetch ALL instruments for the root/expiry
+        // Fetch ALL instruments via RPC
         const res = await fetch(`/api/instruments?date=${App.state.date}&root=${root}&expiry=${exp}`);
         const data = await res.json();