Update app.py

app.py

@@ -1,4 +1,5 @@
 import os
+import time
 import requests
 import numpy as np
 import pandas as pd
@@ -15,49 +16,125 @@ if api_key:
     client = Groq(api_key=api_key)
 
 # ==========================================
-# 📡 2. OKX PUBLIC API VERİ ÇEKME
+# 📡 2. API İSTEK BAŞLIKLARI (Cloudflare engelini aşmak için)
 # ==========================================
+HEADERS = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+                  "(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+    "Accept": "application/json",
+    "Accept-Language": "en-US,en;q=0.9",
+}
+
 OKX_BASE = "https://www.okx.com/api/v5"
+BINANCE_BASE = "https://api.binance.com/api/v3"
 
+# ==========================================
+# 📡 3. VERİ ÇEKME FONKSİYONLARI (Retry + Fallback)
+# ==========================================
 def fetch_okx_ticker(inst_id="BTC-USDT"):
-    """OKX'ten anlık fiyat ve 24s verileri çeker (API Key gerekmez)."""
+    """OKX'ten anlık fiyat çeker. 3 kez dener."""
+    for attempt in range(3):
+        try:
+            r = requests.get(f"{OKX_BASE}/market/ticker",
+                             params={"instId": inst_id},
+                             headers=HEADERS, timeout=15)
+            r.raise_for_status()
+            d = r.json()["data"][0]
+            return {
+                "source": "OKX",
+                "last": float(d["last"]),
+                "open24h": float(d["open24h"]),
+                "high24h": float(d["high24h"]),
+                "low24h": float(d["low24h"]),
+                "vol24h": float(d["vol24h"]),
+                "change_pct": (float(d["last"]) / float(d["open24h"]) - 1) * 100
+            }
+        except Exception as e:
+            print(f"OKX ticker attempt {attempt+1} failed: {e}")
+            if attempt < 2:
+                time.sleep(2)
+    return None
+
+
+def fetch_binance_ticker(symbol="BTCUSDT"):
+    """OKX başarısız olursa Binance'ten fiyat çeker (yedek)."""
     try:
-        r = requests.get(f"{OKX_BASE}/market/ticker", params={"instId": inst_id}, timeout=10)
+        r = requests.get(f"{BINANCE_BASE}/ticker/24hr",
+                         params={"symbol": symbol},
+                         headers=HEADERS, timeout=15)
         r.raise_for_status()
-        d = r.json()["data"][0]
+        d = r.json()
         return {
-            "last": float(d["last"]),
-            "open24h": float(d["open24h"]),
-            "high24h": float(d["high24h"]),
-            "low24h": float(d["low24h"]),
-            "vol24h": float(d["vol24h"]),
-            "change_pct": (float(d["last"]) / float(d["open24h"]) - 1) * 100
+            "source": "Binance",
+            "last": float(d["lastPrice"]),
+            "open24h": float(d["openPrice"]),
+            "high24h": float(d["highPrice"]),
+            "low24h": float(d["lowPrice"]),
+            "vol24h": float(d["volume"]),
+            "change_pct": float(d["priceChangePercent"])
         }
     except Exception as e:
-        print(f"OKX ticker error: {e}")
+        print(f"Binance ticker failed: {e}")
         return None
 
 
 def fetch_okx_candles(inst_id="BTC-USDT", bar="1H", limit=100):
-    """OKX'ten mum verisi çeker ve DataFrame döndürür."""
+    """OKX'ten mum verisi çeker."""
+    for attempt in range(3):
+        try:
+            r = requests.get(f"{OKX_BASE}/market/candles",
+                             params={"instId": inst_id, "bar": bar, "limit": limit},
+                             headers=HEADERS, timeout=15)
+            r.raise_for_status()
+            raw = r.json()["data"]
+            df = pd.DataFrame(raw, columns=["ts", "open", "high", "low", "close", "vol"])
+            for col in ["open", "high", "low", "close", "vol"]:
+                df[col] = df[col].astype(float)
+            df["ts"] = pd.to_datetime(df["ts"].astype(int), unit="ms")
+            df = df.sort_values("ts").reset_index(drop=True)
+            return df
+        except Exception as e:
+            print(f"OKX candles attempt {attempt+1} failed: {e}")
+            if attempt < 2:
+                time.sleep(2)
+    return None
+
+
+def fetch_binance_candles(symbol="BTCUSDT", interval="1h", limit=100):
+    """OKX başarısız olursa Binance'ten mum verisi çeker."""
     try:
-        r = requests.get(f"{OKX_BASE}/market/candles",
-                         params={"instId": inst_id, "bar": bar, "limit": limit},
-                         timeout=10)
+        r = requests.get(f"{BINANCE_BASE}/klines",
+                         params={"symbol": symbol, "interval": interval, "limit": limit},
+                         headers=HEADERS, timeout=15)
         r.raise_for_status()
