Update app.py

app.py

@@ -150,24 +150,37 @@ def fetch_series(
         if not instruments:
             return JSONResponse({"error": f"No data found for expiry {expiry}", "labels":[], "P":[]})
         
-        # 2. Use user-selected instrument as Reference. Fallback to auto-detect only if empty.
+        # 2. Intelligent Default Selection (Spot/Equity > Future > First Available)
         ref_instrument = instrument
         if not ref_instrument:
-            base_keys =[k for k in instruments if k.endswith('-INDEX') or k.endswith('-EQ') or k.endswith('FUT')]
-            ref_instrument = base_keys[0] if base_keys else instruments[0]
+            spot_keys =[k for k in instruments if k.endswith('-INDEX') or k.endswith('-EQ')]
+            fut_keys = [k for k in instruments if 'FUT' in k]
+            if spot_keys:
+                ref_instrument = spot_keys[0]
+            elif fut_keys:
+                ref_instrument = fut_keys[0]
+            else:
+                ref_instrument = instruments[0]
 
         if ref_instrument not in instruments:
             return JSONResponse({"error": f"Ref Instrument '{ref_instrument}' not found in DB for this expiry. Please re-select from dropdown.", "labels": [], "P":[]})
 
-        # 3. Build Strike Map strictly in Python (handles Fyers weird dates correctly)
+        # 3. Build Strike Map correctly handling Fyers date strings (e.g. NIFTY2630224000CE -> 24000)
         strike_map = {}
         for k in instruments:
-            match = re.search(r'(\d+)(CE|PE)$', k)
-            if match:
-                strike_map[k] = float(match.group(1))
+            if k.endswith('CE') or k.endswith('PE'):
+                # Fyers string: 2 digits(YY) + 3 Alphanumeric(M DD/MMM) + Strike + CE/PE
+                match = re.search(r'\d{2}[A-Z0-9]{3}(\d+(\.\d+)?)(?:CE|PE)$', k)
+                if match:
+                    strike_map[k] = float(match.group(1))
+                else:
+                    # Fallback
+                    match2 = re.search(r'(\d+(\.\d+)?)(?:CE|PE)$', k)
+                    if match2:
+                        strike_map[k] = float(match2.group(1))
                 
         if not strike_map:
-             return JSONResponse({"error": "No options available to build ATM map.", "labels": [], "P":[]})
+             return JSONResponse({"error": "No options available to build ATM map.", "labels":[], "P":[]})
 
         # 4. Call Postgres with parsed Strike Map
         params = {