Update app.py

app.py

@@ -21,9 +21,7 @@ for module_name, pip_name in REQUIRED_PACKAGES.items():
         print(f"✅ {pip_name} установлен!")
 
 # ============================================
-# 👑 TOMIRIS SPACE 25 v3.0 — INTERMARKET CORRELATION ENGINE (PRO-8/tomiris-correlation)
-# Миграция с v2.2. Все функции сохранены.
-# HUB_URL обновлён, HUB_SECRET во всех запросах.
+# 👑 TOMIRIS SPACE 25 v3.1 — INTERMARKET CORRELATION ENGINE (FIXED)
 # ============================================
 import os, time, json, logging, asyncio
 from typing import Dict, Any, List, Optional, Tuple
@@ -38,6 +36,9 @@ logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(name)s - %(level
 logger = logging.getLogger("Space25_Correlation")
 
 # ================= КОНФИГУРАЦИЯ =================
+SPACE_ID = 25
+SPACE_NAME = "Correlation Engine"
+
 SYMBOLS = ["XAU/USD", "ETH/USD", "SOL/USD"]
 
 CORRELATION_PAIRS = {
@@ -57,17 +58,15 @@ TICKER_MAP = {
     "TIPS": "TIP"
 }
 
-# ================= ОБНОВЛЁННЫЙ HUB URL =================
-HUB_URL = "https://pro-3-tomiris-hub.hf.space"
+# ================= НАСТРОЙКИ =================
+HUB_URL = os.getenv("HUB_URL", "https://pro-3-tomiris-hub.hf.space")
 HUB_SECRET = os.getenv("HUB_SECRET", "TomyrisUltraSecret2026!")
+TWELVE_DATA_KEY = os.getenv("TWELVE_DATA_KEY", "a5da25be2e4f41bab4cd78ed8461e180")
 
-TWELVE_DATA_KEY = os.getenv("TWELVE_DATA_KEY", "e3740c072fda4fe8b8539d40b07e445e")
-
-# ================= СТАРТОВЫЙ СОН =================
-STARTUP_SLEEP = int(os.getenv("STARTUP_SLEEP", 600))  # 10 минут
+STARTUP_SLEEP = int(os.getenv("STARTUP_SLEEP", "600"))
+AUTO_SEND_INTERVAL = int(os.getenv("AUTO_SEND_INTERVAL", "600"))
 
-# Интервал авто-отправки
-AUTO_SEND_INTERVAL = int(os.getenv("AUTO_SEND_INTERVAL", "600"))  # 10 минут
+logger.info(f"🔗 Хаб: {HUB_URL}")
 
 HISTORY_FILE = "correlation_history.json"
 CACHE_TTL = 300
@@ -75,9 +74,11 @@ CACHE_TTL = 300
 # ================= HTTP КЛИЕНТ =================
 http_client = httpx.AsyncClient(timeout=15.0)
 
-# ================= ЗАГОЛОВКИ ДЛЯ ХАБА =================
 def hub_headers():
-    return {"X-Hub-Secret": HUB_SECRET} if HUB_SECRET else {}
+    return {
+        "X-Hub-Secret": HUB_SECRET,
+        "Content-Type": "application/json"
+    }
 
 # ================= ГЛОБАЛЬНЫЙ КЭШ И BREAKER =================
 price_cache = {}
@@ -112,12 +113,14 @@ else:
     DIVERGENCE_HISTORY = deque(maxlen=500)
 
 def save_history():
-    with open(HISTORY_FILE, 'w') as f:
-        json.dump(list(DIVERGENCE_HISTORY), f)
+    try:
+        with open(HISTORY_FILE, 'w') as f:
+            json.dump(list(DIVERGENCE_HISTORY), f)
+    except:
+        pass
 
 # ================= ЗАГРУЗКА ЦЕН =================
 async def fetch_prices_hub(symbol: str, count: int = 100) -> Optional[np.ndarray]:
-    """Загружает цены через Хаб (свечи Binance)"""
     cache_key = f"hub_{symbol}_{count}"
     now = time.time()
     if cache_key in price_cache and (now - cache_timestamps.get(cache_key, 0)) < CACHE_TTL:
@@ -143,7 +146,6 @@ async def fetch_prices_hub(symbol: str, count: int = 100) -> Optional[np.ndarray
     return None
 
 async def fetch_prices_twelvedata(symbol: str, count: int = 100) -> Optional[np.ndarray]:
-    """Fallback: Twelve Data API"""
     if breaker_open("twelvedata"):
         return None
 
@@ -161,7 +163,6 @@ async def fetch_prices_twelvedata(symbol: str, count: int = 100) -> Optional[np.
     return None
 
 async def fetch_prices(symbol: str, count: int = 100) -> Optional[np.ndarray]:
-    """Основной метод: сначала Хаб, потом Twelve Data"""
     prices = await fetch_prices_hub(symbol, count)
     if prices is None:
         prices = await fetch_prices_twelvedata(symbol, count)
@@ -242,7 +243,7 @@ async def analyze_correlations(symbol: str) -> Dict[str, Any]:
     if symbol not in prices:
         return {
             "correlation_score": 50.0,
-            "direction": "WAIT",
+            "signal": "WAIT",
             "confidence": 0.0,
             "correlations": [],
             "divergences": [],
@@ -287,12 +288,16 @@ async def analyze_correlations(symbol: str) -> Dict[str, Any]:
 
     score = max(0, min(100, score))
 
+    # 🔥 BUY/SELL вместо LONG/SHORT
     if score > 60:
-        direction, confidence = "LONG", score / 100
+        signal = "BUY"
+        confidence = score / 100
     elif score < 40:
-        direction, confidence = "SHORT", (100 - score) / 100
+        signal = "SELL"
+        confidence = (100 - score) / 100
     else:
-        direction, confidence = "WAIT", 0.0
+        signal = "WAIT"
+        confidence = 0.0
 
     if divergences:
         DIVERGENCE_HISTORY.append({
@@ -305,7 +310,7 @@ async def analyze_correlations(symbol: str) -> Dict[str, Any]:
 
     return {
         "correlation_score": score,
-        "direction": direction,
+        "signal": signal,
         "confidence": round(confidence, 4),
         "correlations": correlations,
         "divergences": divergences,
@@ -314,44 +319,41 @@ async def analyze_correlations(symbol: str) -> Dict[str, Any]:
         "active_pairs": len(correlations)
     }
 
-# ================= ОТПРАВКА В HUB =================
-async def send_signal_to_hub(symbol: str, direction: str, confidence: float):
-    try:
-        payload = {
-            "space": "space_25_correlation",
-            "space_name": "space_25_correlation",
-            "symbol": symbol,
-            "direction": direction,
-            "confidence": confidence,
-            "features": {},
-            "metadata": {"version": "3.0", "source": "PRO-8/tomiris-correlation"}
-        }
-        r = await http_client.post(
-            f"{HUB_URL}/signals",
-            json=payload,
-            timeout=10,
-            headers=hub_headers()
-        )
-        if r.status_code == 200:
-            logger.info(f"📤 {symbol}: {direction} conf={confidence:.3f} отправлен в Hub")
-        else:
-            r = await http_client.post(
-                f"{HUB_URL}/signal",
-                json={
-                    "space": "space_25_correlation",
-                    "symbol": symbol,
-                    "direction": direction,
-                    "confidence": confidence
-                },
-                timeout=10,
-                headers=hub_headers()
-            )
+# ================= ОТПРАВКА В HUB (ИСПРАВЛЕНО) =================
+async def send_signal_to_hub(symbol: str, signal: str, confidence: float, features: Dict = None):
+    if features is None:
+        features = {}
+    
+    payload = {
+        "space_id": SPACE_ID,
+        "space_name": SPACE_NAME,
+        "symbol": symbol,
+        "signal": signal,           # ✅ BUY/SELL/WAIT
+        "confidence": round(confidence, 4),
+        "features": features,
+        "metadata": {"version": "3.1"},
+        "timestamp": datetime.now().isoformat()
+    }
+    
+    for attempt in range(3):
+        try:
+            headers = hub_headers()
+            r = await http_client.post(f"{HUB_URL}/signals", json=payload, timeout=15, headers=headers)
             if r.status_code == 200:
-                logger.info(f"📤 {symbol}: {direction} conf={confidence:.3f} (через /signal)")
+                logger.info(f"📤 {symbol}: {signal} conf={confidence:.3f}")
+                return
+            elif r.status_code == 429:
+                wait = 3 * (attempt + 1)
+                logger.warning(f"⏳ 429 для {symbol}, жду {wait}с...")
+                await asyncio.sleep(wait)
             else:
-                logger.warning(f"Hub вернул {r.status_code}")
-    except Exception as e:
-        logger.error(f"Ошибка отправки в Hub: {e}")
+                logger.warning(f"Попытка {attempt+1}: HTTP {r.status_code}")
+                await asyncio.sleep(2)
+        except Exception as e:
+            logger.warning(f"Попытка {attempt+1}: {e}")
+            await asyncio.sleep(2)
+    
+    logger.error(f"❌ Не удалось отправить {symbol}")
 
 # ================= ГЛАВНЫЙ СИГНАЛ =================
 async def get_correlation_signal(symbol: str = "XAU/USD") -> Dict[str, Any]:
@@ -359,53 +361,46 @@ async def get_correlation_signal(symbol: str = "XAU/USD") -> Dict[str, Any]:
     analysis = await analyze_correlations(symbol)
     latency = int((time.time() - start) * 1000)
 
-    await send_signal_to_hub(symbol, analysis['direction'], analysis['confidence'])
+    features = {
+        "correlation_score": analysis['correlation_score'],
+        "divergence_count": analysis['divergence_count'],
+        "active_pairs": analysis['active_pairs']
+    }
+    await send_signal_to_hub(symbol, analysis['signal'], analysis['confidence'], features)
 
-    result = {
-        "space": "space_25_correlation",
+    logger.info(f"🔗 Correlation {symbol}: {analysis['signal']} conf={analysis['confidence']:.3f} | {latency}ms")
+    return {
+        "space_id": SPACE_ID,
         "timestamp": int(time.time()),
         "symbol": symbol,
-        "signal": {
-            "direction": analysis['direction'],
-            "confidence": analysis['confidence']
-        },
-        "correlation_analysis": {
-            "score": analysis['correlation_score'],
-            "active_pairs": analysis['active_pairs'],
-            "correlations": analysis['correlations'],
-            "divergences": analysis['divergences'],
-            "divergence_count": analysis['divergence_count'],
-            "signals": analysis['signals']
-        },
-        "latency_ms": latency
+        "signal": analysis['signal'],
+        "confidence": analysis['confidence'],
+        "correlation_analysis": analysis
     }
 
-    logger.info(f"🔗 Correlation {symbol}: {analysis['direction']} conf={analysis['confidence']:.3f}")
-    return result
-
 # ================= АВТО-ОТПРАВКА =================
 async def auto_send_loop():
-    logger.info(f"⏳ Стартовый сон {STARTUP_SLEEP} секунд...")
+    logger.info(f"⏳ Стартовый сон {STARTUP_SLEEP}с...")
     await asyncio.sleep(STARTUP_SLEEP)
-    logger.info(f"🔄 Авто-отправка Correlation Engine запущена (интервал {AUTO_SEND_INTERVAL}с)")
+    logger.info(f"🔄 Correlation Engine запущен (интервал {AUTO_SEND_INTERVAL}с)")
     
     while True:
         try:
             for symbol in SYMBOLS:
                 await get_correlation_signal(symbol)
                 await asyncio.sleep(2)
-            logger.info("✅ Correlation Engine авто-отправка завершена")
+            logger.info("✅ Correlation Engine цикл завершён")
         except Exception as e:
             logger.error(f"Ошибка авто-отправки: {e}")
         await asyncio.sleep(AUTO_SEND_INTERVAL)
 
 # ================= FASTAPI =================
-app = FastAPI(title="Tomiris Space 25 v3.0 — Intermarket Correlation Engine (PRO-8)")
+app = FastAPI(title="Tomiris Space 25 v3.1 — Correlation Engine")
 
 @app.on_event("startup")
 async def startup():
     asyncio.create_task(auto_send_loop())
-    logger.info("🚀 Space 25 v3.0 запущен на PRO-8/tomiris-correlation")
+    logger.info(f"🚀 Space 25 v3.1 ЗАПУЩЕН | Хаб: {HUB_URL}")
 
 @app.on_event("shutdown")
 async def shutdown():
@@ -414,16 +409,18 @@ async def shutdown():
 @app.get("/health")
 async def health():
     return {
+        "space_id": SPACE_ID,
         "status": "operational",
-        "version": "3.0",
-        "space": "PRO-8/tomiris-correlation",
+        "version": "3.1",
         "hub_url": HUB_URL,
-        "auto_send_interval": AUTO_SEND_INTERVAL,
-        "startup_sleep": STARTUP_SLEEP,
         "symbols": SYMBOLS,
         "history_length": len(DIVERGENCE_HISTORY)
     }
 
+@app.head("/health")
+async def health_head():
+    return {}
+
 @app.get("/consilium")
 async def consilium(symbol: str = Query("XAU/USD")):
     if symbol not in SYMBOLS:
@@ -459,20 +456,16 @@ async def all_correlations():
 async def send_now():
     results = {}
     for symbol in SYMBOLS:
-        analysis = await get_correlation_signal(symbol)
-        results[symbol] = analysis.get("signal", {}).get("direction", "WAIT")
+        sig = await get_correlation_signal(symbol)
+        results[symbol] = sig.get("signal", "WAIT")
     return {"status": "sent", "results": results}
 
 @app.get("/")
 async def root():
-    return {
-        "name": "Correlation Engine v3.0",
-        "space": "PRO-8/tomiris-correlation",
-        "hub": HUB_URL
-    }
+    return {"name": "Correlation Engine v3.1", "space_id": SPACE_ID, "hub": HUB_URL}
 
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)
 
-print("🚀 SPACE 25 v3.0 — INTERMARKET CORRELATION ENGINE (PRO-8/tomiris-correlation) ЗАПУЩЕН!")
+print("🚀 SPACE 25 v3.1 — CORRELATION ENGINE ГОТОВ К РАБОТЕ!")