Update app.py

app.py

@@ -8,15 +8,16 @@ import time
 from telegram import Update
 from telegram.ext import ApplicationBuilder, CommandHandler, ContextTypes
 
-BOT_TOKEN = os.environ.get("BOT_TOKEN", "YOUR_BOT_TOKEN")
+# --- Config ---
+BOT_TOKEN = os.environ.get("BOT_TOKEN", "YOUR_BOT_TOKEN_HERE")
 
+# --- Globals ---
 bot_app = None
-bot_thread = None
 bot_running = False
 log_queue = Queue()
 telegram_cmd_logs = []
 
-# Telegram bot handler
+# --- Telegram Bot Command Handler ---
 async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     cmd = ' '.join(context.args)
     if not cmd:
@@ -24,7 +25,6 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
         return
 
     log_queue.put(f"[Telegram] Received command: {cmd}")
-
     try:
         proc = await asyncio.create_subprocess_shell(
             cmd,
@@ -43,63 +43,54 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     if len(telegram_cmd_logs) > 50:
         telegram_cmd_logs.pop(0)
 
-def start_bot():
-    global bot_app, bot_running, bot_thread
+# --- Terminal Command Function ---
+def live_terminal(cmd):
+    if not cmd.strip():
+        yield "$ "
+        return
+    yield f"$ {cmd}\n"
+    process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+    for line in iter(process.stdout.readline, ''):
+        yield line
+    process.stdout.close()
+    process.wait()
+    yield "$ "
+
+# --- Bot Start/Stop Functions ---
+def start_bot_sync():
+    global bot_app, bot_running
     if bot_running:
         log_queue.put("[Bot] Already running.")
         return
 
-    async def run_bot():
+    async def main():
         global bot_app, bot_running
         bot_app = ApplicationBuilder().token(BOT_TOKEN).build()
         bot_app.add_handler(CommandHandler("bash", bash_command))
         bot_running = True
-        log_queue.put("[Bot] Bot started.")
-        await bot_app.run_polling()
+        log_queue.put("[Bot] Started.")
+        await bot_app.initialize()
+        await bot_app.start()
+        await bot_app.updater.start_polling()
 
-    loop = asyncio.new_event_loop()
+    asyncio.run(main())
 
-    def runner():
-        asyncio.set_event_loop(loop)
-        try:
-            loop.run_until_complete(run_bot())
-        except Exception as e:
-            log_queue.put(f"[Bot Error] {e}")
-
-    bot_thread = threading.Thread(target=runner, daemon=True)
-    bot_thread.start()
-
-def stop_bot():
+def stop_bot_sync():
     global bot_app, bot_running
     if not bot_running:
-        log_queue.put("[Bot] Bot is not running.")
+        log_queue.put("[Bot] Not running.")
         return
 
     async def shutdown():
-        await bot_app.shutdown()
+        await bot_app.updater.stop()
         await bot_app.stop()
-        log_queue.put("[Bot] Bot stopped.")
+        await bot_app.shutdown()
+        log_queue.put("[Bot] Stopped.")
 
     asyncio.run(shutdown())
     bot_running = False
 
-# Real live terminal generator
-def live_terminal(cmd):
-    if not cmd.strip():
-        yield gr.TextArea.update(value="$ ")
-        return
-    yield gr.TextArea.update(value=f"$ {cmd}\n")
-    process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
-    output = f"$ {cmd}\n"
-    for line in iter(process.stdout.readline, ''):
-        output += line
-        yield gr.TextArea.update(value=output)
-    process.stdout.close()
-    process.wait()
-    output += "$ "
-    yield gr.TextArea.update(value=output)
-
-# Update log output
+# --- Log Collector ---
 def update_log_box():
     logs = []
     try:
@@ -110,41 +101,33 @@ def update_log_box():
     logs.extend(telegram_cmd_logs[-20:])
     return "\n".join(logs[-20:])
 
-# UI
-with gr.Blocks(title="📚 TheMovieProviderBot Interface") as demo:
+# --- Gradio UI ---
+with gr.Blocks() as demo:
     gr.Markdown("## 🖥️ Live Terminal + Telegram Bot Interface")
 
     with gr.Row():
-        terminal_output = gr.TextArea(label="📟 Live Terminal", lines=20)
-        cmd_input = gr.Textbox(label="⌨️ Enter Command")
-        run_btn = gr.Button("▶️ Run")
+        terminal_output = gr.Textbox(label="Live Terminal", lines=20, interactive=False)
+        cmd_input = gr.Textbox(placeholder="Type shell command", label="Command Input")
 
     with gr.Row():
+        run_btn = gr.Button("▶️ Run")
         start_btn = gr.Button("🤖 Start Telegram Bot")
         stop_btn = gr.Button("🛑 Stop Telegram Bot")
 
-    log_output = gr.Textbox(label="📜 Bot Logs", lines=15, interactive=False)
+    log_output = gr.Textbox(label="📜 Bot & Telegram Logs", lines=15, interactive=False)
 
-    # Stream terminal output
+    # Streaming terminal output
     run_btn.click(fn=live_terminal, inputs=cmd_input, outputs=terminal_output)
 
-    # Start/Stop handlers
-    def start_click():
-        start_bot()
-        return update_log_box()
-
-    def stop_click():
-        stop_bot()
-        return update_log_box()
-
-    start_btn.click(start_click, outputs=log_output)
-    stop_btn.click(stop_click, outputs=log_output)
+    # Start/Stop bot
+    start_btn.click(lambda: update_log_box() or start_bot_sync(), outputs=log_output)
+    stop_btn.click(lambda: update_log_box() or stop_bot_sync(), outputs=log_output)
 
-    # Background log auto-updater
+    # Auto log updater every 3 seconds (Gradio v5 style)
     def background_log_updater():
         while True:
             time.sleep(3)
-            yield gr.Textbox.update(value=update_log_box())
+            yield update_log_box()
 
     demo.load(background_log_updater, outputs=log_output)