Upload app.py

app.py

@@ -1,6 +1,5 @@
 """
 HuggingFace Spaces Entry Point for Jade Bot
-Uses IP address directly to bypass DNS issues
 """
 import os
 import socket
@@ -14,30 +13,16 @@ from telegram.ext import ApplicationBuilder, ContextTypes, CommandHandler, Messa
 import uvicorn
 import gradio as gr
 
-# Manually resolve Telegram API to bypass HF DNS issues
-# These are the actual IPs for api.telegram.org
-TELEGRAM_IPS = ["149.154.167.220", "149.154.167.198", "149.154.167.199"]
+# Direct IP for Telegram API
+TELEGRAM_IP = "149.154.167.220"
 
-def patch_httpx_for_telegram():
-    """Patch httpx to use direct IP for Telegram API."""
-    original_init = httpx.AsyncClient.__init__
-    
-    def patched_init(self, *args, **kwargs):
-        # Add transport that maps api.telegram.org to IP
-        original_init(self, *args, **kwargs)
-    
-    # Simple DNS override
-    original_getaddrinfo = socket.getaddrinfo
-    def custom_getaddrinfo(host, port, family=0, type=0, proto=0, flags=0):
-        if "telegram" in str(host).lower():
-            # Return the first Telegram IP
-            return [(socket.AF_INET, socket.SOCK_STREAM, 6, '', (TELEGRAM_IPS[0], port if port else 443))]
-        # Force IPv4 for everything else
-        return original_getaddrinfo(host, port, socket.AF_INET, type, proto, flags)
-    
-    socket.getaddrinfo = custom_getaddrinfo
+def custom_getaddrinfo(host, port, family=0, type=0, proto=0, flags=0):
+    if "telegram" in str(host).lower():
+        return [(socket.AF_INET, socket.SOCK_STREAM, 6, '', (TELEGRAM_IP, port if port else 443))]
+    return socket._original_getaddrinfo(host, port, socket.AF_INET, type, proto, flags)
 
-patch_httpx_for_telegram()
+socket._original_getaddrinfo = socket.getaddrinfo
+socket.getaddrinfo = custom_getaddrinfo
 
 logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -45,6 +30,8 @@ logger = logging.getLogger(__name__)
 bot_status = {"started_at": None, "is_running": False, "error": None}
 application = None
 
+app = FastAPI()
+
 
 def get_status():
     if bot_status.get("error"):
@@ -54,9 +41,6 @@ def get_status():
     return f"## 🟢 Jade Running!\n- Started: {bot_status.get('started_at')}"
 
 
-app = FastAPI()
-
-
 @app.post("/webhook")
 async def webhook(request: Request):
     global application
@@ -86,7 +70,9 @@ async def setup_bot():
             return
     
     logger.info(f"Space URL: {space_url}")
-    logger.info(f"Using Telegram IP: {TELEGRAM_IPS[0]}")
+    
+    # Wait for network
+    await asyncio.sleep(3)
     
     try:
         from core import TelegramJadeAgent
@@ -105,26 +91,49 @@ async def setup_bot():
             response = await loop.run_in_executor(None, agent.chat, chat_id, user_text)
             await context.bot.send_message(chat_id=chat_id, text=response)
         
-        application = ApplicationBuilder().token(token).build()
+        # Build with extended timeouts
+        from telegram.ext import Defaults
+        from telegram.request import HTTPXRequest
+        
+        request = HTTPXRequest(
+            connection_pool_size=8,
+            read_timeout=30,
+            write_timeout=30,
+            connect_timeout=30,
+            pool_timeout=30
+        )
+        
+        application = (
+            ApplicationBuilder()
+            .token(token)
+            .request(request)
+            .get_updates_request(request)
+            .build()
+        )
         application.add_handler(CommandHandler('start', start))
         application.add_handler(MessageHandler(filters.TEXT & (~filters.COMMAND), handle_message))
         
-        await application.initialize()
-        
         webhook_url = f"{space_url}/webhook"
+        
         for attempt in range(5):
             try:
-                logger.info(f"Setting webhook ({attempt + 1}/5)...")
-                await application.bot.set_webhook(url=webhook_url)
-                logger.info("✅ Webhook set!")
+                logger.info(f"Attempt {attempt + 1}/5: Initializing...")
+                await application.initialize()
+                
+                logger.info(f"Setting webhook to {webhook_url}...")
+                await application.bot.set_webhook(url=webhook_url, drop_pending_updates=True)
+                
+                logger.info("✅ Webhook set successfully!")
                 bot_status["started_at"] = datetime.now().strftime("%H:%M:%S")
                 bot_status["is_running"] = True
                 return
+                
             except Exception as e:
                 logger.warning(f"Attempt {attempt + 1} failed: {e}")
-                await asyncio.sleep(5)
+                if attempt < 4:
+                    await asyncio.sleep(10)
         
-        bot_status["error"] = "Failed to set webhook after 5 attempts"
+        bot_status["error"] = "Failed after 5 attempts"
                     
     except Exception as e:
         logger.error(f"Bot setup failed: {e}")