Update app.py

app.py

@@ -5,15 +5,16 @@ from fastapi import FastAPI, Request
 from telegram import Update, Bot, InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.ext import Application, CommandHandler, CallbackQueryHandler, ConversationHandler, MessageHandler, filters, ContextTypes
 
-# ========== CONFIG ==========
+# ========== CONFIGURATION ==========
 TELEGRAM_TOKEN = os.environ["TELEGRAM_BOT_TOKEN"]
 HF_TOKEN = os.environ["HF_TOKEN"]
 HF_USERNAME = os.environ["HF_USERNAME"]
 GITHUB_REPO = os.environ["GITHUB_REPO"]
 
+# Conversation states
 SELECT_BOT, SESSION_ID, CONFIRM = range(3)
 
-# ========== HANDLERS ==========
+# ========== TELEGRAM HANDLERS ==========
 async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
     keyboard = [[InlineKeyboardButton("Asitha MD", callback_data="asitha")]]
     await update.message.reply_text(
@@ -28,14 +29,15 @@ async def bot_selected(update: Update, context: ContextTypes.DEFAULT_TYPE):
     context.user_data['bot_type'] = query.data
     await query.edit_message_text(
         "✅ Asitha MD තෝරාගත්තා.\n\n"
-        "දැන් ඔබගේ WhatsApp Session ID එක (Base64 string) එවන්න:"
+        "දැන් ඔබගේ WhatsApp Session ID එක (Base64 string) එවන්න:\n"
+        "(ඔබ කලින් ලබාගත් session base64 string එක)"
     )
     return SESSION_ID
 
 async def get_session(update: Update, context: ContextTypes.DEFAULT_TYPE):
     session = update.message.text.strip()
     if len(session) < 20:
-        await update.message.reply_text("❌ Session ID වැරදියි. නැවත උත්සාහ කරන්න:")
+        await update.message.reply_text("❌ Session ID එක වැරදියි. නැවත උත්සාහ කරන්න:")
         return SESSION_ID
     context.user_data['session_id'] = session
     keyboard = [
@@ -101,7 +103,7 @@ async def cancel(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await update.message.reply_text("Deploy අවලංගු කළා.")
     return ConversationHandler.END
 
-def conv_handler():
+def get_conversation_handler():
     return ConversationHandler(
         entry_points=[CommandHandler("start", start)],
         states={
@@ -109,24 +111,39 @@ def conv_handler():
             SESSION_ID: [MessageHandler(filters.TEXT & ~filters.COMMAND, get_session)],
             CONFIRM: [CallbackQueryHandler(confirm_deploy)],
         },
-        fallbacks=[CommandHandler("cancel", cancel)]
+        fallbacks=[CommandHandler("cancel", cancel)],
+        per_message=False,
+        per_chat=True
     )
 
-# ========== FASTAPI WEBHOOK ==========
+# ========== FASTAPI WEBHOOK SETUP (නිවැරදි කළ කොටස) ==========
 telegram_app = None
-bot = Bot(TELEGRAM_TOKEN)
+bot = None  # මුලින් None, පසුව initialize කරන්නෙමු
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    global telegram_app
+    global telegram_app, bot
+    # 1. Application එක build කරන්න
     telegram_app = Application.builder().token(TELEGRAM_TOKEN).build()
-    telegram_app.add_handler(conv_handler())
+    # 2. Bot instance එක Application එකෙන් ලබාගන්න
+    bot = telegram_app.bot
+    # 3. Handlers add කරන්න
+    telegram_app.add_handler(get_conversation_handler())
+    # 4. සම්පූර්ණ initialization
     await telegram_app.initialize()
+    # 5. Webhook URL එක set කරන්න
     space_id = os.environ.get("SPACE_ID", "").replace("/", "-")
-    webhook_url = f"https://{space_id}.hf.space/webhook" if space_id else "https://localhost/webhook"
+    if space_id:
+        webhook_url = f"https://{space_id}.hf.space/webhook"
+    else:
+        # fallback (local test සඳහා)
+        webhook_url = "https://localhost/webhook"
     await telegram_app.bot.set_webhook(webhook_url)
     print(f"✅ Webhook set to {webhook_url}")
-    yield
+    
+    yield  # FastAPI server මෙතැනින් දිව යයි
+    
+    # Shutdown: webhook ඉවත් කරන්න
     await telegram_app.bot.delete_webhook()
     await telegram_app.shutdown()
 
@@ -134,11 +151,13 @@ app = FastAPI(lifespan=lifespan)
 
 @app.get("/")
 async def root():
-    return {"status": "alive", "message": "Bot is running"}
+    return {"status": "alive", "message": "Telegram Bot is running with webhook"}
 
 @app.post("/webhook")
 async def webhook(request: Request):
+    global telegram_app, bot
     data = await request.json()
+    # දැන් bot සහ telegram_app යන දෙකම හරියට initialize වී ඇත
     update = Update.de_json(data, bot)
     await telegram_app.process_update(update)
     return {"ok": True}