Update app.py

app.py

@@ -1,9 +1,9 @@
 import os
 os.system("playwright install")
-# app.py (Final version with async API)
+# app.py (Synchronous, state-separated, and Gradio API fix)
 
 import gradio as gr
-from playwright.async_api import async_playwright, Error as PlaywrightError
+from playwright.sync_api import sync_playwright, Error as PlaywrightError
 from bs4 import BeautifulSoup
 import urllib.parse
 import datetime
@@ -13,14 +13,26 @@ import os
 from itertools import cycle
 import uuid
 
-# --- 1. ASYNC GLOBAL RESOURCES ---
-# We will initialize these in a Gradio startup event.
-P = None
-BROWSER = None
-REVOLVER = None
-LIVE_CONTEXTS = {} # { tab_id: { "context": PlaywrightContext, "page": PlaywrightPage } }
+# --- 1. LIVE RESOURCES (Global, Non-copyable) ---
+try:
+    p = sync_playwright().start()
+    browser = p.firefox.launch(headless=True, timeout=60000)
+    print("✅ Playwright browser launched successfully.")
+except Exception as e:
+    print(f"❌ Could not launch Playwright browser. Original error: {e}"); exit()
 
-# --- 2. PLAIN DATA STATE CLASSES (Unchanged) ---
+LIVE_CONTEXTS = {}  # { tab_id: { "context": PlaywrightContext, "page": PlaywrightPage } }
+
+def cleanup():
+    print(f"🧹 Cleaning up: Closing {len(LIVE_CONTEXTS)} browser contexts...")
+    for tab_id, resources in LIVE_CONTEXTS.items():
+        if not resources["context"].is_closed():
+            resources["context"].close()
+    browser.close(); p.stop()
+atexit.register(cleanup)
+
+
+# --- 2. STATE DATA (Plain, Copyable Classes) ---
 class TabState:
     def __init__(self, tab_id, proxy_used="Direct Connection"):
         self.id, self.url, self.title = tab_id, "about:blank", "New Tab"
@@ -31,7 +43,9 @@ class BrowserState:
     def __init__(self): self.tabs, self.active_tab_id = [], None
     def get_active_tab(self): return next((t for t in self.tabs if t.id == self.active_tab_id), None)
 
-class CredentialRevolver: # Unchanged
+
+# --- 3. LOGIC ---
+class CredentialRevolver:
     def __init__(self, proxy_string: str):
         self.proxies = self._parse_proxies(proxy_string)
         if self.proxies: self.proxy_cycler = cycle(self.proxies)
@@ -45,18 +59,16 @@ class CredentialRevolver: # Unchanged
     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 ---
-# All functions interacting with Playwright are now `async def`
+proxy_list_str = os.getenv("PROXY_LIST", "")
+revolver = CredentialRevolver(proxy_list_str)
 
-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"]
+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:
-        await live_page.goto(url, wait_until='domcontentloaded', timeout=30000)
-        tab_state.url = live_page.url
-        tab_state.title = await live_page.title() or "No Title"
+        live_page.goto(url, wait_until='domcontentloaded', timeout=30000)
+        tab_state.url, tab_state.title = live_page.url, live_page.title() or "No Title"
         log += f"\n✅ Arrived at: {tab_state.url}"
-        html_content = await live_page.content()
+        html_content = live_page.content()
         soup = BeautifulSoup(html_content, 'lxml')
         for script in soup(["script", "style", "nav", "footer"]): script.extract()
         tab_state.parsed_text = soup.get_text(separator='\n', strip=True)
@@ -68,26 +80,26 @@ async def _fetch_and_update_tab_state(tab_state: TabState, url: str):
         tab_state.links = []; log += f"\n❌ {error_message}"
     return log
 
-async def handle_action(browser_state: BrowserState, action: str, value=None):
+def handle_action(browser_state: BrowserState, action: str, value=None):
     log = ""; active_tab_state = browser_state.get_active_tab()
     if action == "new_tab":
