new vastly simplified plugin spec without pydantic

archivebox/plugins_pkg/npm/__init__.py

@@ -0,0 +1,47 @@
+__package__ = 'plugins_pkg.npm'
+__label__ = 'npm'
+__version__ = '2024.10.14'
+__author__ = 'Nick Sweeting'
+__homepage__ = 'https://www.npmjs.com/'
+
+import abx
+
+
+@abx.hookimpl
+def get_PLUGIN():
+    return {
+        'npm': {
+            'PACKAGE': __package__,
+            'LABEL': __label__,
+            'VERSION': __version__,
+            'AUTHOR': __author__,
+            'HOMEPAGE': __homepage__,
+        }
+    }
+
+@abx.hookimpl
+def get_CONFIG():
+    from .config import NPM_CONFIG
+    
+    return {
+        'npm': NPM_CONFIG,
+    }
+
+@abx.hookimpl
+def get_BINARIES():
+    from .binaries import NODE_BINARY, NPM_BINARY, NPX_BINARY
+    
+    return {
+        'node': NODE_BINARY,
+        'npm': NPM_BINARY,
+        'npx': NPX_BINARY,
+    }
+
+@abx.hookimpl
+def get_BINPROVIDERS():
+    from .binproviders import LIB_NPM_BINPROVIDER, SYS_NPM_BINPROVIDER
+    
+    return {
+        'lib_npm': LIB_NPM_BINPROVIDER,
+        'sys_npm': SYS_NPM_BINPROVIDER,
+    }

archivebox/plugins_pkg/npm/apps.py

@@ -1,114 +0,0 @@
-__package__ = 'archivebox.plugins_pkg.npm'
-
-from pathlib import Path
-from typing import List, Optional
-
-from pydantic import InstanceOf, model_validator
-
-from pydantic_pkgr import BinProvider, NpmProvider, BinName, PATHStr, BinProviderName, BinaryOverrides
-
-from archivebox.config import DATA_DIR, CONSTANTS
-
-from abx.archivebox.base_plugin import BasePlugin
-from abx.archivebox.base_configset import BaseConfigSet
-from abx.archivebox.base_binary import BaseBinary, BaseBinProvider, env, apt, brew
-from abx.archivebox.base_hook import BaseHook
-
-
-###################### Config ##########################
-
-
-class NpmDependencyConfigs(BaseConfigSet):
-    # USE_NPM: bool = True
-    # NPM_BINARY: str = Field(default='npm')
-    # NPM_ARGS: Optional[List[str]] = Field(default=None)
-    # NPM_EXTRA_ARGS: List[str] = []
-    # NPM_DEFAULT_ARGS: List[str] = []
-    pass
-
-
-DEFAULT_GLOBAL_CONFIG = {
-}
-NPM_CONFIG = NpmDependencyConfigs(**DEFAULT_GLOBAL_CONFIG)
-
-
-OLD_NODE_BIN_PATH = DATA_DIR / 'node_modules' / '.bin'
-NEW_NODE_BIN_PATH = CONSTANTS.LIB_NPM_DIR / 'node_modules' / '.bin'
-
-class SystemNpmBinProvider(NpmProvider, BaseBinProvider):
-    name: BinProviderName = "sys_npm"
-    
-    npm_prefix: Optional[Path] = None
-
-class LibNpmBinProvider(NpmProvider, BaseBinProvider):
-    name: BinProviderName = "lib_npm"
-    PATH: PATHStr = f'{NEW_NODE_BIN_PATH}:{OLD_NODE_BIN_PATH}'
-    
-    npm_prefix: Optional[Path] = CONSTANTS.LIB_NPM_DIR
-    
-    @model_validator(mode='after')
-    def validate_path(self):
-        assert self.npm_prefix == NEW_NODE_BIN_PATH.parent.parent
-        return self
-
-
-SYS_NPM_BINPROVIDER = SystemNpmBinProvider()
-LIB_NPM_BINPROVIDER = LibNpmBinProvider()
-npm = LIB_NPM_BINPROVIDER
-
-class NodeBinary(BaseBinary):
-    name: BinName = 'node'
-    binproviders_supported: List[InstanceOf[BinProvider]] = [apt, brew, env]
-    
-    overrides: BinaryOverrides = {
-        apt.name: {'packages': ['nodejs']},
-    }
-
-
-NODE_BINARY = NodeBinary()
-
-
-class NpmBinary(BaseBinary):
-    name: BinName = 'npm'
-    binproviders_supported: List[InstanceOf[BinProvider]] = [apt, brew, env]
-
-    overrides: BinaryOverrides = {
-        apt.name: {'packages': ['npm']},   # already installed when nodejs is installed
-        brew.name: {'install': lambda: None},  # already installed when nodejs is installed
-    }
-    
-NPM_BINARY = NpmBinary()
-
-
-class NpxBinary(BaseBinary):
-    name: BinName = 'npx'
-    binproviders_supported: List[InstanceOf[BinProvider]] = [apt, brew, env]
-    
-    overrides: BinaryOverrides = {
-        apt.name: {'install': lambda: None},   # already installed when nodejs is installed
-        brew.name: {'install': lambda: None},  # already installed when nodejs is installed
-    }
-
-NPX_BINARY = NpxBinary()
-
-
-
-
-
-class NpmPlugin(BasePlugin):
-    app_label: str = 'npm'
-    verbose_name: str = 'NPM'
-    
-    hooks: List[InstanceOf[BaseHook]] = [
-        NPM_CONFIG,
-        SYS_NPM_BINPROVIDER,
-        LIB_NPM_BINPROVIDER,
-        NODE_BINARY,
-        NPM_BINARY,
-        NPX_BINARY,
-    ]
-
-
-PLUGIN = NpmPlugin()
-# PLUGIN.register(settings)
-DJANGO_APP = PLUGIN.AppConfig

