Update app.py

app.py

@@ -1,18 +1,17 @@
 import os
 os.system("playwright install")
-# app.py (Final, Working Async Version)
+# app.py (Final, Working Async Version with Bugfixes)
 
 import gradio as gr
 from playwright.async_api import async_playwright, Error as PlaywrightError
 from bs4 import BeautifulSoup
 import urllib.parse
-import atexit
-import re
 import os
 from itertools import cycle
 import uuid
 
-# --- 1. ASYNC GLOBAL RESOURCES & STATE ---
+# --- 1. GLOBAL RESOURCES & STATE ---
+# These are initialized on the first request to be compatible with Spaces.
 P = None
 BROWSER = None
 REVOLVER = None
@@ -43,7 +42,7 @@ class CredentialRevolver:
     def get_next(self): return next(self.proxy_cycler) if self.proxy_cycler else None
     def count(self): return len(self.proxies)
 
-# --- 3. ASYNC LOGIC ---
+# --- 3. ASYNC LOGIC (Unchanged) ---
 async def _fetch_and_update_tab_state(tab_state: TabState, url: str):
     log = f"▶️ Navigating to {url}..."; live_page = LIVE_CONTEXTS[tab_state.id]["page"]
     try:
@@ -91,22 +90,10 @@ async def handle_action(browser_state: BrowserState, action: str, value=None):
         browser_state.active_tab_id = value; log = f"Switched to tab."
     return browser_state, log
 
-def update_ui_components(browser_state: BrowserState): # This function is not async
-    active_tab = browser_state.get_active_tab()
-    if not active_tab: return {page_content: gr.Markdown("No active tabs."), url_textbox: "", links_display: "", tab_selector: gr.Radio(choices=[])}
-    tab_choices = [(f"Tab {i}: {t.title[:25]}... (via {t.proxy_used})", t.id) for i, t in enumerate(browser_state.tabs)]
-    links_md = "### 🔗 Links on Page\n" + ('\n'.join(f"{i}. [{link['text'][:80]}]({link['url']})" for i, link in enumerate(active_tab.links[:25])) if active_tab.links else "_No links found._")
-    return {
-        page_content: gr.Markdown(f"# {active_tab.title}\n**URL:** {active_tab.url}\n\n---\n\n{active_tab.parsed_text[:2000]}..."),
-        url_textbox: gr.Textbox(value=active_tab.url), links_display: gr.Markdown(links_md),
-        tab_selector: gr.Radio(choices=tab_choices, value=active_tab.id, label="Active Tabs"),
-    }
-
-# --- 4. GRADIO UI AND EVENT HANDLING ---
+# --- 4. GRADIO UI AND EVENT HANDLING (WITH FIXES) ---
 with gr.Blocks(theme=gr.themes.Soft(), title="Real Browser Demo") as demo:
     browser_state = gr.State(BrowserState())
     gr.Markdown("# 🛰️ Real Browser Demo (Final Working Version)")
-    gr.Markdown(f"This demo runs a real headless browser. All threading issues are resolved.")
     # UI Layout is the same...
     with gr.Row():
         with gr.Column(scale=3):
@@ -120,8 +107,9 @@ with gr.Blocks(theme=gr.themes.Soft(), title="Real Browser Demo") as demo:
                 links_display = gr.Markdown("...");
                 with gr.Row(): click_num_box = gr.Number(label="Link #", scale=1, minimum=0, step=1); click_btn = gr.Button("Click Link", scale=2)
     
+    # This order must be consistent
     all_outputs = [page_content, url_textbox, links_display, tab_selector, log_display]
-
+    
     async def master_handler(current_state, action, value=None):
         global APP_STARTED, P, BROWSER, REVOLVER
         if not APP_STARTED:
@@ -131,18 +119,47 @@ with gr.Blocks(theme=gr.themes.Soft(), title="Real Browser Demo") as demo:
             print(f"✅ Playwright started. {REVOLVER.count()} proxies loaded."); APP_STARTED = True
         
         new_state, log = await handle_action(current_state, action, value)
-        ui_updates = update_ui_components(new_state); ui_updates[log_display] = log
-        return new_state, ui_updates
-
-    # All event listeners MUST be lambdas that await the async master_handler
-    go_btn.click(lambda s, v: master_handler(s, "go", v), [browser_state, url_textbox], [browser_state, *all_outputs], show_progress="full")
-    url_textbox.submit(lambda s, v: master_handler(s, "go", v), [browser_state, url_textbox], [browser_state, *all_outputs], show_progress="full")
-    click_btn.click(lambda s, v: master_handler(s, "click", v), [browser_state, click_num_box], [browser_state, *all_outputs], show_progress="full")
-    new_tab_btn.click(lambda s: master_handler(s, "new_tab", None), [browser_state], [browser_state, *all_outputs], show_progress="full")
-    close_tab_btn.click(lambda s: master_handler(s, "close_tab", None), [browser_state], [browser_state, *all_outputs])
-    tab_selector.input(lambda s, v: master_handler(s, "switch_tab", v), [browser_state, tab_selector], [browser_state, *all_outputs])
-
-    # The load event triggers the very first startup
-    demo.load(lambda s: master_handler(s, "new_tab", None), inputs=[browser_state], outputs=[browser_state, *all_outputs])
+        ui_updates = update_ui_components(new_state)
+        
+        # **THE CRITICAL FIX IS HERE:**
+        # We must return a tuple with a value for EACH output component, in the correct order.
+        return (
+            new_state, # 1. For the browser_state output
+            ui_updates[page_content], # 2.
+            ui_updates[url_textbox], # 3.
+            ui_updates[links_display], # 4.
+            ui_updates[tab_selector], # 5.
+            ui_updates[log_display] # 6.
+        )
+    
+    # **THE SECOND CRITICAL FIX IS HERE:**
+    # Each event listener is a simple, separate async function that Gradio can correctly await.
+    
+    async def on_load(state):
+        return await master_handler(state, "new_tab", None)
+    
+    async def on_go_click(state, value):
+        return await master_handler(state, "go", value)
+        
+    async def on_click_link(state, value):
+        return await master_handler(state, "click", value)
+        
+    async def on_new_tab(state):
+        return await master_handler(state, "new_tab", None)
+        
+    async def on_close_tab(state):
+        return await master_handler(state, "close_tab", None)
+        
+    async def on_switch_tab(state, value):
+        return await master_handler(state, "switch_tab", value)
+        
+    # Wire up the new, clean event handlers
+    demo.load(on_load, inputs=[browser_state], outputs=[browser_state, *all_outputs])
+    go_btn.click(on_go_click, [browser_state, url_textbox], [browser_state, *all_outputs], show_progress="full")
+    url_textbox.submit(on_go_click, [browser_state, url_textbox], [browser_state, *all_outputs], show_progress="full")
+    click_btn.click(on_click_link, [browser_state, click_num_box], [browser_state, *all_outputs], show_progress="full")
+    new_tab_btn.click(on_new_tab, [browser_state], [browser_state, *all_outputs], show_progress="full")
+    close_tab_btn.click(on_close_tab, [browser_state], [browser_state, *all_outputs])
+    tab_selector.input(on_switch_tab, [browser_state, tab_selector], [browser_state, *all_outputs])
 
 demo.launch()