Update app.py

app.py

@@ -22,7 +22,7 @@ for module_name, pip_name in REQUIRED_PACKAGES.items():
         print(f"✅ {pip_name} установлен!")
 
 # ============================================
-# 👑 TOMIRIS SPACE 20 v1.3 — ETHEREUM L2 & DEFI PULSE
+# 👑 TOMIRIS SPACE 20 v1.4 — ETHEREUM L2 & DEFI PULSE (TVL FIX)
 # ============================================
 from fastapi import FastAPI, Query
 from typing import Optional, Dict, Any, List
@@ -93,7 +93,7 @@ def send_signal_to_hub(symbol: str, signal: str, confidence: float, features: Di
         "signal": signal,
         "confidence": round(confidence, 4),
         "features": features,
-        "metadata": {"version": "1.3"},
+        "metadata": {"version": "1.4"},
         "timestamp": datetime.now().isoformat()
     }
     
@@ -128,19 +128,25 @@ def fetch_chain_tvl(chain: str) -> Optional[Dict[str, Any]]:
         r = requests.get(f"https://api.llama.fi/tvl/{chain}", timeout=10)
         if r.status_code == 200:
             text = r.text.strip()
-            if not text:
+            if not text or text == "0" or text == "0.0":
+                logger.warning(f"TVL {chain}: пустой ответ или 0")
                 return None
             try:
                 data = r.json()
             except:
+                logger.warning(f"TVL {chain}: не JSON")
                 return None
             
             if isinstance(data, (int, float)):
                 tvl = float(data)
+                if tvl == 0:
+                    return None
                 change_24h = 0
                 change_7d = 0
             elif isinstance(data, dict):
                 tvl = data.get('tvl', 0)
+                if tvl == 0:
+                    return None
                 change_24h = data.get('change_1d', 0)
                 change_7d = data.get('change_7d', 0)
             else:
@@ -156,6 +162,7 @@ def fetch_chain_tvl(chain: str) -> Optional[Dict[str, Any]]:
             }
             CACHE[cache_key] = result
             CACHE_TIMES[cache_key] = time.time()
+            logger.debug(f"✅ TVL {chain}: ${result['tvl_billions']}B")
             return result
     except Exception as e:
         logger.warning(f"⚠️ TVL {chain}: {e}")
@@ -169,13 +176,23 @@ def fetch_all_l2_tvl() -> Dict[str, Any]:
 
     for chain, name in L2_CHAINS.items():
         data = fetch_chain_tvl(chain)
-        if data:
+        if data and data.get('tvl', 0) > 0:
             l2_data[chain] = data
             total_tvl += data['tvl']
-            total_change += data['change_24h']
+            total_change += data.get('change_24h', 0)
             active_chains += 1
         else:
-            l2_data[chain] = {"error": "no_data"}
+            l2_data[chain] = {"error": "no_data", "tvl": 0}
+
+    # 🔥 ФИКС: Если все L2 TVL = 0, используем Ethereum TVL как прокси (20%)
+    if total_tvl == 0:
+        logger.info("🔄 Все L2 TVL = 0, использую Ethereum как прокси...")
+        eth_data = fetch_chain_tvl("ethereum")
+        if eth_data and eth_data.get('tvl', 0) > 0:
+            total_tvl = eth_data['tvl'] * 0.20  # ~20% TVL ETH на L2
+            total_change = eth_data.get('change_24h', 0)
+            active_chains = 1
+            logger.info(f"🔄 Прокси L2 TVL: ${round(total_tvl/1e9, 2)}B (20% от ETH TVL)")
 
     avg_change = total_change / active_chains if active_chains > 0 else 0
 
@@ -215,7 +232,7 @@ def fetch_staking_metrics() -> Dict[str, Any]:
         r = requests.get("https://api.llama.fi/tvl/lido", timeout=10)
         if r.status_code == 200:
             text = r.text.strip()
-            if text:
+            if text and text != "0":
                 try:
                     data = r.json()
                     if isinstance(data, (int, float)):
@@ -234,7 +251,7 @@ def fetch_staking_metrics() -> Dict[str, Any]:
         r = requests.get("https://api.llama.fi/tvl/eigenlayer", timeout=10)
         if r.status_code == 200:
             text = r.text.strip()
-            if text:
+            if text and text != "0":
                 try:
                     data = r.json()
                     if isinstance(data, (int, float)):
@@ -248,7 +265,11 @@ def fetch_staking_metrics() -> Dict[str, Any]:
     except:
         result['eigenlayer_tvl'] = 0
 
-    result['lido_tvl_billions'] = round(result.get('lido_tvl', 0) / 1e9, 2)
+    result['lido_tvl'] = result.get('lido_tvl', 0)
+    result['eigenlayer_tvl'] = result.get('eigenlayer_tvl', 0)
+    result['lido_tvl_billions'] = round(result['lido_tvl'] / 1e9, 2)
+    result['lido_change_24h'] = result.get('lido_change_24h', 0)
+    result['eigenlayer_change_24h'] = result.get('eigenlayer_change_24h', 0)
     
     eigen_change = result.get('eigenlayer_change_24h', 0) or 0
     if eigen_change > 5:
@@ -281,7 +302,7 @@ def fetch_dex_volumes() -> Dict[str, Any]:
             change24h = data.get('change_1d', 0)
             result = {
                 'total_volume_24h': total24h,
-                'volume_billions': round(total24h / 1e9, 2),
+                'volume_billions': round(total24h / 1e9, 2) if total24h else 0,
                 'change_24h': change24h,
                 'trend': 'UP' if change24h > 0 else 'DOWN',
                 'signal': 'BULLISH' if change24h > 10 else 'BEARISH' if change24h < -10 else 'NEUTRAL'
@@ -343,6 +364,7 @@ def analyze_ecosystem() -> Dict[str, Any]:
     signals = []
     score = 50.0
 
+    # L2 TVL
     if l2.get('trend') == 'GROWING':
         signals.append({"signal": "BULLISH", "reason": f"L2 растёт (+{l2.get('avg_change_24h', 0):.1f}%)"})
         score += 15
@@ -350,17 +372,21 @@ def analyze_ecosystem() -> Dict[str, Any]:
         signals.append({"signal": "BEARISH", "reason": "L2 падает"})
         score -= 15
 
-    if eth_tvl.get('trend') == 'UP' and eth_tvl.get('change_24h', 0) > 2:
+    # ETH TVL
+    eth_change = eth_tvl.get('change_24h', 0)
+    if eth_tvl.get('trend') == 'UP' and eth_change > 2:
         signals.append({"signal": "BULLISH", "reason": "TVL ETH растёт"})
         score += 10
-    elif eth_tvl.get('trend') == 'DOWN' and eth_tvl.get('change_24h', 0) < -2:
+    elif eth_tvl.get('trend') == 'DOWN' and eth_change < -2:
         signals.append({"signal": "BEARISH", "reason": "TVL ETH падает"})
         score -= 10
 
+    # Staking
     if staking.get('restaking_growth') == 'HIGH':
         signals.append({"signal": "BULLISH", "reason": "Рестейкинг растёт"})
         score += 5
 
+    # DEX
     if dex.get('signal') == 'BULLISH':
         signals.append({"signal": "BULLISH", "reason": "DEX объёмы растут"})
         score += 8
@@ -368,10 +394,12 @@ def analyze_ecosystem() -> Dict[str, Any]:
         signals.append({"signal": "BEARISH", "reason": "DEX объёмы падают"})
         score -= 8
 
+    # Ultrasound
     if ultrasound.get('is_deflationary'):
         signals.append({"signal": "BULLISH", "reason": "ETH дефляционный"})
         score += 8
 
+    # Developers
     if dev.get('activity') == 'HIGH':
         signals.append({"signal": "BULLISH", "reason": "Высокая активность разработчиков"})
         score += 3
@@ -451,19 +479,19 @@ def keep_alive():
 threading.Thread(target=keep_alive, daemon=True).start()
 
 # ================= FASTAPI =================
-app = FastAPI(title="TOMIRIS SPACE 20 v1.3 — L2 & DEFI PULSE")
+app = FastAPI(title="TOMIRIS SPACE 20 v1.4 — L2 & DEFI PULSE")
 
 @app.on_event("startup")
 async def startup():
     asyncio.create_task(auto_send_loop())
-    logger.info(f"🚀 Space 20 v1.3 ЗАПУЩЕН | Хаб: {HUB_URL}")
+    logger.info(f"🚀 Space 20 v1.4 ЗАПУЩЕН | Хаб: {HUB_URL}")
 
 @app.get("/health")
 async def health():
     return {
         "space_id": SPACE_ID,
         "status": "operational",
-        "version": "1.3",
+        "version": "1.4",
         "hub_url": HUB_URL,
         "l2_chains": list(L2_CHAINS.keys())
     }
@@ -510,12 +538,13 @@ async def send_now():
 
 @app.get("/")
 async def root():
-    return {"name": "L2 & DeFi Pulse v1.3", "space_id": SPACE_ID, "hub": HUB_URL}
+    return {"name": "L2 & DeFi Pulse v1.4", "space_id": SPACE_ID, "hub": HUB_URL}
 
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)
 
-print(f"🚀 SPACE 20 v1.3 — L2 & DEFI PULSE ЗАПУЩЕН!")
+print(f"🚀 SPACE 20 v1.4 — L2 & DEFI PULSE ЗАПУЩЕН!")
 print(f"🔷 Мониторинг: Arbitrum, Optimism, Base, Polygon ZkEVM | DEX | Staking | Ultrasound")
+print(f"🔄 Прокси L2 TVL: 20% от ETH TVL если DeFiLlama недоступна")
 print(f"✅ Готов к бою!")