archivebox/plugins_pkg/npm/binaries.py

@@ -0,0 +1,48 @@
+__package__ = 'plugins_pkg.npm'
+
+
+from typing import List
+
+from pydantic import InstanceOf
+
+from pydantic_pkgr import BinProvider, BinName, BinaryOverrides
+
+
+from abx.archivebox.base_binary import BaseBinary, env, apt, brew
+
+
+class NodeBinary(BaseBinary):
+    name: BinName = 'node'
+    binproviders_supported: List[InstanceOf[BinProvider]] = [apt, brew, env]
+    
+    overrides: BinaryOverrides = {
+        apt.name: {'packages': ['nodejs']},
+    }
+
+
+NODE_BINARY = NodeBinary()
+
+
+class NpmBinary(BaseBinary):
+    name: BinName = 'npm'
+    binproviders_supported: List[InstanceOf[BinProvider]] = [apt, brew, env]
+
+    overrides: BinaryOverrides = {
+        apt.name: {'packages': ['npm']},   # already installed when nodejs is installed
+        brew.name: {'install': lambda: None},  # already installed when nodejs is installed
+    }
+    
+NPM_BINARY = NpmBinary()
+
+
+class NpxBinary(BaseBinary):
+    name: BinName = 'npx'
+    binproviders_supported: List[InstanceOf[BinProvider]] = [apt, brew, env]
+    
+    overrides: BinaryOverrides = {
+        apt.name: {'install': lambda: None},   # already installed when nodejs is installed
+        brew.name: {'install': lambda: None},  # already installed when nodejs is installed
+    }
+
+NPX_BINARY = NpxBinary()
+

archivebox/plugins_pkg/npm/binproviders.py

@@ -0,0 +1,40 @@
+__package__ = 'plugins_pkg.npm'
+
+from pathlib import Path
+from typing import Optional
+
+from pydantic import model_validator
+
+from pydantic_pkgr import NpmProvider, PATHStr, BinProviderName
+
+from archivebox.config import DATA_DIR, CONSTANTS
+
+from abx.archivebox.base_binary import BaseBinProvider
+
+
+
+OLD_NODE_BIN_PATH = DATA_DIR / 'node_modules' / '.bin'
+NEW_NODE_BIN_PATH = CONSTANTS.LIB_NPM_DIR / 'node_modules' / '.bin'
+
+
+class SystemNpmBinProvider(NpmProvider, BaseBinProvider):
+    name: BinProviderName = "sys_npm"
+    
+    npm_prefix: Optional[Path] = None
+
+
+class LibNpmBinProvider(NpmProvider, BaseBinProvider):
+    name: BinProviderName = "lib_npm"
+    PATH: PATHStr = f'{NEW_NODE_BIN_PATH}:{OLD_NODE_BIN_PATH}'
+    
+    npm_prefix: Optional[Path] = CONSTANTS.LIB_NPM_DIR
+    
+    @model_validator(mode='after')
+    def validate_path(self):
+        assert self.npm_prefix == NEW_NODE_BIN_PATH.parent.parent
+        return self
+
+
+SYS_NPM_BINPROVIDER = SystemNpmBinProvider()
+LIB_NPM_BINPROVIDER = LibNpmBinProvider()
+npm = LIB_NPM_BINPROVIDER

