Upload 2 files

advanced_indicator.py

@@ -291,7 +291,7 @@ NEUTRAL = "NEUTRAL"
 TF_MINUTES: Dict[str, float] = {
     "30s": 0.5, "1m": 1, "2m": 2, "3m": 3,
     "5m": 5, "10m": 10, "15m": 15, "30m": 30,
-    "1h": 60, "2h": 120,
+    "1h": 60, "60m": 60, "90m": 90, "2h": 120,
 }
 
 # yfinance only supports certain intervals; map unsupported → closest supported
@@ -323,13 +323,14 @@ FOREX_PAIRS: List[str] = [
     "EURCAD=X","EURCHF=X","EURNZD=X","GBPAUD=X","GBPCAD=X",
     "GBPCHF=X","GBPNZD=X","AUDCAD=X","AUDCHF=X","AUDNZD=X",
     "CADCHF=X","NZDCAD=X","NZDCHF=X","SGDJPY=X","USDSGD=X",
+    "XAUUSD=X","XAGUSD=X",    # Gold & Silver (valid YF tickers)
 ]
 
 CRYPTO_PAIRS: List[str] = [
     "BTC-USD","ETH-USD","BNB-USD","XRP-USD","SOL-USD",
     "ADA-USD","DOGE-USD","DOT-USD","LTC-USD","AVAX-USD",
     "LINK-USD","ATOM-USD","TRX-USD","ETC-USD","XLM-USD",
-    "NEAR-USD","ALGO-USD","VET-USD","POL-USD","SUI20947-USD",
+    "NEAR-USD","ALGO-USD","VET-USD","MATIC-USD","SUI20947-USD",
     "OP-USD","ARB11841-USD","HBAR-USD",
     "ETH-BTC","BNB-BTC","SOL-BTC",
 ]
@@ -557,7 +558,10 @@ class DataFetcher:
 
     def _ccxt(self, symbol: str, tf: str, lookback: int) -> Optional[pd.DataFrame]:
         try:
-            ccxt_sym = symbol.replace("-", "/").replace("=X", "")
+            # Convert Yahoo Finance symbol to CCXT format
+            # e.g. BTC-USD → BTC/USD  |  ETH-BTC → ETH/BTC  |  EURUSD=X → EURUSD
+            ccxt_sym_base = symbol.replace("-", "/").replace("=X", "")
+
             ccxt_tf  = {"30s":"1m","3m":"3m","10m":"15m"}.get(tf, tf)
             # NOTE: datetime.utcnow() returns a *naive* datetime — calling
             # .timestamp() on it makes Python assume it's in the LOCAL
@@ -571,7 +575,23 @@ class DataFetcher:
                 )).timestamp() * 1000
             )
             ex    = ccxt.binance({"enableRateLimit": True})
-            ohlcv = ex.fetch_ohlcv(ccxt_sym, ccxt_tf, since=since, limit=lookback)
+
+            # Binance uses USDT pairs (BTC/USDT), not USD (BTC/USD).
+            # Try the original symbol first; if that fails, swap /USD → /USDT.
+            # Cross-pair symbols like ETH/BTC are used directly.
+            candidates = [ccxt_sym_base]
+            if "/USD" in ccxt_sym_base and not ccxt_sym_base.endswith("/USDT"):
+                candidates.append(ccxt_sym_base.replace("/USD", "/USDT"))
+
+            ohlcv = None
+            for ccxt_sym in candidates:
+                try:
+                    ohlcv = ex.fetch_ohlcv(ccxt_sym, ccxt_tf, since=since, limit=lookback)
+                    if ohlcv:
+                        break
+                except Exception:
+                    continue
+
             if not ohlcv:
                 return None
 

app.py

