Replace manual try/except + hook fallback with Binary.load_or_install() in all plugin tests

All 8 plugin test files (defuddle, opendataloader, mercury, readability,
ytdlp, gallerydl, forumdl, liteparse) had ~80-line get_*_binary_path()
functions that manually tried Binary.load(), caught the exception, then
shelled out to crawl hooks + npm/pip install hooks as a fallback.

Binary.load_or_install() does all of this in one call. This removes
~600 lines of duplicated boilerplate, eliminates noisy BinaryLoadError
log lines from the first-attempt failure, and removes unused imports
(uuid, subprocess for install, tempfile for lib roots).

https://claude.ai/code/session_01XyzPfEB3qopffFuRyouaTa

Author: claude

abx_plugins/plugins/defuddle/tests/test_defuddle.py

@@ -3,7 +3,6 @@
 import subprocess
 import sys
 import tempfile
-import uuid
 from pathlib import Path
 from urllib.request import urlopen
 
@@ -31,7 +30,6 @@
 
 TEST_URL = "https://example.com"
 _defuddle_binary_path = None
-_defuddle_lib_root = None
 
 
 def create_example_html(tmpdir: Path) -> Path:
@@ -58,91 +56,21 @@ def require_defuddle_binary() -> str:
 
 
 def get_defuddle_binary_path() -> str | None:
-    """Get defuddle path from cache or by running install hooks."""
+    """Get defuddle binary path, installing via abx_pkg if needed."""
     global _defuddle_binary_path
     if _defuddle_binary_path and Path(_defuddle_binary_path).is_file():
         return _defuddle_binary_path
 
     from abx_pkg import Binary, EnvProvider, NpmProvider
 
-    try:
-        binary = Binary(
-            name="defuddle",
-            binproviders=[NpmProvider(), EnvProvider()],
-            overrides={"npm": {"install_args": ["defuddle"]}},
-        ).load()
-        if binary and binary.abspath:
-            _defuddle_binary_path = str(binary.abspath)
-            return _defuddle_binary_path
-    except Exception:
-        pass
-
-    npm_hook = PLUGINS_ROOT / "npm" / "on_Binary__10_npm_install.py"
-    if not npm_hook.exists():
-        return None
-
-    binary_id = str(uuid.uuid4())
-    machine_id = str(uuid.uuid4())
-    binproviders = "*"
-    overrides = None
-
-    crawl_result = subprocess.run(
-        [str(DEFUDDLE_CRAWL_HOOK)],
-        capture_output=True,
-        text=True,
-        timeout=30,
-    )
-    for line in crawl_result.stdout.strip().split("\n"):
-        if not line.strip().startswith("{"):
-            continue
-        try:
-            record = json.loads(line)
-        except json.JSONDecodeError:
-            continue
-        if record.get("type") == "Binary" and record.get("name") == "defuddle":
-            binproviders = record.get("binproviders", "*")
-            overrides = record.get("overrides")
-            break
-
-    global _defuddle_lib_root
-    if not _defuddle_lib_root:
-        _defuddle_lib_root = tempfile.mkdtemp(prefix="defuddle-lib-")
-
-    env = os.environ.copy()
-    env["LIB_DIR"] = str(Path(_defuddle_lib_root) / ".config" / "abx" / "lib")
-    env["SNAP_DIR"] = str(Path(_defuddle_lib_root) / "data")
-    env["CRAWL_DIR"] = str(Path(_defuddle_lib_root) / "crawl")
-
-    cmd = [str(npm_hook),
-        "--binary-id",
-        binary_id,
-        "--machine-id",
-        machine_id,
-        "--name",
-        "defuddle",
-        f"--binproviders={binproviders}",
-    ]
-    if overrides:
-        cmd.append(f"--overrides={json.dumps(overrides)}")
-
-    install_result = subprocess.run(
-        cmd,
-        capture_output=True,
-        text=True,
-        timeout=300,
-        env=env,
-    )
-
-    for line in install_result.stdout.strip().split("\n"):
-        if not line.strip().startswith("{"):
-            continue
-        try:
-            record = json.loads(line)
-        except json.JSONDecodeError:
-            continue
-        if record.get("type") == "Binary" and record.get("name") == "defuddle":
-            _defuddle_binary_path = record.get("abspath")
-            return _defuddle_binary_path
+    binary = Binary(
+        name="defuddle",
+        binproviders=[NpmProvider(), EnvProvider()],
+        overrides={"npm": {"install_args": ["defuddle"]}},
+    ).load_or_install()
+    if binary and binary.abspath:
+        _defuddle_binary_path = str(binary.abspath)
+        return _defuddle_binary_path
 
     return None
 

