Oct 24, 2024 · Oct 24, 2024 · Oct 24, 2024 · Oct 24, 2024 · Oct 24, 2024 · Oct 24, 2024
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
        # TODO: remove this exception for windows once we get tests passing on that platform
        if: ${{ !contains(matrix.os, 'windows') }}
        run: |
          python -m pytest -s --basetemp=tests/out --ignore=archivebox/vendor --ignore=deb_dist --ignore=pip_dist --ignore=brew_dist
          python -m pytest -s --basetemp=tests/out --ignore=archivebox/pkgs

  docker_tests:
    runs-on: ubuntu-latest
diff --git a/.gitmodules b/.gitmodules
 [submodule "docs"]
    path = docs
    url = https://github.com/ArchiveBox/ArchiveBox.wiki.git
 [submodule "archivebox/vendor/pocket"]
 path = archivebox/vendor/pocket
 url = https://github.com/tapanpandita/pocket
 [submodule "archivebox/vendor/pydantic-pkgr"]
 path = archivebox/vendor/pydantic-pkgr
 url = https://github.com/ArchiveBox/pydantic-pkgr
diff --git a/archivebox/.flake8 b/archivebox/.flake8
 select = F,E9,W
 max-line-length = 130
 max-complexity = 10
 exclude = migrations,tests,node_modules,vendor,venv,.venv,.venv2,.docker-venv
 exclude = migrations,tests,node_modules,vendor,venv,.venv,.venv2,.docker-venv,data,data*
diff --git a/archivebox/__init__.py b/archivebox/__init__.py

 import os
 import sys

 from pathlib import Path
 from typing import cast

 ASCII_LOGO = """
 █████╗ ██████╗  ██████╗██╗  ██╗██╗██╗   ██╗███████╗ ██████╗  ██████╗ ██╗  ██╗


 # print('LOADING VENDORED LIBRARIES')
 from .vendor importload_vendored_libs           # noqa
 load_vendored_libs()
 from .pkgs importload_vendored_pkgs           # noqa
 load_vendored_pkgs()
 # print('DONE LOADING VENDORED LIBRARIES')

 # Load ABX Plugin Specifications + Default Implementations
 import abx                                       # noqa
 import abx_spec_archivebox                       # noqa
 import abx_spec_config                           # noqa
 import abx_spec_pydantic_pkgr                    # noqa
 import abx_spec_django                           # noqa
 import abx_spec_searchbackend                    # noqa

 abx.pm.add_hookspecs(abx_spec_config.PLUGIN_SPEC)
 abx.pm.register(abx_spec_config.PLUGIN_SPEC())

 abx.pm.add_hookspecs(abx_spec_pydantic_pkgr.PLUGIN_SPEC)
 abx.pm.register(abx_spec_pydantic_pkgr.PLUGIN_SPEC())

 abx.pm.add_hookspecs(abx_spec_django.PLUGIN_SPEC)
 abx.pm.register(abx_spec_django.PLUGIN_SPEC())

 abx.pm.add_hookspecs(abx_spec_searchbackend.PLUGIN_SPEC)
 abx.pm.register(abx_spec_searchbackend.PLUGIN_SPEC())

 # Cast to ArchiveBoxPluginSpec to enable static type checking of pm.hook.call() methods
 abx.pm = cast(abx.ABXPluginManager[abx_spec_archivebox.ArchiveBoxPluginSpec], abx.pm)
 pm = abx.pm


 # Load all pip-installed ABX-compatible plugins
 ABX_ECOSYSTEM_PLUGINS = abx.get_pip_installed_plugins(group='abx')

 # Load all built-in ArchiveBox plugins
 ARCHIVEBOX_BUILTIN_PLUGINS = {
    'config': PACKAGE_DIR / 'config',
    'core': PACKAGE_DIR / 'core',
    # 'search': PACKAGE_DIR / 'search',
    # 'core': PACKAGE_DIR / 'core',
 }

 # Load all user-defined ArchiveBox plugins
 USER_PLUGINS = abx.find_plugins_in_dir(Path(os.getcwd()) / 'user_plugins')

 # Import all plugins and register them with ABX Plugin Manager
 ALL_PLUGINS = {**ABX_ECOSYSTEM_PLUGINS, **ARCHIVEBOX_BUILTIN_PLUGINS, **USER_PLUGINS}
 LOADED_PLUGINS = abx.load_plugins(ALL_PLUGINS)

 # Setup basic config, constants, paths, and version
 from .config.constants import CONSTANTS                         # noqa
 from .config.paths import PACKAGE_DIR, DATA_DIR, ARCHIVE_DIR    # noqa
 from .config.version import VERSION                             # noqa
diff --git a/archivebox/abid_utils/models.py b/archivebox/abid_utils/models.py
            'uri': self.abid_uri_src,
            'subtype': self.abid_subtype_src,
            'rand': self.abid_rand_src,
            'salt': 'self.abid_salt',               # defined as static class vars at build time
            'salt': 'self.abid_salt',# defined as static class vars at build time
        }

    @property
diff --git a/archivebox/abx/__init__.py b/archivebox/abx/__init__.py
diff --git a/archivebox/abx/archivebox/__init__.py b/archivebox/abx/archivebox/__init__.py
diff --git a/archivebox/abx/archivebox/base_binary.py b/archivebox/abx/archivebox/base_binary.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -102,7 +102,7 @@ jobs:
		# TODO: remove this exception for windows once we get tests passing on that platform
		if: ${{ !contains(matrix.os, 'windows') }}
		run: \|
		python -m pytest -s --basetemp=tests/out --ignore=archivebox/vendor --ignore=deb_dist --ignore=pip_dist --ignore=brew_dist
		python -m pytest -s --basetemp=tests/out --ignore=archivebox/pkgs

		docker_tests:
		runs-on: ubuntu-latest
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,9 +1,3 @@
		[submodule "docs"]
		path = docs
		url = https://github.com/ArchiveBox/ArchiveBox.wiki.git
		[submodule "archivebox/vendor/pocket"]
		path = archivebox/vendor/pocket
		url = https://github.com/tapanpandita/pocket
		[submodule "archivebox/vendor/pydantic-pkgr"]
		path = archivebox/vendor/pydantic-pkgr
		url = https://github.com/ArchiveBox/pydantic-pkgr
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ ignore = D100,D101,D102,D103,D104,D105,D202,D203,D205,D400,E131,E241,E252,E266,E
		select = F,E9,W
		max-line-length = 130
		max-complexity = 10
		exclude = migrations,tests,node_modules,vendor,venv,.venv,.venv2,.docker-venv
		exclude = migrations,tests,node_modules,vendor,venv,.venv,.venv2,.docker-venv,data,data*
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,8 +13,8 @@

		import os
		import sys

		from pathlib import Path
		from typing import cast

		ASCII_LOGO = """
		█████╗ ██████╗ ██████╗██╗ ██╗██╗██╗ ██╗███████╗ ██████╗ ██████╗ ██╗ ██╗