-        tab_id = str(uuid.uuid4())
-        proxy_config = REVOLVER.get_next()
-        context = await BROWSER.new_context(proxy=proxy_config)
-        page = await context.new_page()
+        tab_id, proxy_config = str(uuid.uuid4()), revolver.get_next()
+        context = browser.new_context(proxy=proxy_config)
+        page = context.new_page()
         LIVE_CONTEXTS[tab_id] = {"context": context, "page": page}
         new_tab = TabState(tab_id, proxy_used=proxy_config['server'] if proxy_config else "Direct")
         browser_state.tabs.append(new_tab)
         browser_state.active_tab_id = tab_id
-        log = await _fetch_and_update_tab_state(new_tab, "https://www.whatsmyip.org/")
+        log = _fetch_and_update_tab_state(new_tab, "https://www.whatsmyip.org/")
     elif action == "go" and active_tab_state:
         url = value if (urllib.parse.urlparse(value).scheme and urllib.parse.urlparse(value).netloc) else f"https://duckduckgo.com/html/?q={urllib.parse.quote_plus(value)}"
-        log = await _fetch_and_update_tab_state(active_tab_state, url)
+        log = _fetch_and_update_tab_state(active_tab_state, url)
     elif action == "click" and active_tab_state and value is not None:
         try:
             link_index = int(value)
             if 0 <= link_index < len(active_tab_state.links):
-                log = await _fetch_and_update_tab_state(active_tab_state, active_tab_state.links[link_index]['url'])
+                link_url = active_tab_state.links[link_index]['url']
+                log = _fetch_and_update_tab_state(active_tab_state, link_url)
             else: log = "Invalid link number."
         except: log = "Please enter a valid number to click."
     elif action == "close_tab" and active_tab_state:
@@ -98,14 +110,14 @@ async def handle_action(browser_state: BrowserState, action: str, value=None):
             new_index = tab_index - 1 if tab_index > 0 else 0
             browser_state.active_tab_id = browser_state.tabs[new_index].id
             resources = LIVE_CONTEXTS.pop(tab_to_close_id)
-            await resources['context'].close()
+            if not resources['context'].is_closed(): resources['context'].close()
             log = f"💣 Tab closed."
         else: log = "Cannot close the last tab."
     elif action == "switch_tab" and value is not 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
+def update_ui_components(browser_state: BrowserState):
     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)]
@@ -116,26 +128,11 @@ def update_ui_components(browser_state: BrowserState): # This function is not as
         tab_selector: gr.Radio(choices=tab_choices, value=active_tab.id, label="Active Tabs"),
     }
 
-# --- 4. GRADIO UI AND STARTUP/SHUTDOWN EVENTS ---
-async def startup():
-    global P, BROWSER, REVOLVER
-    print("🚀 App starting up...")
-    P = await async_playwright().start()
-    BROWSER = await P.firefox.launch(headless=True)
-    proxy_list_str = os.getenv("PROXY_LIST", "")
-    REVOLVER = CredentialRevolver(proxy_list_str)
-    print(f"✅ Playwright started. {REVOLVER.count()} proxies loaded.")
-
-async def shutdown():
-    print("🧹 App shutting down...")
-    if BROWSER: await BROWSER.close()
-    if P: await P.stop()
-    print("✅ Playwright stopped.")
-
+# --- Gradio UI Layout ---
 with gr.Blocks(theme=gr.themes.Soft(), title="Real Browser Demo") as demo:
     browser_state = gr.State(BrowserState())
-    gr.Markdown("# 🛰️ Real Browser Demo (Async API)")
-    # UI Layout is the same...
+    gr.Markdown("# 🛰️ Real Browser Demo (Synchronous Fix)")
+    gr.Markdown(f"This demo runs a real headless browser. **{revolver.count()} proxies loaded**.")
     with gr.Row():
         with gr.Column(scale=3):
             url_textbox = gr.Textbox(label="URL or Search Term", interactive=True)
