fix: remove nest_asyncio, use thread for async

app.py

@@ -1,17 +1,13 @@
 """
 Maya Token Getter v3
 Playwright Google OAuth -> Firebase token -> saves to HF bridge
-One button. No fuss.
 """
-import os, json, uuid, asyncio, datetime
-import urllib.request, urllib.parse
-import nest_asyncio
+import os, json, uuid, asyncio, datetime, threading
+import urllib.request, urllib.parse, base64
 import gradio as gr
 from huggingface_hub import HfApi
 from playwright.async_api import async_playwright
 
-nest_asyncio.apply()
-
 EMAIL        = os.environ.get("SESAME_EMAIL", "mail4444@post.com")
 PASSWORD     = os.environ.get("SESAME_GOOGLE_PASS", "")
 FIREBASE_KEY = "AIzaSyDtC7Uwb5pGAsdmrH2T4Gqdk5Mga07jYPM"
@@ -50,8 +46,19 @@ def exchange_refresh_token(rt):
     return body.get("id_token", ""), body.get("refresh_token", rt)
 
 
-async def browser_auth():
-    """Google OAuth via Playwright -> Firebase token"""
+def decode_token(id_token):
+    try:
+        payload = id_token.split('.')[1] + '==='
+        claims = json.loads(base64.b64decode(payload))
+        provider = claims.get("firebase", {}).get("sign_in_provider", "unknown")
+        uid = claims.get("sub", "unknown")
+        email = claims.get("email", "unknown")
+        return f"provider: {provider} | uid: {uid} | email: {email}"
+    except:
+        return "could not decode"
+
+
+async def _browser_auth():
     log = []
     id_token = refresh_token = ""
 
@@ -67,7 +74,6 @@ async def browser_auth():
             user_agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 Chrome/120.0.0.0 Safari/537.36"
         )
 
-        # Intercept Firebase token exchange responses
         async def on_resp(r):
             nonlocal id_token, refresh_token
             if "securetoken.googleapis.com/v1/token" in r.url:
@@ -77,9 +83,7 @@ async def browser_auth():
                         id_token = b["id_token"]
                         refresh_token = b.get("refresh_token", "")
                         log.append(f"TOKEN INTERCEPTED ({len(id_token)} chars)")
-                except:
-                    pass
-            # Also catch signInWithIdp responses
+                except: pass
             if "identitytoolkit.googleapis.com" in r.url and "signInWithIdp" in r.url:
                 try:
                     b = await r.json()
@@ -87,53 +91,46 @@ async def browser_auth():
                         id_token = b["idToken"]
                         refresh_token = b.get("refreshToken", "")
                         log.append(f"TOKEN FROM signInWithIdp ({len(id_token)} chars)")
-                except:
-                    pass
+                except: pass
 
         page = await ctx.new_page()
         page.on("response", on_resp)
 
-        # Navigate to Sesame login
-        log.append("navigating to sesame login...")
+        log.append("navigating to sesame...")
         try:
             await page.goto("https://sesameai.app", wait_until="domcontentloaded", timeout=30000)
             await asyncio.sleep(3)
-            log.append(f"page loaded: {page.url}")
+            log.append(f"loaded: {page.url}")
         except Exception as e:
             log.append(f"nav error: {e}")
-            # Try alternative URL
             try:
                 await page.goto("https://app.sesame.com/login", wait_until="domcontentloaded", timeout=30000)
                 await asyncio.sleep(3)
-                log.append(f"alt page loaded: {page.url}")
+                log.append(f"alt loaded: {page.url}")
             except Exception as e2:
                 log.append(f"alt nav error: {e2}")
                 await browser.close()
                 return "", "", log
 
-        # Click Google sign-in button
-        try:
-            # Try multiple selectors for the Google button
-            for selector in [
-                "text=Continue with Google",
-                "text=Sign in with Google",
-                "[data-provider-id='google.com']",
-                "button:has-text('Google')",
-                "a:has-text('Google')",
-            ]:
-                try:
-                    el = page.locator(selector).first
-                    if await el.count() > 0:
-                        await el.click()
-                        log.append(f"clicked: {selector}")
-                        break
-                except:
-                    continue
-            await asyncio.sleep(5)
-        except Exception as e:
-            log.append(f"google button error: {e}")
+        # Click Google sign-in
+        for selector in [
+            "text=Continue with Google",
+            "text=Sign in with Google",
+            "[data-provider-id='google.com']",
+            "button:has-text('Google')",
+            "a:has-text('Google')",
+        ]:
+            try:
+                el = page.locator(selector).first
+                if await el.count() > 0:
+                    await el.click()
+                    log.append(f"clicked: {selector}")
+                    break
+            except:
+                continue
+        await asyncio.sleep(5)
 
-        # Enter email in Google sign-in
+        # Email
         try:
             await page.wait_for_selector("input[type='email']", timeout=15000)
             await page.fill("input[type='email']", EMAIL)
@@ -141,23 +138,22 @@ async def browser_auth():
             await asyncio.sleep(4)
             log.append("email entered")
         except Exception as e:
-            log.append(f"email step error: {e}")
+            log.append(f"email error: {e}")
 