archivebox/plugins_pkg/npm/config.py

@@ -0,0 +1,20 @@
+__package__ = 'plugins_pkg.npm'
+
+
+from abx.archivebox.base_configset import BaseConfigSet
+
+
+###################### Config ##########################
+
+
+class NpmDependencyConfigs(BaseConfigSet):
+    # USE_NPM: bool = True
+    # NPM_BINARY: str = Field(default='npm')
+    # NPM_ARGS: Optional[List[str]] = Field(default=None)
+    # NPM_EXTRA_ARGS: List[str] = []
+    # NPM_DEFAULT_ARGS: List[str] = []
+    pass
+
+
+NPM_CONFIG = NpmDependencyConfigs()
+

archivebox/plugins_pkg/pip/__init__.py

@@ -0,0 +1,51 @@
+__package__ = 'plugins_pkg.pip'
+__label__ = 'pip'
+__version__ = '2024.10.14'
+__author__ = 'Nick Sweeting'
+__homepage__ = 'https://github.com/pypa/pip'
+
+import abx
+
+
+@abx.hookimpl
+def get_PLUGIN():
+    return {
+        'pip': {
+            'PACKAGE': __package__,
+            'LABEL': __label__,
+            'VERSION': __version__,
+            'AUTHOR': __author__,
+            'HOMEPAGE': __homepage__,
+        }
+    }
+
+@abx.hookimpl
+def get_CONFIG():
+    from .config import PIP_CONFIG
+    
+    return {
+        'pip': PIP_CONFIG
+    }
+
+@abx.hookimpl
+def get_BINARIES():
+    from .binaries import ARCHIVEBOX_BINARY, PYTHON_BINARY, DJANGO_BINARY, SQLITE_BINARY, PIP_BINARY, PIPX_BINARY
+    
+    return {
+        'archivebox': ARCHIVEBOX_BINARY,
+        'python': PYTHON_BINARY,
+        'django': DJANGO_BINARY,
+        'sqlite': SQLITE_BINARY,
+        'pip': PIP_BINARY,
+        'pipx': PIPX_BINARY,
+    }
+
+@abx.hookimpl
+def get_BINPROVIDERS():
+    from .binproviders import SYS_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, LIB_PIP_BINPROVIDER
+    
+    return {
+        'sys_pip': SYS_PIP_BINPROVIDER,
+        'venv_pip': VENV_PIP_BINPROVIDER,
+        'lib_pip': LIB_PIP_BINPROVIDER,
+    }

archivebox/plugins_pkg/pip/binaries.py

@@ -1,105 +1,27 @@
-__package__ = 'archivebox.plugins_pkg.pip'
+__package__ = 'plugins_pkg.pip'
 
-import os
 import sys
-import site
 from pathlib import Path
-from typing import List, Optional
-from pydantic import InstanceOf, Field, model_validator, validate_call
+from typing import List
+from pydantic import InstanceOf, Field, model_validator
 
 
 import django
 import django.db.backends.sqlite3.base
 from django.db.backends.sqlite3.base import Database as django_sqlite3     # type: ignore[import-type]
-from pydantic_pkgr import BinProvider, PipProvider, BinName, BinProviderName, BinaryOverrides, SemVer
+from pydantic_pkgr import BinProvider, BinName, BinaryOverrides, SemVer
 
-from archivebox.config import CONSTANTS, VERSION
+from archivebox import VERSION
 
-from abx.archivebox.base_plugin import BasePlugin
-from abx.archivebox.base_configset import BaseConfigSet
 from abx.archivebox.base_binary import BaseBinary, BaseBinProvider, env, apt, brew
-from abx.archivebox.base_hook import BaseHook
 
-from ...misc.logging import hint
+from archivebox.misc.logging import hint
 
+from .binproviders import LIB_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, SYS_PIP_BINPROVIDER
 
 ###################### Config ##########################
 
 
