Upload data_fetcher.py

src/data_fetcher.py

@@ -4,6 +4,7 @@ import yfinance as yf
 import pandas as pd
 import finnhub
 import streamlit as st
+import requests
 from dotenv import load_dotenv
 from datetime import datetime, timedelta
 
@@ -11,31 +12,108 @@ from datetime import datetime, timedelta
 load_dotenv()
 
 class DataFetcher:
-    def __init__(self, ticker="^GSPC", vix_ticker="^VIX"):
+    def __init__(self, ticker="^GSPC", vix_ticker="%5EVIX"):
         self.ticker = ticker
         self.vix_ticker = vix_ticker
         
-        # Initialize Finnhub Client
-        api_key = os.getenv("FINNHUB_API_KEY")
-        if not api_key:
-            raise ValueError("❌ FINNHUB_API_KEY not found in .env file!")
+        # Load API Keys
+        self.finnhub_key = os.getenv("FINNHUB_API_KEY")
+        self.fmp_key = os.getenv("FMP_API_KEY")
         
-        self.finnhub_client = finnhub.Client(api_key=api_key)
+        if not self.finnhub_key or not self.fmp_key:
+            print("⚠️ Warning: API Keys missing! Check your .env file or HF Secrets.")
+        
+        # Initialize Finnhub Client for News
+        self.finnhub_client = finnhub.Client(api_key=self.finnhub_key)
 
-    def fetch_market_data(self, days=50):
-        """
-        Exclusively loads market data from backup to ensure 100% uptime for demo.
-        """
-        print(f"📁 System: API bypassed. Loading localized market data...")
+    def fetch_market_data(self, days=60):
+        """Fetches live SPY data from the NEW FMP Stable API and merges VIX."""
+        if not self.fmp_key:
+            return self._load_backup(days)
+
+        try:
+            print(f"📡 Fetching live data for {self.ticker} from FMP Stable API...")
+            
+            spy_url = f"https://financialmodelingprep.com/stable/historical-price-eod/full?symbol={self.ticker}&apikey={self.fmp_key}"
+            spy_res = requests.get(spy_url, timeout=10).json()
+            
+            if isinstance(spy_res, dict) and "Error Message" in spy_res:
+                print(f"🚨 FMP Error: {spy_res['Error Message']}")
+                return self._load_backup(days)
+            
+            if not isinstance(spy_res, list) or len(spy_res) == 0:
+                 return self._load_backup(days)
+                 
+            # Format main DataFrame
+            df = pd.DataFrame(spy_res)
+            
+            # 🛡️ THE FIX: Convert to datetime, strip timezones, and set to midnight
+            df['date'] = pd.to_datetime(df['date'])
+            if df['date'].dt.tz is not None:
+                df['date'] = df['date'].dt.tz_localize(None)
+            df['date'] = df['date'].dt.normalize()
+            
+            df.set_index('date', inplace=True)
+            df = df.sort_index()[['open', 'high', 'low', 'close', 'volume']]
+            df.columns = [c.capitalize() for c in df.columns]
+
+            # Add VIX 
+            df['VIX'] = self._get_vix_data()
+            df['VIX'] = df['VIX'].ffill().bfill()
+
+            print("✅ Live market data fetched and merged successfully!")
+            return df.tail(days)
+
+        except Exception as e:
+            print(f"🚨 Major Fetch Error: {e}")
+            return self._load_backup(days)
+
+    def _get_vix_data(self):
+        """Attempts to fetch VIX from Stable API, falls back to CSV if blocked."""
+        print("📡 Attempting to fetch VIX from FMP Stable API...")
+        try:
+            vix_url = f"https://financialmodelingprep.com/stable/historical-price-eod/full?symbol={self.vix_ticker}&apikey={self.fmp_key}"
+            vix_res = requests.get(vix_url, timeout=5).json()
+            
+            if isinstance(vix_res, list) and len(vix_res) > 0:
+                vix_df = pd.DataFrame(vix_res)
+                
+                # 🛡️ THE FIX: Strip timezones for VIX so it perfectly matches SPY
+                vix_df['date'] = pd.to_datetime(vix_df['date'])
+                if vix_df['date'].dt.tz is not None:
+                    vix_df['date'] = vix_df['date'].dt.tz_localize(None)
+                vix_df['date'] = vix_df['date'].dt.normalize()
+                
+                vix_df.set_index('date', inplace=True)
+                vix_df = vix_df.sort_index()
+                print("✅ VIX fetched successfully from FMP!")
+                return vix_df['close']
+        except Exception as e:
+            print(f"⚠️ VIX API request failed: {e}")
+            
+        print("⚠️ Pulling VIX from local backup...")
         backup_path = "data/market_data_backup.csv"
+        
+        if os.path.exists(backup_path):
+            backup_df = pd.read_csv(backup_path, index_col=0, parse_dates=True)
+            # Strip timezones from the backup CSV index as well!
+            if backup_df.index.tz is not None:
+                backup_df.index = backup_df.index.tz_localize(None)
+            backup_df.index = backup_df.index.normalize()
             
+            if 'VIX' in backup_df.columns:
+                return backup_df['VIX']
+        
+        return 18.0
+
+    def _load_backup(self, days):
+        """Failsafe method to load local CSV if API entirely blocks the request."""
+        print(f"📁 System: Loading localized market data backup...")
+        backup_path = "data/market_data_backup.csv"
         if not os.path.exists(backup_path):
-            print(f"🚨 FATAL: {backup_path} not found!")
+            print("🚨 Market backup CSV not found!")
             return pd.DataFrame() 
-                
         df = pd.read_csv(backup_path, index_col=0, parse_dates=True)
-        
-
         return df.tail(days)