Update app.py

app.py

@@ -21,7 +21,7 @@ for module_name, pip_name in REQUIRED_PACKAGES.items():
         print(f"✅ {pip_name} установлен!")
 
 # ============================================
-# 👑 TOMIRIS SPACE 26 v2.3 — OPTIONS & DERIVATIVES ENGINE (Hub-Connected)
+# 👑 TOMIRIS SPACE 26 v2.4 — OPTIONS & DERIVATIVES ENGINE (АВТО-ОТПРАВКА)
 # ============================================
 import os, time, json, logging, asyncio
 from typing import Dict, Any, List, Optional
@@ -41,6 +41,9 @@ HUB_URL = os.getenv("SPACE17_URL", "https://tomiris-ai-name5-5.hf.space")
 TWELVE_DATA_KEY = os.getenv("TWELVE_DATA_KEY", "58e67e0008e24161ac9b1671b7c2d2d0")
 FRED_KEY = os.getenv("FRED_KEY", "faa11c8e2e4beee08c5b966e8b63a513")
 
+# Интервал авто-отправки
+AUTO_SEND_INTERVAL = int(os.getenv("AUTO_SEND_INTERVAL", "300"))
+
 HISTORY_FILE = "options_history.json"
 CACHE_TTL = {
     "funding": 60, "oi": 60, "lsr": 120, "deribit": 300,
@@ -66,40 +69,31 @@ def breaker_open(name: str) -> bool:
 
 def breaker_record(name: str, success: bool):
     info = CIRCUIT_BREAKER.get(name, {"fails": 0, "last_fail": 0})
-    if success:
-        info["fails"] = 0
-    else:
-        info["fails"] += 1
-        info["last_fail"] = time.time()
+    if success: info["fails"] = 0
+    else: info["fails"] += 1; info["last_fail"] = time.time()
     CIRCUIT_BREAKER[name] = info
 
 if os.path.exists(HISTORY_FILE):
     try:
-        with open(HISTORY_FILE) as f:
-            OPTIONS_HISTORY = deque(json.load(f), maxlen=500)
-    except:
-        OPTIONS_HISTORY = deque(maxlen=500)
-else:
-    OPTIONS_HISTORY = deque(maxlen=500)
+        with open(HISTORY_FILE) as f: OPTIONS_HISTORY = deque(json.load(f), maxlen=500)
+    except: OPTIONS_HISTORY = deque(maxlen=500)
+else: OPTIONS_HISTORY = deque(maxlen=500)
 
 def save_history():
-    with open(HISTORY_FILE, 'w') as f:
-        json.dump(list(OPTIONS_HISTORY), f)
+    with open(HISTORY_FILE, 'w') as f: json.dump(list(OPTIONS_HISTORY), f)
 
-# ================= ЗАГРУЗКА ДАННЫХ (без изменений) =================
+# ================= ЗАГРУЗКА ДАННЫХ =================
 async def fetch_vix() -> Dict[str, Any]:
     if breaker_open("vix"): return {"vix": 20.0, "level": "NORMAL", "signal": "NEUTRAL"}
     try:
         r = await http_client.get(f"https://api.twelvedata.com/quote?symbol=VIX&apikey={TWELVE_DATA_KEY}")
         if r.status_code == 200:
-            data = r.json()
-            vix_val = float(data.get("close", 20))
+            data = r.json(); vix_val = float(data.get("close", 20))
             level = "HIGH" if vix_val > 30 else "ELEVATED" if vix_val > 25 else "NORMAL"
             signal = "BEARISH_RISK" if vix_val > 30 else "NEUTRAL"
             breaker_record("vix", True)
             return {"vix": vix_val, "level": level, "signal": signal}
-    except:
-        breaker_record("vix", False)
+    except: breaker_record("vix", False)
     return {"vix": 20.0, "level": "NORMAL", "signal": "NEUTRAL"}
 
 async def fetch_funding_rate(symbol: str) -> Dict[str, Any]:
@@ -113,8 +107,7 @@ async def fetch_funding_rate(symbol: str) -> Dict[str, Any]:
                     signal = "BEARISH" if fr > 0.001 else "BULLISH" if fr < -0.001 else "NEUTRAL"
                     breaker_record(f"funding_{symbol}", True)
                     return {"funding_rate": fr, "funding_rate_pct": round(fr * 100, 4), "signal": signal}
-    except:
-        breaker_record(f"funding_{symbol}", False)
+    except: breaker_record(f"funding_{symbol}", False)
     return {"funding_rate": 0, "signal": "NEUTRAL"}
 
 async def fetch_open_interest(symbol: str) -> Dict[str, Any]:
@@ -123,15 +116,13 @@ async def fetch_open_interest(symbol: str) -> Dict[str, Any]:
         r = await http_client.get(f"https://fapi.binance.com/fapi/v1/openInterest?symbol={symbol}")
         if r.status_code == 200:
             oi = float(r.json().get("openInterest", 0))
-            prev_key = f"oi_{symbol}_prev"
-            prev_oi = cache_store.get(prev_key, oi)
+            prev_key = f"oi_{symbol}_prev"; prev_oi = cache_store.get(prev_key, oi)
             change = ((oi - prev_oi) / prev_oi * 100) if prev_oi > 0 else 0
             cache_store[prev_key] = oi
             signal = "BULLISH" if change > 3 else "BEARISH" if change < -3 else "NEUTRAL"
             breaker_record(f"oi_{symbol}", True)
             return {"open_interest": oi, "change_pct": round(change, 2), "signal": signal}
-    except:
-        breaker_record(f"oi_{symbol}", False)
+    except: breaker_record(f"oi_{symbol}", False)
     return {"open_interest": 0, "change_pct": 0, "signal": "NEUTRAL"}
 
 async def fetch_long_short_ratio(symbol: str) -> Dict[str, Any]:
@@ -140,15 +131,13 @@ async def fetch_long_short_ratio(symbol: str) -> Dict[str, Any]:
         r = await http_client.get(f"https://fapi.binance.com/fapi/v1/globalLongShortAccountRatio?symbol={symbol}&period=5m")
         if r.status_code == 200:
             lsr = float(r.json().get("longShortRatio", 1))
-            long_pct = lsr / (1 + lsr) * 100
-            short_pct = 100 - long_pct
+            long_pct = lsr / (1 + lsr) * 100; short_pct = 100 - long_pct
             if lsr > 2.0: signal = "BEARISH"
             elif lsr < 0.5: signal = "BULLISH"
             else: signal = "NEUTRAL"
             breaker_record(f"lsr_{symbol}", True)
             return {"long_short_ratio": round(lsr, 4), "long_pct": round(long_pct, 1), "short_pct": round(short_pct, 1), "signal": signal}
-    except:
-        breaker_record(f"lsr_{symbol}", False)
+    except: breaker_record(f"lsr_{symbol}", False)
     return {"long_short_ratio": 1, "signal": "NEUTRAL"}
 
 async def fetch_deribit_options(coin: str = "ETH") -> Dict[str, Any]:
@@ -163,8 +152,7 @@ async def fetch_deribit_options(coin: str = "ETH") -> Dict[str, Any]:
             signal = "BEARISH" if pcr > 1.3 else "BULLISH" if pcr < 0.7 else "NEUTRAL"
             breaker_record("deribit", True)
             return {"put_call_ratio_volume": round(pcr, 4), "signal": signal}
-    except:
-        breaker_record("deribit", False)
+    except: breaker_record("deribit", False)
     return {"put_call_ratio_volume": 1.0, "signal": "NEUTRAL"}
 
 async def fetch_gold_derivatives() -> Dict[str, Any]:
@@ -179,24 +167,19 @@ async def fetch_gold_derivatives() -> Dict[str, Any]:
         signal = "BULLISH" if dxy_change < -2 and tips_current < 0 else "BEARISH" if dxy_change > 2 and tips_current > 0 else "NEUTRAL"
         breaker_record("fred", True)
         return {"dxy": dxy_vals[0] if dxy_vals else 104.5, "dxy_change_pct": round(dxy_change, 2), "tips_yield": tips_current, "signal": signal}
-    except:
-        breaker_record("fred", False)
+    except: breaker_record("fred", False)
     return {"signal": "NEUTRAL"}
 
 async def get_current_price(symbol: str) -> float:
     try:
         r = await http_client.get(f"{HUB_URL}/price/{symbol}")
-        if r.status_code == 200:
-            return float(r.json().get("mid", 0))
-    except:
-        pass
+        if r.status_code == 200: return float(r.json().get("mid", 0))
+    except: pass
     bin_symbol = symbol.replace("/", "")
     try:
         r = await http_client.get(f"https://fapi.binance.com/fapi/v1/ticker/price?symbol={bin_symbol}")
-        if r.status_code == 200:
-            return float(r.json()["price"])
-    except:
-        pass
+        if r.status_code == 200: return float(r.json()["price"])
+    except: pass
     return 0.0
 
 def calculate_max_pain(current_price: float) -> float:
@@ -208,101 +191,71 @@ async def analyze_derivatives(symbol: str) -> Dict[str, Any]:
     bin_sym = "" if native == "XAU" else (native + "USDT")
 
     tasks = []
-    if bin_sym:
-        tasks.extend([fetch_funding_rate(bin_sym), fetch_open_interest(bin_sym), fetch_long_short_ratio(bin_sym)])
-    if native == "ETH":
-        tasks.append(fetch_deribit_options("ETH"))
-    if native == "XAU":
-        tasks.append(fetch_gold_derivatives())
+    if bin_sym: tasks.extend([fetch_funding_rate(bin_sym), fetch_open_interest(bin_sym), fetch_long_short_ratio(bin_sym)])
+    if native == "ETH": tasks.append(fetch_deribit_options("ETH"))
+    if native == "XAU": tasks.append(fetch_gold_derivatives())
     tasks.append(fetch_vix())
 
     results = await asyncio.gather(*tasks)
-    idx = 0
-    metrics = {}
+    idx = 0; metrics = {}
     if bin_sym:
         metrics['funding_rate'] = results[idx]; idx += 1
         metrics['open_interest'] = results[idx]; idx += 1
         metrics['long_short_ratio'] = results[idx]; idx += 1
-    if native == "ETH":
-        metrics['options'] = results[idx]; idx += 1
-    if native == "XAU":
-        metrics['gold_derivatives'] = results[idx]; idx += 1
+    if native == "ETH": metrics['options'] = results[idx]; idx += 1
+    if native == "XAU": metrics['gold_derivatives'] = results[idx]; idx += 1
     vix_data = results[idx]
 
-    signals = []
-    score = 50.0
+    signals = []; score = 50.0
 
     if vix_data["vix"] > 30:
         signals.append({"source": "VIX", "signal": "BEARISH_RISK", "reason": f"VIX={vix_data['vix']:.1f}"})
         score += 15 if native == "XAU" else -10
-    elif vix_data["vix"] > 25:
-        score += 5
+    elif vix_data["vix"] > 25: score += 5
 
     fund = metrics.get('funding_rate', {})
     if fund.get('signal') == 'BEARISH':
-        signals.append({"source": "FUNDING", "signal": "BEARISH", "reason": f"Перегретый лонг ({fund.get('funding_rate_pct')}%)"})
-        score -= 15
+        signals.append({"source": "FUNDING", "signal": "BEARISH", "reason": f"Перегретый лонг ({fund.get('funding_rate_pct')}%)"}); score -= 15
     elif fund.get('signal') == 'BULLISH':
-        signals.append({"source": "FUNDING", "signal": "BULLISH", "reason": f"Перегретый шорт ({fund.get('funding_rate_pct')}%)"})
-        score += 15
+        signals.append({"source": "FUNDING", "signal": "BULLISH", "reason": f"Перегретый шорт ({fund.get('funding_rate_pct')}%)"}); score += 15
 
     oi = metrics.get('open_interest', {})
     if oi.get('signal') == 'BEARISH':
-        signals.append({"source": "OI", "signal": "BEARISH", "reason": f"OI перегрет ({oi.get('change_pct')}%)"})
-        score -= 10
+        signals.append({"source": "OI", "signal": "BEARISH", "reason": f"OI перегрет ({oi.get('change_pct')}%)"}); score -= 10
     elif oi.get('signal') == 'BULLISH':
-        signals.append({"source": "OI", "signal": "BULLISH", "reason": f"OI растёт ({oi.get('change_pct')}%)"})
-        score += 10
+        signals.append({"source": "OI", "signal": "BULLISH", "reason": f"OI растёт ({oi.get('change_pct')}%)"}); score += 10
 
     lsr = metrics.get('long_short_ratio', {})
     if lsr.get('signal') == 'BEARISH':
-        signals.append({"source": "L/S", "signal": "BEARISH", "reason": f"Слишком много лонгов ({lsr.get('long_pct')}%)"})
-        score -= 10
+        signals.append({"source": "L/S", "signal": "BEARISH", "reason": f"Слишком много лонгов ({lsr.get('long_pct')}%)"}); score -= 10
     elif lsr.get('signal') == 'BULLISH':
-        signals.append({"source": "L/S", "signal": "BULLISH", "reason": f"Много шортов ({lsr.get('short_pct')}%)"})
-        score += 10
+        signals.append({"source": "L/S", "signal": "BULLISH", "reason": f"Много шортов ({lsr.get('short_pct')}%)"}); score += 10
 
     options = metrics.get('options', {})
     if options.get('signal') == 'BEARISH':
-        signals.append({"source": "OPTIONS", "signal": "BEARISH", "reason": f"PCR={options.get('put_call_ratio_volume')}"})
-        score -= 8
+        signals.append({"source": "OPTIONS", "signal": "BEARISH", "reason": f"PCR={options.get('put_call_ratio_volume')}"}); score -= 8
     elif options.get('signal') == 'BULLISH':
-        signals.append({"source": "OPTIONS", "signal": "BULLISH", "reason": f"PCR={options.get('put_call_ratio_volume')}"})
-        score += 8
+        signals.append({"source": "OPTIONS", "signal": "BULLISH", "reason": f"PCR={options.get('put_call_ratio_volume')}"}); score += 8
 
     gold = metrics.get('gold_derivatives', {})
     if gold.get('signal') == 'BULLISH':
-        signals.append({"source": "COT/DXY/TIPS", "signal": "BULLISH", "reason": "Макро-факторы за золото"})
-        score += 12
+        signals.append({"source": "COT/DXY/TIPS", "signal": "BULLISH", "reason": "Макро-факторы за золото"}); score += 12
     elif gold.get('signal') == 'BEARISH':
-        signals.append({"source": "COT/DXY/TIPS", "signal": "BEARISH", "reason": "Макро-факторы против золота"})
-        score -= 12
+        signals.append({"source": "COT/DXY/TIPS", "signal": "BEARISH", "reason": "Макро-факторы против золота"}); score -= 12
 
     price = await get_current_price(symbol) if native != "XAU" else 0
     max_pain = calculate_max_pain(price) if price > 0 else 0
     if max_pain > 0 and price < max_pain:
-        signals.append({"source": "MAX_PAIN", "signal": "BULLISH", "reason": f"Цена ниже Max Pain ({max_pain})"})
-        score += 8
+        signals.append({"source": "MAX_PAIN", "signal": "BULLISH", "reason": f"Цена ниже Max Pain ({max_pain})"}); score += 8
     elif max_pain > 0 and price > max_pain:
-        signals.append({"source": "MAX_PAIN", "signal": "BEARISH", "reason": f"Цена выше Max Pain ({max_pain})"})
-        score -= 8
+        signals.append({"source": "MAX_PAIN", "signal": "BEARISH", "reason": f"Цена выше Max Pain ({max_pain})"}); score -= 8
 
     score = max(0, min(100, score))
-    if score > 60:
-        direction, confidence = "LONG", score / 100
-    elif score < 40:
-        direction, confidence = "SHORT", (100 - score) / 100
-    else:
-        direction, confidence = "WAIT", 0.0
-
-    analysis = {
-        "derivative_score": score,
-        "direction": direction,
-        "confidence": round(confidence, 4),
-        "signals": signals,
-        "metrics": {**metrics, "vix": vix_data, "max_pain": max_pain}
-    }
+    if score > 60: direction, confidence = "LONG", score / 100
+    elif score < 40: direction, confidence = "SHORT", (100 - score) / 100
+    else: direction, confidence = "WAIT", 0.0
 
+    analysis = {"derivative_score": score, "direction": direction, "confidence": round(confidence, 4), "signals": signals, "metrics": {**metrics, "vix": vix_data, "max_pain": max_pain}}
     OPTIONS_HISTORY.append({"timestamp": datetime.now(timezone.utc).isoformat(), "symbol": symbol, "direction": direction, "score": score})
     save_history()
     return analysis
@@ -310,50 +263,50 @@ async def analyze_derivatives(symbol: str) -> Dict[str, Any]:
 # ================= ОТПРАВКА В HUB =================
 async def send_signal_to_hub(symbol: str, direction: str, confidence: float):
     try:
-        await http_client.post(f"{HUB_URL}/signal", json={
-            "space": "space_26_options",
-            "symbol": symbol,
-            "direction": direction,
-            "confidence": confidence,
+        resp = await http_client.post(f"{HUB_URL}/signal", json={
+            "space": "space_26_options", "symbol": symbol,
+            "direction": direction, "confidence": confidence,
             "raw": json.dumps({"source": "space_26_options"})
-        })
-        logger.info(f"📤 {symbol}: {direction} conf={confidence:.3f} отправлен в Hub")
-    except Exception as e:
-        logger.error(f"Ошибка отправки в Hub: {e}")
+        }, timeout=10)
+        if resp.status_code == 200: logger.info(f"📤 {symbol}: {direction} conf={confidence:.3f} отправлен в Hub")
+        else: logger.warning(f"Hub вернул {resp.status_code}")
+    except Exception as e: logger.error(f"Ошибка отправки в Hub: {e}")
 
 # ================= ГЛАВНЫЙ СИГНАЛ =================
 async def get_derivative_signal(symbol: str = "ETH/USD") -> Dict[str, Any]:
-    start = time.time()
-    analysis = await analyze_derivatives(symbol)
+    start = time.time(); analysis = await analyze_derivatives(symbol)
     latency = int((time.time() - start) * 1000)
-
-    # Отправка в Hub
     await send_signal_to_hub(symbol, analysis['direction'], analysis['confidence'])
-
-    result = {
-        "space": "space_26_options",
-        "timestamp": int(time.time()),
-        "symbol": symbol,
-        "signal": {"direction": analysis['direction'], "confidence": analysis['confidence']},
-        "derivative_analysis": analysis,
-        "latency_ms": latency
-    }
-
-    logger.info(f"📊 Options {symbol}: {analysis['direction']} conf={analysis['confidence']:.3f} score={analysis['derivative_score']}")
+    result = {"space": "space_26_options", "timestamp": int(time.time()), "symbol": symbol, "signal": {"direction": analysis['direction'], "confidence": analysis['confidence']}, "derivative_analysis": analysis, "latency_ms": latency}
+    logger.info(f"📊 Options {symbol}: {analysis['direction']} conf={analysis['confidence']:.3f}")
     return result
 
+# ================= АВТО-ОТПРАВКА =================
+async def auto_send_loop():
+    logger.info(f"🔄 Авто-отправка Options Engine запущена (интервал {AUTO_SEND_INTERVAL}с)")
+    await asyncio.sleep(30)
+    while True:
+        try:
+            for symbol in SYMBOLS:
+                await get_derivative_signal(symbol); await asyncio.sleep(2)
+            logger.info("✅ Options Engine авто-отправка завершена")
+        except Exception as e: logger.error(f"Ошибка авто-отправки: {e}")
+        await asyncio.sleep(AUTO_SEND_INTERVAL)
+
 # ================= FASTAPI =================
-app = FastAPI(title="Tomiris Space 26 v2.3 — Options & Derivatives Engine (Hub)")
+app = FastAPI(title="Tomiris Space 26 v2.4 — Options & Derivatives Engine (Auto-Hub)")
 
 @app.on_event("startup")
-async def startup(): pass
+async def startup():
+    asyncio.create_task(auto_send_loop())
+    logger.info("🚀 Space 26 v2.4 запущен с авто-отправкой в Hub")
 
 @app.on_event("shutdown")
 async def shutdown(): await http_client.aclose()
 
 @app.get("/health")
 async def health():
-    return {"status": "operational", "version": "2.3", "hub_connected": True, "features": ["VIX", "Funding", "OI", "L/S", "Options PCR", "COT/DXY/TIPS", "Max Pain"]}
+    return {"status": "operational", "version": "2.4", "hub_url": HUB_URL, "auto_send_interval": AUTO_SEND_INTERVAL, "features": ["VIX", "Funding", "OI", "L/S", "Options PCR", "COT/DXY/TIPS", "Max Pain"]}
 
 @app.get("/consilium")
 async def consilium(symbol: str = Query("ETH/USD")):
@@ -362,33 +315,32 @@ async def consilium(symbol: str = Query("ETH/USD")):
 
 @app.get("/funding/{symbol}")
 async def funding(symbol: str): return await fetch_funding_rate(symbol.upper())
-
 @app.get("/oi/{symbol}")
 async def oi(symbol: str): return await fetch_open_interest(symbol.upper())
-
 @app.get("/lsr/{symbol}")
 async def lsr(symbol: str): return await fetch_long_short_ratio(symbol.upper())
-
 @app.get("/options")
 async def options(): return await fetch_deribit_options("ETH")
-
 @app.get("/gold")
 async def gold(): return await fetch_gold_derivatives()
-
 @app.get("/vix")
 async def vix(): return await fetch_vix()
-
 @app.get("/maxpain/{symbol}")
 async def maxpain(symbol: str):
-    price = await get_current_price(symbol)
-    mp = calculate_max_pain(price)
+    price = await get_current_price(symbol); mp = calculate_max_pain(price)
     return {"symbol": symbol, "current_price": price, "max_pain": mp}
-
 @app.get("/history")
 async def history(limit: int = 50): return list(OPTIONS_HISTORY)[-limit:]
+@app.get("/send_now")
+async def send_now():
+    results = {}
+    for symbol in SYMBOLS:
+        analysis = await get_derivative_signal(symbol)
+        results[symbol] = analysis.get("signal", {}).get("direction", "WAIT")
+    return {"status": "sent", "results": results}
 
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)
 
-print("🚀 SPACE 26 v2.3 — OPTIONS & DERIVATIVES ENGINE (Hub-Connected) ЗАПУЩЕН!")
+print("🚀 SPACE 26 v2.4 — OPTIONS & DERIVATIVES ENGINE (АВТ��-ОТПРАВКА) ЗАПУЩЕН!")