-class PipDependencyConfigs(BaseConfigSet):
-    USE_PIP: bool = True
-    PIP_BINARY: str = Field(default='pip')
-    PIP_ARGS: Optional[List[str]] = Field(default=None)
-    PIP_EXTRA_ARGS: List[str] = []
-    PIP_DEFAULT_ARGS: List[str] = []
-    
-PIP_CONFIG = PipDependencyConfigs()
-
-
-class SystemPipBinProvider(PipProvider, BaseBinProvider):
-    name: BinProviderName = "sys_pip"
-    INSTALLER_BIN: BinName = "pip"
-    
-    pip_venv: Optional[Path] = None        # global pip scope
-    
-    def on_install(self, bin_name: str, **kwargs):
-        # never modify system pip packages
-        return 'refusing to install packages globally with system pip, use a venv instead'
-
-class SystemPipxBinProvider(PipProvider, BaseBinProvider):
-    name: BinProviderName = "pipx"
-    INSTALLER_BIN: BinName = "pipx"
-    
-    pip_venv: Optional[Path] = None        # global pipx scope
-
-
-IS_INSIDE_VENV = sys.prefix != sys.base_prefix
-
-class VenvPipBinProvider(PipProvider, BaseBinProvider):
-    name: BinProviderName = "venv_pip"
-    INSTALLER_BIN: BinName = "pip"
-
-    pip_venv: Optional[Path] = Path(sys.prefix if IS_INSIDE_VENV else os.environ.get("VIRTUAL_ENV", '/tmp/NotInsideAVenv/lib'))
-    
-    def setup(self):
-        """never attempt to create a venv here, this is just used to detect if we are inside an existing one"""
-        return None
-    
-
-class LibPipBinProvider(PipProvider, BaseBinProvider):
-    name: BinProviderName = "lib_pip"
-    INSTALLER_BIN: BinName = "pip"
-    
-    pip_venv: Optional[Path] = CONSTANTS.LIB_PIP_DIR / 'venv'
-
-SYS_PIP_BINPROVIDER = SystemPipBinProvider()
-PIPX_PIP_BINPROVIDER = SystemPipxBinProvider()
-VENV_PIP_BINPROVIDER = VenvPipBinProvider()
-LIB_PIP_BINPROVIDER = LibPipBinProvider()
-pip = LIB_PIP_BINPROVIDER
-
-# ensure python libraries are importable from these locations (if archivebox wasnt executed from one of these then they wont already be in sys.path)
-assert VENV_PIP_BINPROVIDER.pip_venv is not None
-assert LIB_PIP_BINPROVIDER.pip_venv is not None
-
-major, minor, patch = sys.version_info[:3]
-site_packages_dir = f'lib/python{major}.{minor}/site-packages'
-
-LIB_SITE_PACKAGES = (LIB_PIP_BINPROVIDER.pip_venv / site_packages_dir,)
-VENV_SITE_PACKAGES = (VENV_PIP_BINPROVIDER.pip_venv / site_packages_dir,)
-USER_SITE_PACKAGES = site.getusersitepackages()
-SYS_SITE_PACKAGES = site.getsitepackages()
-
-ALL_SITE_PACKAGES = (
-    *LIB_SITE_PACKAGES,
-    *VENV_SITE_PACKAGES,
-    *USER_SITE_PACKAGES,
-    *SYS_SITE_PACKAGES,
-)
-for site_packages_dir in ALL_SITE_PACKAGES:
-    if site_packages_dir not in sys.path:
-        sys.path.append(str(site_packages_dir))
-
 
 class ArchiveboxBinary(BaseBinary):
     name: BinName = 'archivebox'
@@ -237,27 +159,3 @@ class PipxBinary(BaseBinary):
     binproviders_supported: List[InstanceOf[BinProvider]] = [LIB_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, SYS_PIP_BINPROVIDER, apt, brew, env]
 
 PIPX_BINARY = PipxBinary()
-
-
-class PipPlugin(BasePlugin):
-    app_label: str = 'pip'
-    verbose_name: str = 'PIP'
-
-    hooks: List[InstanceOf[BaseHook]] = [
-        PIP_CONFIG,
-        SYS_PIP_BINPROVIDER,
-        PIPX_PIP_BINPROVIDER,
-        VENV_PIP_BINPROVIDER,
-        LIB_PIP_BINPROVIDER,
-        PIP_BINARY,
-        PIPX_BINARY,
-        ARCHIVEBOX_BINARY,
-        PYTHON_BINARY,
-        SQLITE_BINARY,
-        DJANGO_BINARY,
-    ]
-
-
-PLUGIN = PipPlugin()
-# PLUGIN.register(settings)
-DJANGO_APP = PLUGIN.AppConfig

archivebox/plugins_pkg/pip/binproviders.py