abx_plugins/plugins/forumdl/tests/test_forumdl.py

@@ -18,7 +18,6 @@
 import sys
 import tempfile
 import time
-import uuid
 from pathlib import Path
 import pytest
 
@@ -35,7 +34,6 @@
 
 # Module-level cache for binary path
 _forumdl_binary_path = None
-_forumdl_lib_root = None
 
 
 def require_forumdl_binary() -> str:
@@ -49,95 +47,21 @@ def require_forumdl_binary() -> str:
     return binary_path
 
 
-def get_forumdl_binary_path():
-    """Get the installed forum-dl binary path from cache or by running installation."""
+def get_forumdl_binary_path() -> str | None:
+    """Get forum-dl binary path, installing via abx_pkg if needed."""
     global _forumdl_binary_path
     if _forumdl_binary_path:
         return _forumdl_binary_path
 
-    # Try to find forum-dl binary using abx-pkg
     from abx_pkg import Binary, PipProvider, EnvProvider
 
-    try:
-        binary = Binary(
-            name="forum-dl", binproviders=[PipProvider(), EnvProvider()]
-        ).load()
-
-        if binary and binary.abspath:
-            _forumdl_binary_path = str(binary.abspath)
-            return _forumdl_binary_path
-    except Exception:
-        pass
-
-    # If not found, try to install via pip using the crawl hook overrides
-    pip_hook = PLUGINS_ROOT / "pip" / "on_Binary__11_pip_install.py"
-    crawl_hook = next(PLUGIN_DIR.glob("on_Crawl__25_forumdl_install*.py"), None)
-    if pip_hook.exists():
-        binary_id = str(uuid.uuid4())
-        machine_id = str(uuid.uuid4())
-        overrides = None
-
-        if crawl_hook and crawl_hook.exists():
-            crawl_result = subprocess.run(
-                [str(crawl_hook)],
-                capture_output=True,
-                text=True,
-                timeout=30,
-            )
-            for crawl_line in crawl_result.stdout.strip().split("\n"):
-                if crawl_line.strip().startswith("{"):
-                    try:
-                        crawl_record = json.loads(crawl_line)
-                        if (
-                            crawl_record.get("type") == "Binary"
-                            and crawl_record.get("name") == "forum-dl"
-                        ):
-                            overrides = crawl_record.get("overrides")
-                            break
-                    except json.JSONDecodeError:
-                        continue
-
-        # Create a persistent temp HOME for default LIB_DIR usage
-        global _forumdl_lib_root
-        if not _forumdl_lib_root:
-            _forumdl_lib_root = tempfile.mkdtemp(prefix="forumdl-lib-")
-        env = os.environ.copy()
-        env["HOME"] = str(_forumdl_lib_root)
-        env["SNAP_DIR"] = str(Path(_forumdl_lib_root) / "data")
-        env.pop("LIB_DIR", None)
-
-        cmd = [str(pip_hook),
-            "--binary-id",
-            binary_id,
-            "--machine-id",
-            machine_id,
-            "--name",
-            "forum-dl",
-        ]
-        if overrides:
-            cmd.append(f"--overrides={json.dumps(overrides)}")
-
-        install_result = subprocess.run(
-            cmd,
-            capture_output=True,
-            text=True,
-            timeout=300,
-            env=env,
-        )
-
-        # Parse Binary from pip installation
-        for install_line in install_result.stdout.strip().split("\n"):
-            if install_line.strip():
-                try:
-                    install_record = json.loads(install_line)
-                    if (
-                        install_record.get("type") == "Binary"
-                        and install_record.get("name") == "forum-dl"
-                    ):
-                        _forumdl_binary_path = install_record.get("abspath")
-                        return _forumdl_binary_path
-                except json.JSONDecodeError:
-                    pass
+    binary = Binary(
+        name="forum-dl",
+        binproviders=[PipProvider(), EnvProvider()],
+    ).load_or_install()
+    if binary and binary.abspath:
+        _forumdl_binary_path = str(binary.abspath)
+        return _forumdl_binary_path
 
     return None
 