@@ -146,44 +143,29 @@ with gr.Blocks(theme=gr.themes.Soft(), title="Real Browser Demo") as demo:
             with gr.Row(): new_tab_btn = gr.Button("➕ New Tab"); close_tab_btn = gr.Button("❌ Close Tab")
             tab_selector = gr.Radio(choices=[], label="Active Tabs", interactive=True)
             with gr.Accordion("Clickable Links", open=True):
-                links_display = gr.Markdown("...")
+                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)
-    
+
     all_outputs = [page_content, url_textbox, links_display, tab_selector, log_display]
 
-    async def master_handler(current_state, action, value):
-        new_state, log = await handle_action(current_state, action, value)
-        ui_updates = update_ui_components(new_state)
-        ui_updates[log_display] = log
+    def master_handler(current_state, action, value):
+        new_state, log = handle_action(current_state, action, value)
+        ui_updates = update_ui_components(new_state); ui_updates[log_display] = log
         return new_state, ui_updates
 
-    # Initial Load - create first tab
-    async def initial_load(s):
-        _, ui_updates = await master_handler(s, "new_tab", None)
+    def initial_load(s):
+        # A small hack to initialize the browser state with one tab on load
+        # We call the handler directly but only return the UI update part.
+        _, ui_updates = master_handler(s, "new_tab", None)
         return ui_updates
-    
     demo.load(initial_load, inputs=[browser_state], outputs=list(all_outputs))
 
-    # Event listeners - Gradio automatically awaits async functions
-    go_btn.click(master_handler, [browser_state, url_textbox], [browser_state, *all_outputs], fn_name="go", show_progress="full")
-    url_textbox.submit(master_handler, [browser_state, url_textbox], [browser_state, *all_outputs], fn_name="go", show_progress="full")
-    click_btn.click(master_handler, [browser_state, click_num_box], [browser_state, *all_outputs], fn_name="click", show_progress="full")
-    new_tab_btn.click(master_handler, [browser_state], [browser_state, *all_outputs], fn_name="new_tab", show_progress="full")
-    close_tab_btn.click(master_handler, [browser_state], [browser_state, *all_outputs], fn_name="close_tab")
-    tab_selector.input(master_handler, [browser_state, tab_selector], [browser_state, *all_outputs], fn_name="switch_tab")
-
-# The `startup` and `shutdown` events are not available in standard `Blocks`.
-# We manage this by doing the startup inside the first `load` event.
-# The global setup is the best way for Spaces.
-# A small tweak to make it work without official startup events:
-# The startup logic is moved to the global scope but needs an async context.
-# We will use the existing startup/shutdown logic and assume the Gradio version supports it or handles it gracefully.
-# The best practice would be to use a framework that has explicit startup/shutdown events like FastAPI.
-# For Gradio Spaces, the singleton pattern with async calls in handlers is the way to go.
-
-# Let's adjust for standard Gradio deployment.
-# We'll run startup manually before launching.
-import asyncio
-asyncio.run(startup())
+    # Event listeners - FIXED by removing the `fn_name` argument.
+    go_btn.click(master_handler, [browser_state, url_textbox], [browser_state, *all_outputs], show_progress="full")
+    url_textbox.submit(master_handler, [browser_state, url_textbox], [browser_state, *all_outputs], show_progress="full")
+    click_btn.click(master_handler, [browser_state, click_num_box], [browser_state, *all_outputs], show_progress="full")
+    new_tab_btn.click(master_handler, [browser_state], [browser_state, *all_outputs], show_progress="full")
+    close_tab_btn.click(master_handler, [browser_state], [browser_state, *all_outputs])
+    tab_selector.input(master_handler, [browser_state, tab_selector], [browser_state, *all_outputs])
 
 demo.launch()