-        # Enter password
+        # Password
         try:
             await page.wait_for_selector("input[type='password']", timeout=15000)
             await page.fill("input[type='password']", PASSWORD)
             await page.keyboard.press("Enter")
             await asyncio.sleep(10)
-            log.append("password entered, waiting for redirect...")
+            log.append("password entered")
         except Exception as e:
-            log.append(f"password step error: {e}")
+            log.append(f"password error: {e}")
 
-        # Wait for redirect back
         await asyncio.sleep(5)
         log.append(f"final URL: {page.url}")
 
-        # Fallback: try IndexedDB extraction
+        # IndexedDB fallback
         if not id_token:
             try:
                 data = await page.evaluate("""async () => {
@@ -185,65 +181,56 @@ async def browser_auth():
                         log.append(f"token from IndexedDB ({len(id_token)} chars)")
                         break
             except Exception as e:
-                log.append(f"IndexedDB fallback error: {e}")
-
-        # Screenshot for debug
-        try:
-            await page.screenshot(path="/tmp/auth_result.png")
-            log.append("screenshot saved")
-        except:
-            pass
+                log.append(f"IndexedDB error: {e}")
 
         await browser.close()
 
     return id_token, refresh_token, log
 
 
-def test_ws_connection(id_token):
-    """Quick test: can this token connect to Maya's WebSocket?"""
-    import base64
-    try:
-        payload = id_token.split('.')[1] + '==='
-        claims = json.loads(base64.b64decode(payload))
-        provider = claims.get("firebase", {}).get("sign_in_provider", "unknown")
-        uid = claims.get("sub", "unknown")
-        email = claims.get("email", "unknown")
-        return f"provider: {provider} | uid: {uid} | email: {email}"
-    except:
-        return "could not decode token"
+def browser_auth():
+    """Run async browser auth in a new event loop in a thread"""
+    result = [None]
+    def run():
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        result[0] = loop.run_until_complete(_browser_auth())
+        loop.close()
+    t = threading.Thread(target=run)
+    t.start()
+    t.join(timeout=120)
+    if result[0] is None:
+        return "", "", ["TIMEOUT: browser auth took >120s"]
+    return result[0]
 
 
 def run_auth():
-    """Main auth flow: try refresh first, then browser"""
     log = []
     state = read_state()
     stored_rt = state.get("refresh_token", "")
 
-    # Try refresh token first
     if stored_rt:
         log.append("trying stored refresh token...")
         try:
             id_token, new_rt = exchange_refresh_token(stored_rt)
             if id_token:
-                log.append(f"REFRESH SUCCESS ({len(id_token)} chars)")
-                claims = test_ws_connection(id_token)
+                claims = decode_token(id_token)
+                log.append(f"REFRESH OK ({len(id_token)} chars)")
                 log.append(claims)
                 state["refresh_token"] = new_rt
                 state["last_id_token"] = id_token[:40] + "..."
                 state["last_updated"] = datetime.datetime.utcnow().isoformat()
                 write_state(state)
-                return "TOKEN READY (from refresh)", "\n".join(log), id_token[:80] + "..."
+                return "TOKEN READY (refresh)", "\n".join(log), id_token[:80] + "..."
         except Exception as e:
             log.append(f"refresh failed: {e}")
 
-    # Browser auth
     log.append("starting browser auth...")
-    loop = asyncio.get_event_loop()
-    id_token, refresh_token, auth_log = loop.run_until_complete(browser_auth())
+    id_token, refresh_token, auth_log = browser_auth()
     log.extend(auth_log)
 
     if id_token:
-        claims = test_ws_connection(id_token)
+        claims = decode_token(id_token)
         log.append(claims)
         state["refresh_token"] = refresh_token
         state["last_id_token"] = id_token[:40] + "..."
@@ -252,18 +239,15 @@ def run_auth():
         log.append("SAVED TO HF BRIDGE")
         return "TOKEN READY", "\n".join(log), id_token[:80] + "..."
     else:
-        return "FAILED - check log", "\n".join(log), ""
+        return "FAILED", "\n".join(log), ""
 
 
-# Gradio UI
 with gr.Blocks(title="Maya Token Getter", theme=gr.themes.Monochrome()) as app:
-    gr.Markdown("# Maya Token Getter v3\nOne button. Gets Google OAuth Firebase token for Sesame.")
-
+    gr.Markdown("# Maya Token Getter v3\nOne button. Gets Google OAuth Firebase token.")
     btn = gr.Button("GET TOKEN", variant="primary", size="lg")
     status = gr.Textbox(label="Status", interactive=False)
-    log_output = gr.Textbox(label="Log", interactive=False, lines=15)
-    token_preview = gr.Textbox(label="Token Preview", interactive=False)
-
-    btn.click(fn=run_auth, outputs=[status, log_output, token_preview])
+    log_out = gr.Textbox(label="Log", interactive=False, lines=15)
+    tok_prev = gr.Textbox(label="Token Preview", interactive=False)
+    btn.click(fn=run_auth, outputs=[status, log_out, tok_prev])
 
 app.launch(server_name="0.0.0.0", server_port=7860)

requirements.txt

@@ -1,4 +1,3 @@
 gradio>=4.0
 playwright==1.50.0
-nest_asyncio
 huggingface_hub