abx_plugins/plugins/gallerydl/tests/test_gallerydl.py

@@ -18,7 +18,6 @@
 import tempfile
 import time
 import os
-import uuid
 from pathlib import Path
 import pytest
 
@@ -35,7 +34,6 @@
 
 # Module-level cache for binary path
 _gallerydl_binary_path = None
-_gallerydl_lib_root = None
 
 
 def require_gallerydl_binary() -> str:
@@ -49,91 +47,21 @@ def require_gallerydl_binary() -> str:
     return binary_path
 
 
-def get_gallerydl_binary_path():
-    """Get gallery-dl binary path from cache or by running install hooks."""
+def get_gallerydl_binary_path() -> str | None:
+    """Get gallery-dl binary path, installing via abx_pkg if needed."""
     global _gallerydl_binary_path
     if _gallerydl_binary_path and Path(_gallerydl_binary_path).is_file():
         return _gallerydl_binary_path
 
-    # Try loading from existing providers first
     from abx_pkg import Binary, PipProvider, EnvProvider
 
-    try:
-        binary = Binary(
-            name="gallery-dl", binproviders=[PipProvider(), EnvProvider()]
-        ).load()
-        if binary and binary.abspath:
-            _gallerydl_binary_path = str(binary.abspath)
-            return _gallerydl_binary_path
-    except Exception:
-        pass
-
-    # Install via real plugin hooks
-    pip_hook = PLUGINS_ROOT / "pip" / "on_Binary__11_pip_install.py"
-    crawl_hook = next(PLUGIN_DIR.glob("on_Crawl__20_gallerydl_install*.py"), None)
-    if not pip_hook.exists():
-        return None
-
-    binary_id = str(uuid.uuid4())
-    machine_id = str(uuid.uuid4())
-    overrides = None
-
-    if crawl_hook and crawl_hook.exists():
-        crawl_result = subprocess.run(
-            [str(crawl_hook)],
-            capture_output=True,
-            text=True,
-            timeout=30,
-        )
-        for line in crawl_result.stdout.strip().split("\n"):
-            if not line.strip().startswith("{"):
-                continue
-            try:
-                record = json.loads(line)
-            except json.JSONDecodeError:
-                continue
-            if record.get("type") == "Binary" and record.get("name") == "gallery-dl":
-                overrides = record.get("overrides")
-                break
-
-    global _gallerydl_lib_root
-    if not _gallerydl_lib_root:
-        _gallerydl_lib_root = tempfile.mkdtemp(prefix="gallerydl-lib-")
-
-    env = os.environ.copy()
-    env["HOME"] = str(_gallerydl_lib_root)
-    env["SNAP_DIR"] = str(Path(_gallerydl_lib_root) / "data")
-    env.pop("LIB_DIR", None)
-
-    cmd = [str(pip_hook),
-        "--binary-id",
-        binary_id,
-        "--machine-id",
-        machine_id,
-        "--name",
-        "gallery-dl",
-    ]
-    if overrides:
-        cmd.append(f"--overrides={json.dumps(overrides)}")
-
-    install_result = subprocess.run(
-        cmd,
-        capture_output=True,
-        text=True,
-        timeout=300,
-        env=env,
-    )
-
-    for line in install_result.stdout.strip().split("\n"):
-        if not line.strip().startswith("{"):
-            continue
-        try:
-            record = json.loads(line)
-        except json.JSONDecodeError:
-            continue
-        if record.get("type") == "Binary" and record.get("name") == "gallery-dl":
-            _gallerydl_binary_path = record.get("abspath")
-            return _gallerydl_binary_path
+    binary = Binary(
+        name="gallery-dl",
+        binproviders=[PipProvider(), EnvProvider()],
+    ).load_or_install()
+    if binary and binary.abspath:
+        _gallerydl_binary_path = str(binary.abspath)
+        return _gallerydl_binary_path
 
     return None