Route Telegram alerts via Cloudflare Worker relay (HF blocks api.telegram.org)

main.py

@@ -383,20 +383,18 @@ def catalyst(symbol: str = ""):
 
 @app.get("/api/test-telegram")
 def test_telegram():
-    """Send a test Telegram message to verify bot credentials are working."""
+    """Send a test Telegram message via Cloudflare Worker relay."""
     import requests as req
-    bot_token = os.environ.get("TELEGRAM_BOT_TOKEN", "")
-    chat_id = os.environ.get("TELEGRAM_CHAT_ID", "")
-    if not bot_token or not chat_id:
-        return JSONResponse({"ok": False, "error": f"Missing secrets — token={'set' if bot_token else 'MISSING'} chat={'set' if chat_id else 'MISSING'}"}, status_code=500)
-    text = "✅ Trade Copilot — Test Message\n\nTelegram alerts are working correctly."
-    url = f"https://api.telegram.org/bot{bot_token}/sendMessage"
+    worker_url = os.environ.get("CLOUDFLARE_WORKER_URL", "")
+    if not worker_url:
+        return JSONResponse({"ok": False, "error": "CLOUDFLARE_WORKER_URL not set in HF Secrets"}, status_code=500)
+    text = "✅ <b>Trade Copilot — Test Message</b>\n\nTelegram alerts are working correctly via Cloudflare Worker."
     try:
-        resp = req.post(url, json={"chat_id": chat_id, "text": text}, timeout=10)
+        resp = req.post(worker_url, json={"text": text, "parse_mode": "HTML"}, timeout=10)
         body = resp.json()
         if resp.status_code == 200:
-            return {"ok": True, "message": "Test message sent successfully"}
-        return JSONResponse({"ok": False, "status": resp.status_code, "telegram_error": body}, status_code=500)
+            return {"ok": True, "message": "Test message sent successfully via CF Worker"}
+        return JSONResponse({"ok": False, "status": resp.status_code, "error": body}, status_code=500)
     except Exception as e:
         return JSONResponse({"ok": False, "error": type(e).__name__ + ": " + str(e)}, status_code=500)
 

telegram_alert.py

@@ -1,8 +1,12 @@
 """Telegram alert sender for high-confidence trade cards.
 
-Env vars required:
-  TELEGRAM_BOT_TOKEN  — bot token from @BotFather
-  TELEGRAM_CHAT_ID    — chat/channel ID (numeric)
+Routing: HF Spaces cannot reach api.telegram.org directly (IP blocked).
+Messages are routed via a Cloudflare Worker relay:
+  HF Space → CLOUDFLARE_WORKER_URL → api.telegram.org → Telegram
+
+Env vars required (set in HF Spaces Secrets):
+  CLOUDFLARE_WORKER_URL — your Worker URL, e.g. https://trade-alert.yourname.workers.dev
+  (TELEGRAM_BOT_TOKEN and TELEGRAM_CHAT_ID are set as env vars on the Worker itself, not here)
 
 Dedup design (verified by 7-agent panel):
   - Background loop uses key prefix "bg:"  — 4-hour cooldown
@@ -19,6 +23,8 @@ from datetime import datetime, timezone
 
 logger = logging.getLogger("telegram_alert")
 
+CLOUDFLARE_WORKER_URL = os.environ.get("CLOUDFLARE_WORKER_URL", "")
+# Keep these for backward compat / fallback reference
 TELEGRAM_BOT_TOKEN = os.environ.get("TELEGRAM_BOT_TOKEN", "")
 TELEGRAM_CHAT_ID   = os.environ.get("TELEGRAM_CHAT_ID", "")
 
@@ -192,11 +198,10 @@ async def send_alert(card: dict, tv_sym: str, manual: bool = False) -> bool:
     """
     global _warned_missing
 
-    if not TELEGRAM_BOT_TOKEN or not TELEGRAM_CHAT_ID:
+    if not CLOUDFLARE_WORKER_URL:
         if not _warned_missing:
             logger.warning(
-                "Telegram alerts disabled — set TELEGRAM_BOT_TOKEN and "
-                "TELEGRAM_CHAT_ID in HF Spaces Secrets."
+                "Telegram alerts disabled — set CLOUDFLARE_WORKER_URL in HF Spaces Secrets."
             )
             _warned_missing = True
         return False
@@ -210,24 +215,24 @@ async def send_alert(card: dict, tv_sym: str, manual: bool = False) -> bool:
         )
         return False
 
+    if not CLOUDFLARE_WORKER_URL:
+        logger.warning("CLOUDFLARE_WORKER_URL not set in HF Secrets — alerts disabled.")
+        return False
+
     text    = build_message(card, tv_sym)
-    url     = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendMessage"
-    payload = {
-        "chat_id":                  TELEGRAM_CHAT_ID,
-        "text":                     text,
-        "parse_mode":               "HTML",
-        "disable_web_page_preview": True,
-    }
+    payload = {"text": text, "parse_mode": "HTML"}
 
     try:
         async with aiohttp.ClientSession() as session:
             async with session.post(
-                url, json=payload, timeout=aiohttp.ClientTimeout(total=10)
+                CLOUDFLARE_WORKER_URL,
+                json=payload,
+                timeout=aiohttp.ClientTimeout(total=10)
             ) as resp:
                 if resp.status == 200:
                     _mark_sent(card, manual)
                     logger.info(
-                        "Telegram alert sent [%s]: %s %s conf=%.1f",
+                        "Telegram alert sent via CF Worker [%s]: %s %s conf=%.1f",
                         "manual" if manual else "bg",
                         card.get("symbol"), card.get("direction"),
                         float(card.get("confidence", 0)),
@@ -235,12 +240,12 @@ async def send_alert(card: dict, tv_sym: str, manual: bool = False) -> bool:
                     return True
                 body = await resp.text()
                 logger.error(
-                    "Telegram API error %d for %s: %s",
+                    "CF Worker error %d for %s: %s",
                     resp.status, card.get("symbol"), body[:300],
                 )
     except Exception as exc:
         logger.error(
-            "Telegram send failed for %s: %s",
+            "CF Worker request failed for %s: %s",
             card.get("symbol"), exc, exc_info=True,
         )