Update app/lens_text_core.py

app/lens_text_core.py

@@ -1,7 +1,7 @@
 
-import os, time, asyncio, base64, re, threading, hashlib, logging, shutil, atexit, tempfile, uuid
+import os, time, asyncio, base64, re, threading, hashlib, logging, shutil
 from io import BytesIO
-from typing import Any, Dict, List, Union, Optional
+from typing import Any, Dict, List, Union
 from urllib.parse import urlparse
 
 import httpx
@@ -10,7 +10,6 @@ from PIL import Image
 from selenium import webdriver
 from selenium.webdriver.chrome.options import Options as ChromeOptions
 from selenium.webdriver.chrome.service import Service as ChromeService
-from selenium.common.exceptions import SessionNotCreatedException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
@@ -33,81 +32,63 @@ CHROME_EXTRA_ARGS = os.getenv(
     "--window-size=1920,1080 --headless=new",
 ).split()
 
-_CACHE_TTL    = 600  
-_BROWSER_TTL  = 900  
+_CACHE_TTL    = 300  
 _IDLE_TIMEOUT = int(os.getenv("CHROME_IDLE_SECONDS", "60"))
+_BROWSER_TTL  = 900  
 
-def _mk_profile_dir() -> str:
-    base = tempfile.gettempdir()
-    p = os.path.join(base, f"chrome-profile-{os.getpid()}-{threading.get_ident()}-{uuid.uuid4().hex}")
-    os.makedirs(p, exist_ok=True)
-    
-    atexit.register(lambda: shutil.rmtree(p, ignore_errors=True))
-    return p
+_COMMON_CHROME_PATHS = [
+    # Linux
+    "/usr/bin/google-chrome", "/usr/bin/chromium", "/usr/bin/chromium-browser",
+    "/snap/bin/chromium",
+    "/opt/google/chrome/google-chrome",
+    # macOS
+    "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+    "/Applications/Chromium.app/Contents/MacOS/Chromium",
+    # Windows
+    r"C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe",
+    r"C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe",
+]
+
+def _find_chrome_binary() -> str:
+    if (env := os.getenv("CHROME_BINARY")):
+        return env
+
+    for cmd in ("google-chrome", "chromium-browser", "chromium", "chrome"):
+        path = shutil.which(cmd)
+        if path:
+            return path
+
+    for path in _COMMON_CHROME_PATHS:
+        if os.path.exists(path):
+            return path
+
+    raise RuntimeError(
+        "Chrome binary not found; set CHROME_BINARY env var or install Chrome/Chromium"
+    )
 
-def _build_chrome(cookie_dict: Dict[str, str] | None = None,
-                  *, domain: str = ".google.com",
-                  user_data_dir: Optional[str] = None,
-                  reuse_profile: bool = False):
+def _build_chrome(cookie_dict: Dict[str, str] | None = None):
+    bin_loc = _find_chrome_binary()
+    drv_path = os.getenv("CHROMEDRIVER", "/usr/bin/chromedriver")
     opts = ChromeOptions()
-
-    extra = os.getenv(
-        "CHROME_EXTRA_ARGS",
-        "--no-sandbox --disable-dev-shm-usage --disable-gpu --window-size=1920,1080 --headless=new",
-    ).split()
-    for a in extra:
-        if a:
-            opts.add_argument(a)
-
-    if user_data_dir:
-        profile_dir = user_data_dir
-        os.makedirs(profile_dir, exist_ok=True)
-    elif reuse_profile:
-        base = os.getenv("CHROME_PROFILE_BASE", "/tmp")
-        profile_dir = os.path.join(base, "chrome-profile")
-        os.makedirs(profile_dir, exist_ok=True)
-    else:
-        profile_dir = _mk_profile_dir()
-
-    opts.add_argument(f"--user-data-dir={profile_dir}")
-    opts.add_argument("--profile-directory=Default")
-
-    bin_loc = os.getenv("CHROME_BINARY")
-    if bin_loc and os.path.exists(bin_loc):
-        opts.binary_location = bin_loc
-
-    drv_path = os.getenv("CHROMEDRIVER")
-
-    def _new_driver():
-        if drv_path and os.path.exists(drv_path):
-            service = ChromeService(executable_path=drv_path)
-            return webdriver.Chrome(service=service, options=opts)
-        return webdriver.Chrome(options=opts)
-
-    try:
-        drv = _new_driver()
-    except SessionNotCreatedException:
-        fresh = _mk_profile_dir()
-        opts.arguments = [x for x in opts.arguments if not x.startswith("--user-data-dir=")]
-        opts.add_argument(f"--user-data-dir={fresh}")
-        drv = _new_driver()
-
-    if cookie_dict:
+    opts.binary_location = bin_loc
+    for flag in CHROME_EXTRA_ARGS:
         try:
-            drv.execute_cdp_cmd("Network.enable", {})
-            cookies = [
-                {"name": k, "value": v, "domain": domain, "path": "/", "secure": True}
-                for k, v in cookie_dict.items()
-            ]
-            drv.execute_cdp_cmd("Network.setCookies", {"cookies": cookies})
+            opts.add_argument(flag)
         except Exception:
+            pass
+    service = ChromeService(executable_path=drv_path)
+    drv = webdriver.Chrome(service=service, options=opts)
+    
+    drv.execute_cdp_cmd("Network.enable", {})
+    if cookie_dict:
+        for name, val in cookie_dict.items():
             try:
-                drv.get(f"https://{domain.lstrip('.')}/")
-                for k, v in cookie_dict.items():
-                    drv.add_cookie({"name": k, "value": v, "domain": domain, "path": "/", "secure": True})
+                drv.execute_cdp_cmd("Network.setCookie", {
+                    "name": name, "value": val,
+                    "domain": ".google.com", "path": "/", "secure": True
+                })
             except Exception:
                 pass
-
     return drv
 
 _cached_cookie, _cached_cookie_ts, _cookie_lock = None, 0.0, threading.Lock()
@@ -228,7 +209,7 @@ def _parse_calc_value(calc: str, dim: float) -> float:
     return base - off if op == "-" else base + off
 
 def _extract_boxes(drv, w: int, h: int) -> List[Dict[str, Any]]:
-    WebDriverWait(drv, 30).until(EC.visibility_of_element_located((By.CSS_SELECTOR, "div.lv6PAb")))
+    WebDriverWait(drv, 10).until(EC.visibility_of_element_located((By.CSS_SELECTOR, "div.lv6PAb")))
     nodes = drv.find_elements(By.XPATH, "//div[contains(@class,'lv6PAb') and @aria-label]")
 
     out: List[Dict[str,Any]] = []