@@ -0,0 +1,80 @@
+__package__ = 'plugins_pkg.pip'
+
+import os
+import sys
+import site
+from pathlib import Path
+from typing import Optional
+
+from pydantic_pkgr import PipProvider, BinName, BinProviderName
+
+from archivebox.config import CONSTANTS
+
+from abx.archivebox.base_binary import BaseBinProvider
+
+
+###################### Config ##########################
+
+class SystemPipBinProvider(PipProvider, BaseBinProvider):
+    name: BinProviderName = "sys_pip"
+    INSTALLER_BIN: BinName = "pip"
+    
+    pip_venv: Optional[Path] = None        # global pip scope
+    
+    def on_install(self, bin_name: str, **kwargs):
+        # never modify system pip packages
+        return 'refusing to install packages globally with system pip, use a venv instead'
+
+class SystemPipxBinProvider(PipProvider, BaseBinProvider):
+    name: BinProviderName = "pipx"
+    INSTALLER_BIN: BinName = "pipx"
+    
+    pip_venv: Optional[Path] = None        # global pipx scope
+
+
+IS_INSIDE_VENV = sys.prefix != sys.base_prefix
+
+class VenvPipBinProvider(PipProvider, BaseBinProvider):
+    name: BinProviderName = "venv_pip"
+    INSTALLER_BIN: BinName = "pip"
+
+    pip_venv: Optional[Path] = Path(sys.prefix if IS_INSIDE_VENV else os.environ.get("VIRTUAL_ENV", '/tmp/NotInsideAVenv/lib'))
+    
+    def setup(self):
+        """never attempt to create a venv here, this is just used to detect if we are inside an existing one"""
+        return None
+    
+
+class LibPipBinProvider(PipProvider, BaseBinProvider):
+    name: BinProviderName = "lib_pip"
+    INSTALLER_BIN: BinName = "pip"
+    
+    pip_venv: Optional[Path] = CONSTANTS.LIB_PIP_DIR / 'venv'
+
+SYS_PIP_BINPROVIDER = SystemPipBinProvider()
+PIPX_PIP_BINPROVIDER = SystemPipxBinProvider()
+VENV_PIP_BINPROVIDER = VenvPipBinProvider()
+LIB_PIP_BINPROVIDER = LibPipBinProvider()
+pip = LIB_PIP_BINPROVIDER
+
+# ensure python libraries are importable from these locations (if archivebox wasnt executed from one of these then they wont already be in sys.path)
+assert VENV_PIP_BINPROVIDER.pip_venv is not None
+assert LIB_PIP_BINPROVIDER.pip_venv is not None
+
+major, minor, patch = sys.version_info[:3]
+site_packages_dir = f'lib/python{major}.{minor}/site-packages'
+
+LIB_SITE_PACKAGES = (LIB_PIP_BINPROVIDER.pip_venv / site_packages_dir,)
+VENV_SITE_PACKAGES = (VENV_PIP_BINPROVIDER.pip_venv / site_packages_dir,)
+USER_SITE_PACKAGES = site.getusersitepackages()
+SYS_SITE_PACKAGES = site.getsitepackages()
+
+ALL_SITE_PACKAGES = (
+    *LIB_SITE_PACKAGES,
+    *VENV_SITE_PACKAGES,
+    *USER_SITE_PACKAGES,
+    *SYS_SITE_PACKAGES,
+)
+for site_packages_dir in ALL_SITE_PACKAGES:
+    if site_packages_dir not in sys.path:
+        sys.path.append(str(site_packages_dir))

archivebox/plugins_pkg/pip/config.py

@@ -0,0 +1,16 @@
+__package__ = 'pip'
+
+from typing import List, Optional
+from pydantic import Field
+
+from abx.archivebox.base_configset import BaseConfigSet
+
+
+class PipDependencyConfigs(BaseConfigSet):
+    USE_PIP: bool = True
+    PIP_BINARY: str = Field(default='pip')
+    PIP_ARGS: Optional[List[str]] = Field(default=None)
+    PIP_EXTRA_ARGS: List[str] = []
+    PIP_DEFAULT_ARGS: List[str] = []
+    
+PIP_CONFIG = PipDependencyConfigs()

archivebox/plugins_pkg/playwright/__init__.py

