new vastly simplified plugin spec without pydantic

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()