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