@@ -0,0 +1,44 @@
+__package__ = 'plugins_pkg.playwright'
+__label__ = 'playwright'
+__version__ = '2024.10.14'
+__author__ = 'Nick Sweeting'
+__homepage__ = 'https://github.com/microsoft/playwright-python'
+
+import abx
+
+
+@abx.hookimpl
+def get_PLUGIN():
+    return {
+        'playwright': {
+            'PACKAGE': __package__,
+            'LABEL': __label__,
+            'VERSION': __version__,
+            'AUTHOR': __author__,
+            'HOMEPAGE': __homepage__,
+        }
+    }
+
+@abx.hookimpl
+def get_CONFIG():
+    from .config import PLAYWRIGHT_CONFIG
+    
+    return {
+        'playwright': PLAYWRIGHT_CONFIG
+    }
+
+@abx.hookimpl
+def get_BINARIES():
+    from .binaries import PLAYWRIGHT_BINARY
+    
+    return {
+        'playwright': PLAYWRIGHT_BINARY,
+    }
+
+@abx.hookimpl
+def get_BINPROVIDERS():
+    from .binproviders import PLAYWRIGHT_BINPROVIDER
+    
+    return {
+        'playwright': PLAYWRIGHT_BINPROVIDER,
+    }

archivebox/plugins_pkg/playwright/binaries.py

@@ -0,0 +1,23 @@
+__package__ = 'plugins_pkg.playwright'
+
+from typing import List
+
+from pydantic import InstanceOf
+from pydantic_pkgr import BinName, BinProvider
+
+from abx.archivebox.base_binary import BaseBinary, env
+
+from plugins_pkg.pip.binproviders import SYS_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, LIB_PIP_BINPROVIDER
+
+from .config import PLAYWRIGHT_CONFIG
+
+
+
+
+class PlaywrightBinary(BaseBinary):
+    name: BinName = PLAYWRIGHT_CONFIG.PLAYWRIGHT_BINARY
+
+    binproviders_supported: List[InstanceOf[BinProvider]] = [LIB_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, SYS_PIP_BINPROVIDER, env]
+    
+
+PLAYWRIGHT_BINARY = PlaywrightBinary()

archivebox/plugins_pkg/playwright/binproviders.py

@@ -1,15 +1,13 @@
-__package__ = 'archivebox.plugins_pkg.playwright'
+__package__ = 'plugins_pkg.playwright'
 
 import os
 import platform
 from pathlib import Path
 from typing import List, Optional, Dict, ClassVar
 