-        raw = r.json()["data"]
-        # OKX mum formatı: [ts, open, high, low, close, vol, ...]
-        df = pd.DataFrame(raw, columns=["ts", "open", "high", "low", "close", "vol"])
+        raw = r.json()
+        df = pd.DataFrame(raw, columns=[
+            "ts", "open", "high", "low", "close", "vol",
+            "close_time", "quote_vol", "trades", "buy_base", "buy_quote", "ignore"
+        ])
         for col in ["open", "high", "low", "close", "vol"]:
             df[col] = df[col].astype(float)
         df["ts"] = pd.to_datetime(df["ts"].astype(int), unit="ms")
-        df = df.sort_values("ts").reset_index(drop=True)
-        return df
+        return df[["ts", "open", "high", "low", "close", "vol"]]
     except Exception as e:
-        print(f"OKX candles error: {e}")
+        print(f"Binance candles failed: {e}")
         return None
 
 
+def fetch_market_data():
+    """Önce OKX'i dener, başarısız olursa Binance'e geçer."""
+    ticker = fetch_okx_ticker()
+    candles = fetch_okx_candles()
+
+    if ticker is not None and candles is not None:
+        return ticker, candles
+
+    print("OKX failed, switching to Binance fallback...")
+    ticker = fetch_binance_ticker()
+    candles = fetch_binance_candles()
+    return ticker, candles
+
+
 def compute_rsi(series, period=14):
     delta = series.diff()
     gain = delta.clip(lower=0).rolling(period).mean()
@@ -65,85 +142,77 @@ def compute_rsi(series, period=14):
     rs = gain / loss
     return 100 - (100 / (1 + rs))
 
-
 # ==========================================
-# 🤖 3. XGBOOST MODEL EĞİTİMİ (OKX verisiyle)
+# 🤖 4. XGBOOST MODEL EĞİTİMİ
 # ==========================================
-def train_model_from_okx():
-    """OKX'ten çekilen mum verisiyle XGBoost modelini eğitir."""
-    df = fetch_okx_candles(bar="1H", limit=500)
+def train_model():
+    """Çekilen mum verisiyle XGBoost modelini eğitir."""
+    df = fetch_okx_candles(limit=500)
+    if df is None:
+        df = fetch_binance_candles(limit=500)
+
     if df is None or len(df) < 50:
-        return None, None
+        return None
 
     df["ma_5"] = df["close"].rolling(5).mean()
     df["ma_20"] = df["close"].rolling(20).mean()
     df["rsi"] = compute_rsi(df["close"], 14)
     df["macd"] = df["close"].ewm(span=12).mean() - df["close"].ewm(span=26).mean()
     df["target"] = (df["close"].shift(-1) > df["close"]).astype(int)
-
     df = df.dropna().reset_index(drop=True)
-    features = ["ma_5", "ma_20", "rsi", "macd", "vol"]
-    X = df[features]
-    y = df["target"]
 
+    features = ["ma_5", "ma_20", "rsi", "macd", "vol"]
     model = xgb.XGBClassifier(
         n_estimators=50, max_depth=3, learning_rate=0.1,
         objective="binary:logistic", eval_metric="logloss", random_state=42
     )
-    model.fit(X, y)
-    return model, features
+    model.fit(df[features], df["target"])
+    return model
 
 
-# Başlangıçta modeli OKX verisiyle eğit
-xgb_model, feature_cols = train_model_from_okx()
+# Uygulama başlarken modeli eğit
+xgb_model = train_model()
 if xgb_model is None:
-    # Fallback: OKX erişilemezse basit bir dummy model
+    # Fallback: API hiç çalışmazsa dummy model
     xgb_model = xgb.XGBClassifier(n_estimators=10, max_depth=2)
-    dummy_X = np.random.rand(20, 5)
-    dummy_y = np.random.randint(0, 2, 20)
-    xgb_model.fit(dummy_X, dummy_y)
-    feature_cols = ["ma_5", "ma_20", "rsi", "macd", "vol"]
+    xgb_model.fit(np.random.rand(20, 5), np.random.randint(0, 2, 20))
 
 # ==========================================
-# 🧠 4. ANALİZ MOTORU
+# 🧠 5. ANALİZ MOTORU
 # ==========================================
 def predict_and_analyze():
-    # 1) OKX'ten canlı veri çek
-    ticker = fetch_okx_ticker()
-    candles = fetch_okx_candles(limit=30)
+    ticker, candles = fetch_market_data()
 
     if ticker is None or candles is None:
-        return "❌ OKX API'sine erişilemedi. Lütfen daha sonra tekrar deneyin.", {}
+        return "❌ Hem OKX hem de Binance API'sine erişilemedi. Lütfen daha sonra tekrar deneyin.", {}
 
     last_price = ticker["last"]
     change_pct = ticker["change_pct"]
     vol24h = ticker["vol24h"]
+    source = ticker["source"]
 
-    # 2) Teknik göstergeler
     close = candles["close"]
     ma5 = close.rolling(5).mean().iloc[-1]
     ma20 = close.rolling(20).mean().iloc[-1]
     rsi = compute_rsi(close, 14).iloc[-1]
     macd = (close.ewm(span=12).mean() - close.ewm(span=26).mean()).iloc[-1]
 
-    # 3) XGBoost tahmini
+    # XGBoost tahmini
     features = np.array([[ma5, ma20, rsi, macd, vol24h]])
     prob_up = float(xgb_model.predict_proba(features)[0][1])
     prob_down = 1 - prob_up
+    direction = "YUKARI 📈" if prob_up > 0.5 else "AŞAĞI 📉"
+    confidence = max(prob_up, prob_down) * 100
 
     prob_dict = {
         "Yükseliş (Long) Olasılığı": prob_up,
         "Düşüş (Short) Olasılığı": prob_down,
     }
 
-    direction = "YUKARI 📈" if prob_up > 0.5 else "AŞAĞI 📉"
-    confidence = max(prob_up, prob_down) * 100
-
-    # 4) Groq analizi
     prompt = f"""
     Sen uzman bir kripto para analisti ve teknik analiz uzmanısın.
 
-    📡 OKX Canlı Verileri (BTC/USDT):
+    📡 Canlı Veri Kaynağı: {source} (BTC/USDT)
     - Son Fiyat: ${last_price:,.2f}
     - 24s Değişim: %{change_pct:+.2f}
     - 24s Hacim: {vol24h:,.0f} BTC
@@ -181,34 +250,33 @@ def predict_and_analyze():
     else:
         analysis_result = "GROQ_API_KEY bulunamadı! Hugging Face Secrets'a ekleyin."
 
-    # Başlık bilgisi
-    header = f"**OKX Canlı: ${last_price:,.2f}** (%{change_pct:+.2f}) | RSI: {rsi:.1f} | MA5: ${ma5:,.0f} | MA20: ${ma20:,.0f}\n\n---\n\n"
+    header = (
+        f"**Kaynak: {source}** | **Canlı: ${last_price:,.2f}** (%{change_pct:+.2f}) | "
+        f"RSI: {rsi:.1f} | MA5: ${ma5:,.0f} | MA20: ${ma20:,.0f}\n\n---\n\n"
+    )
     return header + analysis_result, prob_dict
 
-
 # ==========================================
-# 🎨 5. GRADIO ARAYÜZÜ
+# 🎨 6. GRADIO ARAYÜZÜ
 # ==========================================
 with gr.Blocks(theme=gr.themes.Soft(primary_hue="orange", secondary_hue="slate")) as demo:
     gr.Markdown(
         """
-        # ₿ BTC/USD XGBoost & Groq AI Tahmin Radarı (OKX Canlı)
-        Fiyat, hacim ve teknik göstergeler **OKX halka açık API**'sinden otomatik çekilir. **XGBoost** yön tahmini yapar, **Groq** analiz raporu üretir.
+        # ₿ BTC/USD XGBoost & Groq AI Tahmin Radarı (Canlı)
+        Veriler **OKX halka açık API**'sinden çekilir; OKX'e erişilemezse otomatik olarak **Binance**'e geçilir. **XGBoost** yön tahmini yapar, **Groq** analiz raporu üretir.
         """
     )
 
     with gr.Row():
         with gr.Column():
-            analyze_btn = gr.Button("🔄 OKX'ten Veri Çek ve Analiz Et", variant="primary", size="lg")
+            analyze_btn = gr.Button("🔄 Canlı Veri Çek ve Analiz Et", variant="primary", size="lg")
             gr.Markdown(
-                """
-                **Not**: OKX API'si her 2 saniyede 20 istek sınırına sahiptir [citation:7]. Butona çok hızlı basmayın.
-                """
+                "**Not**: API rate limit nedeniyle butona çok hızlı basmayın."
             )
 
         with gr.Column():
             prob_output = gr.Label(label="XGBoost Yön Tahmini")
-            analysis_output = gr.Markdown(value="Butona basarak OKX'ten canlı veri çekip analizi başlatın.")
+            analysis_output = gr.Markdown(value="Butona basarak canlı veri çekip analizi başlatın.")
 
     analyze_btn.click(
         fn=predict_and_analyze,