Expand DownExpand Up		@@ -47,11 +47,54 @@


		# print('LOADING VENDORED LIBRARIES')
		from .vendor importload_vendored_libs # noqa
		load_vendored_libs()
		from .pkgs importload_vendored_pkgs # noqa
		load_vendored_pkgs()
		# print('DONE LOADING VENDORED LIBRARIES')

		# Load ABX Plugin Specifications + Default Implementations
		import abx # noqa
		import abx_spec_archivebox # noqa
		import abx_spec_config # noqa
		import abx_spec_pydantic_pkgr # noqa
		import abx_spec_django # noqa
		import abx_spec_searchbackend # noqa

		abx.pm.add_hookspecs(abx_spec_config.PLUGIN_SPEC)
		abx.pm.register(abx_spec_config.PLUGIN_SPEC())

		abx.pm.add_hookspecs(abx_spec_pydantic_pkgr.PLUGIN_SPEC)
		abx.pm.register(abx_spec_pydantic_pkgr.PLUGIN_SPEC())

		abx.pm.add_hookspecs(abx_spec_django.PLUGIN_SPEC)
		abx.pm.register(abx_spec_django.PLUGIN_SPEC())

		abx.pm.add_hookspecs(abx_spec_searchbackend.PLUGIN_SPEC)
		abx.pm.register(abx_spec_searchbackend.PLUGIN_SPEC())

		# Cast to ArchiveBoxPluginSpec to enable static type checking of pm.hook.call() methods
		abx.pm = cast(abx.ABXPluginManager[abx_spec_archivebox.ArchiveBoxPluginSpec], abx.pm)
		pm = abx.pm


		# Load all pip-installed ABX-compatible plugins
		ABX_ECOSYSTEM_PLUGINS = abx.get_pip_installed_plugins(group='abx')

		# Load all built-in ArchiveBox plugins
		ARCHIVEBOX_BUILTIN_PLUGINS = {
		'config': PACKAGE_DIR / 'config',
		'core': PACKAGE_DIR / 'core',
		# 'search': PACKAGE_DIR / 'search',
		# 'core': PACKAGE_DIR / 'core',
		}

		# Load all user-defined ArchiveBox plugins
		USER_PLUGINS = abx.find_plugins_in_dir(Path(os.getcwd()) / 'user_plugins')

		# Import all plugins and register them with ABX Plugin Manager
		ALL_PLUGINS = {ABX_ECOSYSTEM_PLUGINS, ARCHIVEBOX_BUILTIN_PLUGINS, **USER_PLUGINS}
		LOADED_PLUGINS = abx.load_plugins(ALL_PLUGINS)

		# Setup basic config, constants, paths, and version
		from .config.constants import CONSTANTS # noqa
		from .config.paths import PACKAGE_DIR, DATA_DIR, ARCHIVE_DIR # noqa
		from .config.version import VERSION # noqa
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -175,7 +175,7 @@ def ABID_SOURCES(self) -> Dict[str, str]:
		'uri': self.abid_uri_src,
		'subtype': self.abid_subtype_src,
		'rand': self.abid_rand_src,
		'salt': 'self.abid_salt', # defined as static class vars at build time
		'salt': 'self.abid_salt',# defined as static class vars at build time
		}

		@property
Expand Down