-# Depends on other PyPI/vendor packages:
-from pydantic import InstanceOf, computed_field, Field
+from pydantic import computed_field, Field
 from pydantic_pkgr import (
     BinName,
-    BinProvider,
     BinProviderName,
     BinProviderOverrides,
     InstallArgs,
@@ -22,42 +20,15 @@ from pydantic_pkgr import (
 
 from archivebox.config import CONSTANTS
 
-# Depends on other Django apps:
-from abx.archivebox.base_plugin import BasePlugin
-from abx.archivebox.base_configset import BaseConfigSet
-from abx.archivebox.base_binary import BaseBinary, BaseBinProvider, env
-# from abx.archivebox.base_extractor import BaseExtractor
-# from abx.archivebox.base_queue import BaseQueue
-from abx.archivebox.base_hook import BaseHook
+from abx.archivebox.base_binary import BaseBinProvider, env
 
-from plugins_pkg.pip.apps import SYS_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, LIB_PIP_BINPROVIDER
+from plugins_pkg.pip.binproviders import SYS_PIP_BINPROVIDER
+
+from .binaries import PLAYWRIGHT_BINARY
 
 
-###################### Config ##########################
-
-
-class PlaywrightConfigs(BaseConfigSet):
-    # PLAYWRIGHT_BINARY: str = Field(default='wget')
-    # PLAYWRIGHT_ARGS: Optional[List[str]] = Field(default=None)
-    # PLAYWRIGHT_EXTRA_ARGS: List[str] = []
-    # PLAYWRIGHT_DEFAULT_ARGS: List[str] = ['--timeout={TIMEOUT-10}']
-    pass
-
-
-PLAYWRIGHT_CONFIG = PlaywrightConfigs()
-
-LIB_DIR_BROWSERS = CONSTANTS.LIB_BROWSERS_DIR
-
-
-
-class PlaywrightBinary(BaseBinary):
-    name: BinName = "playwright"
-
-    binproviders_supported: List[InstanceOf[BinProvider]] = [LIB_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, SYS_PIP_BINPROVIDER, env]
-    
-
-
-PLAYWRIGHT_BINARY = PlaywrightBinary()
+MACOS_PLAYWRIGHT_CACHE_DIR: Path = Path("~/Library/Caches/ms-playwright")
+LINUX_PLAYWRIGHT_CACHE_DIR: Path = Path("~/.cache/ms-playwright")
 
 
 class PlaywrightBinProvider(BaseBinProvider):
@@ -67,11 +38,11 @@ class PlaywrightBinProvider(BaseBinProvider):
     PATH: PATHStr = f"{CONSTANTS.LIB_BIN_DIR}:{DEFAULT_ENV_PATH}"
 
     playwright_browsers_dir: Path = (
-        Path("~/Library/Caches/ms-playwright").expanduser()      # macos playwright cache dir
+        MACOS_PLAYWRIGHT_CACHE_DIR.expanduser()
         if OPERATING_SYSTEM == "darwin" else
-        Path("~/.cache/ms-playwright").expanduser()              # linux playwright cache dir
+        LINUX_PLAYWRIGHT_CACHE_DIR.expanduser()
     )
-    playwright_install_args: List[str] = ["install"]              # --with-deps
+    playwright_install_args: List[str] = ["install"]
 
     packages_handler: BinProviderOverrides = Field(default={
         "chrome": ["chromium"],
@@ -183,21 +154,3 @@ class PlaywrightBinProvider(BaseBinProvider):
         return (proc.stderr.strip() + "\n" + proc.stdout.strip()).strip()
 
 PLAYWRIGHT_BINPROVIDER = PlaywrightBinProvider()
-
-
-
-class PlaywrightPlugin(BasePlugin):
-    app_label: str = 'playwright'
-    verbose_name: str = 'Playwright (PIP)'
-
-    hooks: List[InstanceOf[BaseHook]] = [
-        PLAYWRIGHT_CONFIG,
-        PLAYWRIGHT_BINPROVIDER,
-        PLAYWRIGHT_BINARY,
-    ]
-
-
-
-PLUGIN = PlaywrightPlugin()
-# PLUGIN.register(settings)
-DJANGO_APP = PLUGIN.AppConfig

archivebox/plugins_pkg/playwright/config.py

@@ -0,0 +1,10 @@
+__package__ = 'playwright'
+
+from abx.archivebox.base_configset import BaseConfigSet
+
+
+class PlaywrightConfigs(BaseConfigSet):
+    PLAYWRIGHT_BINARY: str = 'playwright'
+
+
+PLAYWRIGHT_CONFIG = PlaywrightConfigs()

archivebox/plugins_pkg/puppeteer/__init__.py

@@ -0,0 +1,46 @@
+__package__ = 'plugins_pkg.puppeteer'
+__label__ = 'puppeteer'
+__version__ = '2024.10.14'
+__author__ = 'Nick Sweeting'
+__homepage__ = 'https://github.com/puppeteer/puppeteer'
+__dependencies__ = ['npm']
+
+import abx
+
+
+@abx.hookimpl
+def get_PLUGIN():
+    return {
+        'puppeteer': {
+            'PACKAGE': __package__,
+            'LABEL': __label__,
+            'VERSION': __version__,
+            'AUTHOR': __author__,
+            'HOMEPAGE': __homepage__,
+            'DEPENDENCIES': __dependencies__,
+        }
+    }
+
+@abx.hookimpl
+def get_CONFIG():
+    from .config import PUPPETEER_CONFIG
+    
+    return {
+        'puppeteer': PUPPETEER_CONFIG
+    }
+
+@abx.hookimpl
+def get_BINARIES():
+    from .binaries import PUPPETEER_BINARY
+    
+    return {
+        'puppeteer': PUPPETEER_BINARY,
+    }
+
+@abx.hookimpl
+def get_BINPROVIDERS():
+    from .binproviders import PUPPETEER_BINPROVIDER
+    
+    return {
+        'puppeteer': PUPPETEER_BINPROVIDER,
+    }

archivebox/plugins_pkg/puppeteer/binaries.py

@@ -0,0 +1,23 @@
+__package__ = 'plugins_pkg.puppeteer'
+
+from typing import List
+
+from pydantic import InstanceOf
+from pydantic_pkgr import BinProvider, BinName
+
+
+from abx.archivebox.base_binary import BaseBinary, env
+
+from plugins_pkg.npm.binproviders import LIB_NPM_BINPROVIDER, SYS_NPM_BINPROVIDER
+
+
+###################### Config ##########################
+
+
+class PuppeteerBinary(BaseBinary):
+    name: BinName = "puppeteer"
+
+    binproviders_supported: List[InstanceOf[BinProvider]] = [LIB_NPM_BINPROVIDER, SYS_NPM_BINPROVIDER, env]
+
+
+PUPPETEER_BINARY = PuppeteerBinary()

archivebox/plugins_pkg/puppeteer/binproviders.py

@@ -1,14 +1,12 @@
-__package__ = 'archivebox.plugins_pkg.puppeteer'
+__package__ = 'plugins_pkg.puppeteer'
 
 import os
 import platform
 from pathlib import Path
 from typing import List, Optional, Dict, ClassVar
 
-# Depends on other PyPI/vendor packages:
-from pydantic import InstanceOf, Field
+from pydantic import Field
 from pydantic_pkgr import (
-    BinProvider,
     BinName,
     BinProviderName,
     BinProviderOverrides,
@@ -20,43 +18,14 @@ from pydantic_pkgr import (
 from archivebox.config import CONSTANTS
 from archivebox.config.permissions import ARCHIVEBOX_USER
 
-# Depends on other Django apps:
-from abx.archivebox.base_plugin import BasePlugin
-from abx.archivebox.base_configset import BaseConfigSet
-from abx.archivebox.base_binary import BaseBinary, BaseBinProvider, env
-# from abx.archivebox.base_extractor import BaseExtractor
-# from abx.archivebox.base_queue import BaseQueue
-from abx.archivebox.base_hook import BaseHook
+from abx.archivebox.base_binary import BaseBinProvider
 
-# Depends on Other Plugins:
-from plugins_pkg.npm.apps import LIB_NPM_BINPROVIDER, SYS_NPM_BINPROVIDER
+from plugins_pkg.npm.binproviders import SYS_NPM_BINPROVIDER
 
 
-###################### Config ##########################
-
-
-class PuppeteerConfigs(BaseConfigSet):
-    # PUPPETEER_BINARY: str = Field(default='wget')
-    # PUPPETEER_ARGS: Optional[List[str]] = Field(default=None)
-    # PUPPETEER_EXTRA_ARGS: List[str] = []
-    # PUPPETEER_DEFAULT_ARGS: List[str] = ['--timeout={TIMEOUT-10}']
-    pass
-
-
-PUPPETEER_CONFIG = PuppeteerConfigs()
-
 LIB_DIR_BROWSERS = CONSTANTS.LIB_BROWSERS_DIR
 
 
-class PuppeteerBinary(BaseBinary):
-    name: BinName = "puppeteer"
-
-    binproviders_supported: List[InstanceOf[BinProvider]] = [LIB_NPM_BINPROVIDER, SYS_NPM_BINPROVIDER, env]
-
-
-PUPPETEER_BINARY = PuppeteerBinary()
-
-
 class PuppeteerBinProvider(BaseBinProvider):
     name: BinProviderName = "puppeteer"
     INSTALLER_BIN: BinName = "npx"
@@ -157,20 +126,3 @@ PUPPETEER_BINPROVIDER = PuppeteerBinProvider()
 #         "binproviders_supported": self.binproviders_supported,
 #     }
 # )
-
-
-class PuppeteerPlugin(BasePlugin):
-    app_label: str ='puppeteer'
-    verbose_name: str = 'Puppeteer (NPM)'
-
-    hooks: List[InstanceOf[BaseHook]] = [
-        PUPPETEER_CONFIG,
-        PUPPETEER_BINPROVIDER,
-        PUPPETEER_BINARY,
-    ]
-
-
-
-PLUGIN = PuppeteerPlugin()
-# PLUGIN.register(settings)
-DJANGO_APP = PLUGIN.AppConfig

archivebox/plugins_pkg/puppeteer/config.py

@@ -0,0 +1,18 @@
+__package__ = 'plugins_pkg.puppeteer'
+
+
+from abx.archivebox.base_configset import BaseConfigSet
+
+
+###################### Config ##########################
+
+
+class PuppeteerConfig(BaseConfigSet):
+    PUPPETEER_BINARY: str = 'puppeteer'
+    # PUPPETEER_ARGS: Optional[List[str]] = Field(default=None)
+    # PUPPETEER_EXTRA_ARGS: List[str] = []
+    # PUPPETEER_DEFAULT_ARGS: List[str] = ['--timeout={TIMEOUT-10}']
+    pass
+
+
+PUPPETEER_CONFIG = PuppeteerConfig()