Update app.py

app.py

@@ -21,7 +21,7 @@ for module_name, pip_name in REQUIRED_PACKAGES.items():
         print(f"✅ {pip_name} установлен!")
 
 # ============================================
-# 👑 TOMIRIS SPACE 21 v3.1 — GOLD MACRO & FLOW ENGINE (Hub-Connected)
+# 👑 TOMIRIS SPACE 21 v3.2 — GOLD MACRO & FLOW ENGINE (АВТО-ОТПРАВКА)
 # ============================================
 import os, time, json, logging, asyncio
 from typing import Dict, Any, List, Optional
@@ -42,8 +42,12 @@ TWELVE_DATA_KEY = os.getenv("TWELVE_DATA_KEY", "f33e660d8c1945d19e3c4ded72a2875e
 FRED_KEY = os.getenv("FRED_KEY", "faa11c8e2e4beee08c5b966e8b63a513")
 NEWSAPI_KEY = os.getenv("NEWSAPI_KEY", "948c7816beea47baa23b054592472d0e")
 
+# Интервал авто-отправки
+AUTO_SEND_INTERVAL = int(os.getenv("AUTO_SEND_INTERVAL", "300"))
+
 GOLD_ETFS = ["GLD", "IAU", "GDX"]
 CACHE_TTL = {"fred": 3600, "etf_aum": 600, "cot": 86400, "gpr": 900}
+CACHE: Dict[str, Any] = {}
 
 # ================= HTTP КЛИЕНТ =================
 http_client = httpx.AsyncClient(timeout=15.0)
@@ -51,14 +55,17 @@ http_client = httpx.AsyncClient(timeout=15.0)
 # ================= ОТПРАВКА В HUB =================
 async def send_signal_to_hub(symbol: str, direction: str, confidence: float):
     try:
-        await http_client.post(f"{HUB_URL}/signal", json={
+        resp = await http_client.post(f"{HUB_URL}/signal", json={
             "space": "space_21_gold_macro",
             "symbol": symbol,
             "direction": direction,
             "confidence": confidence,
             "raw": json.dumps({"source": "space_21_gold_macro"})
-        })
-        logger.info(f"📤 {symbol}: {direction} conf={confidence:.3f} отправлен в Hub")
+        }, 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}")
 
@@ -270,7 +277,6 @@ async def get_gold_macro_signal() -> Dict[str, Any]:
     analysis = await analyze_gold_macro()
     latency = int((time.time() - start) * 1000)
 
-    # Отправка в Hub
     await send_signal_to_hub(SYMBOL, analysis['direction'], analysis['confidence'])
 
     result = {
@@ -289,15 +295,28 @@ async def get_gold_macro_signal() -> Dict[str, Any]:
         "latency_ms": latency
     }
 
-    logger.info(f"🥇 Gold Macro: {analysis['direction']} | Score={analysis['macro_score']} | ETF={analysis['metrics']['etf_flows'].get('flow_signal')} | COT={analysis['metrics']['cot_report'].get('cot_signal')}")
+    logger.info(f"🥇 Gold Macro: {analysis['direction']} | Score={analysis['macro_score']}")
     return result
 
+# ================= АВТО-ОТПРАВКА =================
+async def auto_send_loop():
+    logger.info(f"🔄 Авто-отправка Gold Macro запущена (интервал {AUTO_SEND_INTERVAL}с)")
+    await asyncio.sleep(30)
+    while True:
+        try:
+            await get_gold_macro_signal()
+            logger.info("✅ Gold Macro авто-отправка завершена")
+        except Exception as e:
+            logger.error(f"Ошибка авто-отправки: {e}")
+        await asyncio.sleep(AUTO_SEND_INTERVAL)
+
 # ================= FASTAPI =================
-app = FastAPI(title="Tomiris Space 21 v3.1 — Gold Macro & Flow Engine (Hub)")
+app = FastAPI(title="Tomiris Space 21 v3.2 — Gold Macro & Flow Engine (Auto-Hub)")
 
 @app.on_event("startup")
 async def startup():
-    pass
+    asyncio.create_task(auto_send_loop())
+    logger.info("🚀 Space 21 v3.2 запущен с авто-отправкой в Hub")
 
 @app.on_event("shutdown")
 async def shutdown():
@@ -305,7 +324,13 @@ async def shutdown():
 
 @app.get("/health")
 async def health():
-    return {"status": "operational", "version": "3.1", "async": True, "hub_connected": True}
+    return {
+        "status": "operational",
+        "version": "3.2",
+        "hub_url": HUB_URL,
+        "auto_send_interval": AUTO_SEND_INTERVAL,
+        "async": True
+    }
 
 @app.get("/consilium")
 async def consilium():
@@ -335,8 +360,12 @@ async def gpr():
 async def full():
     return await analyze_gold_macro()
 
+@app.get("/send_now")
+async def send_now():
+    return await get_gold_macro_signal()
+
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)
 
-print("🚀 SPACE 21 v3.1 — GOLD MACRO & FLOW ENGINE (Hub-Connected) ЗАПУЩЕН!")
+print("🚀 SPACE 21 v3.2 — GOLD MACRO & FLOW ENGINE (АВТО-ОТПРАВКА) ЗАПУЩЕН!")