@@ -14,13 +14,14 @@ FOREX_PAIRS = [
     "EURCAD=X","EURCHF=X","EURNZD=X","GBPAUD=X","GBPCAD=X",
     "GBPCHF=X","GBPNZD=X","AUDCAD=X","AUDCHF=X","AUDNZD=X",
     "CADCHF=X","NZDCAD=X","NZDCHF=X","SGDJPY=X","USDSGD=X",
-]  # 30 pairs
+    "XAUUSD=X","XAGUSD=X",    # Gold & Silver
+]  # 32 pairs
 
 CRYPTO_PAIRS = [
     "BTC-USD","ETH-USD","BNB-USD","XRP-USD","SOL-USD",
     "ADA-USD","DOGE-USD","DOT-USD","LTC-USD","AVAX-USD",
     "LINK-USD","ATOM-USD","TRX-USD","ETC-USD","XLM-USD",
-    "NEAR-USD","ALGO-USD","VET-USD","POL-USD","SUI20947-USD",
+    "NEAR-USD","ALGO-USD","VET-USD","MATIC-USD","SUI20947-USD",
     "OP-USD","ARB11841-USD","HBAR-USD",
     "ETH-BTC","BNB-BTC","SOL-BTC",
 ]  # 26 pairs
@@ -99,7 +100,7 @@ with gr.Blocks(title="Advanced Forex & Crypto Indicator") as app:
 # 📊 Advanced Forex & Crypto Trading Indicator v3.0
 **Signals:** 🟢 BUY  |  🔴 SELL  |  ⚪ NEUTRAL  
 **Analysis:** 35+ TA · ML Ensemble (RF + ET + XGB + LGB + MLP) · Wavelet · Fourier · Hurst  
-**Timezone:** IST (UTC+5:30)  |  **Forex:** 30 pairs  |  **Crypto:** 26 pairs
+**Timezone:** IST (UTC+5:30)  |  **Forex/Metals:** 32 pairs  |  **Crypto:** 26 pairs
     """)
 
     with gr.Row():
@@ -110,7 +111,7 @@ with gr.Blocks(title="Advanced Forex & Crypto Indicator") as app:
             allow_custom_value=True,
             filterable=True,
             scale=3,
-            info=f"💱 Forex: {len(FOREX_PAIRS)} pairs  |  🪙 Crypto: {len(CRYPTO_PAIRS)} pairs"
+            info=f"💱 Forex/Metals: {len(FOREX_PAIRS)} pairs  |  🪙 Crypto: {len(CRYPTO_PAIRS)} pairs"
         )
         tf_inp = gr.Dropdown(
             choices=["1m","2m","3m","5m","10m","15m","30m","1h","2h"],
@@ -150,14 +151,16 @@ with gr.Blocks(title="Advanced Forex & Crypto Indicator") as app:
     gr.Examples(
         label="⚡ Quick Examples (click to load)",
         examples=[
-            ["EURUSD=X", "15m", "None",   5, 300],
-            ["BTC-USD",  "5m",  "None",   5, 300],
-            ["GBPJPY=X", "1h",  "None",   5, 300],
-            ["USDJPY=X", "30m", "None",   5, 300],
-            ["ETH-USD",  "15m", "None",   5, 300],
-            ["XAUUSD=X", "1h",  "None",   5, 300],
-            ["",         "15m", "forex",  5, 300],
-            ["",         "15m", "crypto", 5, 300],
+            ["EURUSD=X",  "15m", "None",   5, 300],
+            ["BTC-USD",   "5m",  "None",   5, 300],
+            ["GBPJPY=X",  "1h",  "None",   5, 300],
+            ["USDJPY=X",  "30m", "None",   5, 300],
+            ["ETH-USD",   "15m", "None",   5, 300],
+            ["XAUUSD=X",  "1h",  "None",   5, 300],
+            ["MATIC-USD", "15m", "None",   5, 300],
+            ["SOL-USD",   "5m",  "None",   5, 300],
+            ["",          "15m", "forex",  5, 300],
+            ["",          "15m", "crypto", 5, 300],
         ],
         inputs=[symbol_inp, tf_inp, scan_inp, topn_inp, lookback_inp],
     )