Switch to Finnhub live data

app.py

@@ -1,15 +1,17 @@
 """
-XAUUSD Pro Trading Signals - Fast Live Data Version
+Pro Trading Signals - Finnhub Live Data Version
 """
 
 import streamlit as st
 import pandas as pd
-import yfinance as yf
+import requests
 from datetime import datetime
 import time
 
+FINNHUB_API_KEY = st.secrets.get("FINNHUB_API_KEY", "demo")
+
 st.set_page_config(
-    page_title="XAUUSD Pro Trader",
+    page_title="Pro Trading Signals",
     page_icon="📈",
     layout="centered",
     initial_sidebar_state="collapsed"
@@ -23,44 +25,81 @@ st.markdown("""
     .buy-signal { color: #00E676; }
     .sell-signal { color: #FF5252; }
     .wait-signal { color: #FFD740; }
-    .stSelectbox { color: white; }
-    div[data-baseweb="select"] > div { background: #1F2937 !important; }
 </style>
 """, unsafe_allow_html=True)
 
-st.markdown('<h1 class="main-title">📈 XAUUSD PRO TRADER</h1>', unsafe_allow_html=True)
-st.markdown('<p style="text-align:center;color:#888;">Live Futures & Forex Signals • Ultra Fast</p>', unsafe_allow_html=True)
+st.markdown('<h1 class="main-title">📈 PRO TRADING SIGNALS</h1>', unsafe_allow_html=True)
+st.markdown('<p style="text-align:center;color:#888;">Live Finnhub Data • Futures & Forex</p>', unsafe_allow_html=True)
 
-PAIRS = {
-    "🥇 Gold Futures (GC)": {"sym": "GC=F", "type": "futures", "name": "Gold"},
-    "🥈 Silver Futures (SI)": {"sym": "SI=F", "type": "futures", "name": "Silver"},
-    "🛢️ Crude Oil (WTI)": {"sym": "CL=F", "type": "futures", "name": "Crude Oil"},
-    "⛽ Natural Gas": {"sym": "NG=F", "type": "futures", "name": "Natural Gas"},
-    "🌽 Corn Futures": {"sym": "ZC=F", "type": "futures", "name": "Corn"},
-    "🌾 Wheat Futures": {"sym": "ZW=F", "type": "futures", "name": "Wheat"},
-    "EUR/USD": {"sym": "EURUSD=X", "type": "forex", "name": "EUR/USD"},
-    "GBP/USD": {"sym": "GBPUSD=X", "type": "forex", "name": "GBP/USD"},
-    "USD/JPY": {"sym": "USDJPY=X", "type": "forex", "name": "USD/JPY"},
-    "USD/CHF": {"sym": "USDCHF=X", "type": "forex", "name": "USD/CHF"},
-    "AUD/USD": {"sym": "AUDUSD=X", "type": "forex", "name": "AUD/USD"},
-    "USD/CAD": {"sym": "USDCAD=X", "type": "forex", "name": "USD/CAD"},
-    "BTC/USD": {"sym": "BTC-USD", "type": "crypto", "name": "Bitcoin"},
-    "ETH/USD": {"sym": "ETH-USD", "type": "crypto", "name": "Ethereum"},
+SYMBOL_MAP = {
+    "🥇 Gold (XAU/USD)": {"symbol": "XAUUSD", "type": "forex"},
+    "🥈 Silver (XAG/USD)": {"symbol": "XAGUSD", "type": "forex"},
+    "🛢️ Crude Oil (CL)": {"symbol": "CL", "type": "commodity"},
+    "⛽ Natural Gas (NG)": {"symbol": "NG", "type": "commodity"},
+    "🌽 Corn (ZC)": {"symbol": "ZC", "type": "commodity"},
+    "🌾 Wheat (ZW)": {"symbol": "ZW", "type": "commodity"},
+    "EUR/USD": {"symbol": "EURUSD", "type": "forex"},
+    "GBP/USD": {"symbol": "GBPUSD", "type": "forex"},
+    "USD/JPY": {"symbol": "USDJPY", "type": "forex"},
+    "USD/CHF": {"symbol": "USDCHF", "type": "forex"},
+    "AUD/USD": {"symbol": "AUDUSD", "type": "forex"},
+    "USD/CAD": {"symbol": "USDCAD", "type": "forex"},
+    "BTC/USD": {"symbol": "BTC-USD", "type": "crypto"},
+    "ETH/USD": {"symbol": "ETH-USD", "type": "crypto"},
+    "AAPL": {"symbol": "AAPL", "type": "stock"},
+    "TSLA": {"symbol": "TSLA", "type": "stock"},
+    "NVDA": {"symbol": "NVDA", "type": "stock"},
 }
 
 TIMEFRAMES = {
-    "1 Min": {"interval": "1m", "period": "1d"},
-    "5 Min": {"interval": "5m", "period": "5d"},
-    "15 Min": {"interval": "15m", "period": "5d"},
-    "30 Min": {"interval": "30m", "period": "10d"},
-    "1 Hour": {"interval": "1h", "period": "30d"},
-    "4 Hour": {"interval": "4h", "period": "60d"},
-    "Daily": {"interval": "1d", "period": "180d"},
+    "1 Min": {"resolution": "1", "days": 1},
+    "5 Min": {"resolution": "5", "days": 5},
+    "15 Min": {"resolution": "15", "days": 5},
+    "30 Min": {"resolution": "30", "days": 10},
+    "1 Hour": {"resolution": "60", "days": 30},
+    "4 Hour": {"resolution": "240", "days": 60},
+    "Daily": {"resolution": "D", "days": 180},
 }
 
+
+def get_finnhub_price(symbol: str) -> float:
+    try:
+        url = f"https://finnhub.io/api/v1/quote?symbol={symbol}&token={FINNHUB_API_KEY}"
+        r = requests.get(url, timeout=5)
+        data = r.json()
+        if data.get('c'):
+            return data['c']
+    except:
+        pass
+    return None
+
+
+def get_finnhub_candle(symbol: str, resolution: str, days: int) -> pd.DataFrame:
+    try:
+        to_time = int(datetime.now().timestamp())
+        from_time = to_time - (days * 24 * 60 * 60)
+        
+        url = f"https://finnhub.io/api/v1/stock/candle?symbol={symbol}&resolution={resolution}&from={from_time}&to={to_time}&token={FINNHUB_API_KEY}"
+        r = requests.get(url, timeout=10)
+        data = r.json()
+        
+        if data.get('s') == 'ok':
+            df = pd.DataFrame({
+                'Open': data['o'],
+                'High': data['h'],
+                'Low': data['l'],
+                'Close': data['c'],
+                'Volume': data['v']
+            }, index=pd.to_datetime(data['t'], unit='s'))
+            return df
+    except Exception as e:
+        pass
+    return pd.DataFrame()
+
+
 col1, col2, col3 = st.columns([2, 2, 1])
 with col1:
-    selected_pair = st.selectbox("📊 Asset", list(PAIRS.keys()), label_visibility="collapsed")
+    selected_pair = st.selectbox("📊 Asset", list(SYMBOL_MAP.keys()), label_visibility="collapsed")
 with col2:
     selected_tf = st.selectbox("⏱ Timeframe", list(TIMEFRAMES.keys()), label_visibility="collapsed")
 with col3:
@@ -68,18 +107,19 @@ with col3:
     analyze_btn = st.button("⚡ ANALYZE", use_container_width=True)
 
 if analyze_btn:
-    with st.spinner("📡 Fetching live data..."):
+    with st.spinner("📡 Fetching Finnhub live data..."):
         try:
             start_time = time.time()
-            pair_info = PAIRS[selected_pair]
-            sym = pair_info["sym"]
+            asset = SYMBOL_MAP[selected_pair]
+            symbol = asset["symbol"]
             tf = TIMEFRAMES[selected_tf]
             
-            ticker = yf.Ticker(sym)
-            df = ticker.history(period=tf["period"], interval=tf["interval"])
+            price = get_finnhub_price(symbol)
+            
+            df = get_finnhub_candle(symbol, tf["resolution"], tf["days"])
             
             if df.empty or len(df) < 20:
-                st.error("❌ No data available. Try different timeframe.")
+                st.error("❌ No data. Try different asset or check API key.")
             else:
                 close = df['Close']
                 
@@ -124,7 +164,7 @@ if analyze_btn:
                 df['adx'] = dx.ewm(alpha=1/14, adjust=False).mean()
                 
                 last = df.iloc[-1]
-                price = float(last['Close'])
+                price = float(last['Close']) if not price else price
                 atr = float(last['atr'])
                 
                 score_buy = 0
@@ -242,4 +282,4 @@ if analyze_btn:
             st.error(f"Error: {str(e)}")
 
 st.markdown("---")
-st.markdown('<p style="text-align:center;color:#555;font-size:12px;">XAUUSD Pro Trader • Futures & Forex Signals</p>', unsafe_allow_html=True)
+st.markdown('<p style="text-align:center;color:#555;font-size:12px;">Pro Trading Signals • Powered by Finnhub</p>', unsafe_allow_html=True)

requirements.txt

@@ -1,3 +1,3 @@
 streamlit
 pandas
-yfinance
+requests