diff --git a/archivebox/__init__.py b/archivebox/__init__.py index 136546e8..bd283106 100755 --- a/archivebox/__init__.py +++ b/archivebox/__init__.py @@ -82,11 +82,10 @@ ABX_ECOSYSTEM_PLUGINS = abx.get_pip_installed_plugins(group='abx') # Load all built-in ArchiveBox plugins ARCHIVEBOX_BUILTIN_PLUGINS = { 'config': PACKAGE_DIR / 'config', + 'workers': PACKAGE_DIR / 'workers', 'core': PACKAGE_DIR / 'core', 'crawls': PACKAGE_DIR / 'crawls', - 'queues': PACKAGE_DIR / 'queues', 'seeds': PACKAGE_DIR / 'seeds', - 'actors': PACKAGE_DIR / 'actors', # 'search': PACKAGE_DIR / 'search', # 'core': PACKAGE_DIR / 'core', } diff --git a/archivebox/actors/__init__.py b/archivebox/actors/__init__.py deleted file mode 100644 index 211642ad..00000000 --- a/archivebox/actors/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -__package__ = 'archivebox.actors' -__order__ = 100 diff --git a/archivebox/actors/admin.py b/archivebox/actors/admin.py deleted file mode 100644 index 8c38f3f3..00000000 --- a/archivebox/actors/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/archivebox/actors/apps.py b/archivebox/actors/apps.py deleted file mode 100644 index 2347ac3f..00000000 --- a/archivebox/actors/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class ActorsConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "actors" diff --git a/archivebox/actors/templates/jobs_dashboard.html b/archivebox/actors/templates/jobs_dashboard.html deleted file mode 100644 index dabc8e03..00000000 --- a/archivebox/actors/templates/jobs_dashboard.html +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - Job Dashboard - - - -

Job Dashboard ♻️ {{now}}}

-
- - - - diff --git a/archivebox/api/v1_api.py b/archivebox/api/v1_api.py index a684c932..eab40d74 100644 --- a/archivebox/api/v1_api.py +++ b/archivebox/api/v1_api.py @@ -41,7 +41,7 @@ def register_urls(api: NinjaAPI) -> NinjaAPI: api.add_router('/core/', 'api.v1_core.router') api.add_router('/crawls/', 'api.v1_crawls.router') api.add_router('/cli/', 'api.v1_cli.router') - api.add_router('/jobs/', 'api.v1_actors.router') + api.add_router('/workers/', 'api.v1_workers.router') return api diff --git a/archivebox/api/v1_actors.py b/archivebox/api/v1_workers.py similarity index 93% rename from archivebox/api/v1_actors.py rename to archivebox/api/v1_workers.py index b29e89a1..4eebe7e3 100644 --- a/archivebox/api/v1_actors.py +++ b/archivebox/api/v1_workers.py @@ -31,7 +31,7 @@ class TaskSchema(Schema): class ActorSchema(Schema): - # TYPE: str = 'actors.actor.ActorType' + # TYPE: str = 'workers.actor.ActorType' # name: str #pid: int | None @@ -97,7 +97,7 @@ class ActorSchema(Schema): class OrchestratorSchema(Schema): - # TYPE: str = 'actors.orchestrator.Orchestrator' + # TYPE: str = 'workers.orchestrator.Orchestrator' #pid: int | None exit_on_idle: bool @@ -114,7 +114,7 @@ class OrchestratorSchema(Schema): def get_orchestrators(request): """List all the task orchestrators (aka Orchestrators) that are currently running""" - from actors.orchestrator import Orchestrator + from workers.orchestrator import Orchestrator orchestrator = Orchestrator() return [orchestrator] @@ -124,6 +124,6 @@ def get_orchestrators(request): def get_actors(request): """List all the task consumer workers (aka Actors) that are currently running""" - from actors.orchestrator import Orchestrator + from workers.orchestrator import Orchestrator orchestrator = Orchestrator() return orchestrator.actor_types.values() diff --git a/archivebox/cli/archivebox_add.py b/archivebox/cli/archivebox_add.py index 577f5190..1e945a9b 100644 --- a/archivebox/cli/archivebox_add.py +++ b/archivebox/cli/archivebox_add.py @@ -53,7 +53,7 @@ def add(urls: str | list[str], from seeds.models import Seed from crawls.models import Crawl - from actors.orchestrator import Orchestrator + from workers.orchestrator import Orchestrator from abid_utils.models import get_or_create_system_user_pk diff --git a/archivebox/cli/archivebox_update.py b/archivebox/cli/archivebox_update.py index 38850363..d816b0c0 100644 --- a/archivebox/cli/archivebox_update.py +++ b/archivebox/cli/archivebox_update.py @@ -28,7 +28,7 @@ def update(): from archivebox.config.django import setup_django setup_django() - from actors.orchestrator import Orchestrator + from workers.orchestrator import Orchestrator orchestrator = Orchestrator(exit_on_idle=False) orchestrator.start() diff --git a/archivebox/config/views.py b/archivebox/config/views.py index ba0f14fd..2a13d498 100644 --- a/archivebox/config/views.py +++ b/archivebox/config/views.py @@ -7,7 +7,6 @@ from typing import Any, List, Dict, cast from benedict import benedict from django.http import HttpRequest -from django.conf import settings from django.utils import timezone from django.utils.html import format_html, mark_safe @@ -304,7 +303,7 @@ def worker_list_view(request: HttpRequest, **kwargs) -> TableContext: "Exit Status": [], } - from queues.supervisor_util import get_existing_supervisord_process + from workers.supervisor_util import get_existing_supervisord_process supervisor = get_existing_supervisord_process() if supervisor is None: @@ -374,8 +373,10 @@ def worker_list_view(request: HttpRequest, **kwargs) -> TableContext: def worker_detail_view(request: HttpRequest, key: str, **kwargs) -> ItemContext: assert request.user.is_superuser, "Must be a superuser to view configuration settings." - from queues.supervisor_util import get_existing_supervisord_process, get_worker - from queues.settings import SUPERVISORD_CONFIG_FILE + from workers.supervisor_util import get_existing_supervisord_process, get_worker, get_sock_file, CONFIG_FILE_NAME + + SOCK_FILE = get_sock_file() + CONFIG_FILE = SOCK_FILE.parent / CONFIG_FILE_NAME supervisor = get_existing_supervisord_process() if supervisor is None: @@ -388,7 +389,7 @@ def worker_detail_view(request: HttpRequest, key: str, **kwargs) -> ItemContext: all_config = cast(List[Dict[str, Any]], supervisor.getAllConfigInfo() or []) if key == 'supervisord': - relevant_config = SUPERVISORD_CONFIG_FILE.read_text() + relevant_config = CONFIG_FILE.read_text() relevant_logs = cast(str, supervisor.readLog(0, 10_000_000)) start_ts = [line for line in relevant_logs.split("\n") if "RPC interface 'supervisor' initialized" in line][-1].split(",", 1)[0] uptime = str(timezone.now() - parse_date(start_ts)).split(".")[0] @@ -475,8 +476,6 @@ def log_list_view(request: HttpRequest, **kwargs) -> TableContext: @render_with_item_view def log_detail_view(request: HttpRequest, key: str, **kwargs) -> ItemContext: assert request.user.is_superuser, "Must be a superuser to view configuration settings." - - from django.conf import settings log_file = [logfile for logfile in CONSTANTS.LOGS_DIR.glob('*.log') if key in logfile.name][0] diff --git a/archivebox/core/admin_snapshots.py b/archivebox/core/admin_snapshots.py index 15383190..4f6ff945 100644 --- a/archivebox/core/admin_snapshots.py +++ b/archivebox/core/admin_snapshots.py @@ -25,7 +25,7 @@ from archivebox.extractors import archive_links from archivebox.main import remove from archivebox.abid_utils.admin import ABIDModelAdmin -from archivebox.queues.tasks import bg_archive_links, bg_add +from archivebox.workers.tasks import bg_archive_links, bg_add from core.models import Tag from core.admin_tags import TagInline diff --git a/archivebox/core/models.py b/archivebox/core/models.py index 19fc75e1..6a4f6d17 100644 --- a/archivebox/core/models.py +++ b/archivebox/core/models.py @@ -26,8 +26,8 @@ import abx from archivebox.config import CONSTANTS from abid_utils.models import ABIDModel, ABIDField, AutoDateTimeField, ModelWithOutputDir -from actors.models import ModelWithStateMachine -from queues.tasks import bg_archive_snapshot +from workers.models import ModelWithStateMachine +from workers.tasks import bg_archive_snapshot from crawls.models import Crawl # from machine.models import Machine, NetworkInterface diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py index 7bd98ee5..43853df2 100644 --- a/archivebox/core/settings.py +++ b/archivebox/core/settings.py @@ -61,11 +61,10 @@ INSTALLED_APPS = [ 'django_object_actions', # provides easy Django Admin action buttons on change views https://github.com/crccheck/django-object-actions # Our ArchiveBox-provided apps - # 'abid_utils', # handles ABID ID creation, handling, and models + # 'abid_utils', # handles ABID ID creation, handling, and models 'config', # ArchiveBox config settings (loaded as a plugin, don't need to add it here) 'machine', # handles collecting and storing information about the host machine, network interfaces, installed binaries, etc. - 'actors', # handles starting and managing background workers and processes (orchestrators and actors) - 'queues', # handles starting and managing background workers and processes (supervisord) + 'workers', # handles starting and managing background workers and processes (orchestrators and actors) 'seeds', # handles Seed model and URL source management 'crawls', # handles Crawl and CrawlSchedule models and management 'personas', # handles Persona and session management diff --git a/archivebox/core/statemachines.py b/archivebox/core/statemachines.py index 3e72265f..6fbca260 100644 --- a/archivebox/core/statemachines.py +++ b/archivebox/core/statemachines.py @@ -8,7 +8,7 @@ from django.utils import timezone from statemachine import State, StateMachine -from actors.actor import ActorType +from workers.actor import ActorType from core.models import Snapshot, ArchiveResult diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py index 0622d1aa..c8b3bed9 100644 --- a/archivebox/core/urls.py +++ b/archivebox/core/urls.py @@ -10,7 +10,7 @@ from archivebox.misc.serve_static import serve_static from core.admin_site import archivebox_admin from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView -from actors.views import JobsDashboardView +from workers.views import JobsDashboardView # GLOBAL_CONTEXT doesn't work as-is, disabled for now: https://github.com/ArchiveBox/ArchiveBox/discussions/1306 # from archivebox.config import VERSION, VERSIONS_AVAILABLE, CAN_UPGRADE diff --git a/archivebox/core/views.py b/archivebox/core/views.py index ac4f41ee..a6ad7d9e 100644 --- a/archivebox/core/views.py +++ b/archivebox/core/views.py @@ -25,7 +25,7 @@ import archivebox from core.models import Snapshot from core.forms import AddLinkForm -from queues.tasks import bg_add +from workers.tasks import bg_add from archivebox.config import CONSTANTS_CONFIG, DATA_DIR, VERSION from archivebox.config.common import SHELL_CONFIG, SERVER_CONFIG diff --git a/archivebox/crawls/models.py b/archivebox/crawls/models.py index ebda8e0d..e0f8a299 100644 --- a/archivebox/crawls/models.py +++ b/archivebox/crawls/models.py @@ -10,7 +10,7 @@ from django.conf import settings from django.urls import reverse_lazy from django.utils import timezone -from actors.models import ModelWithStateMachine +from workers.models import ModelWithStateMachine if TYPE_CHECKING: from core.models import Snapshot, ArchiveResult diff --git a/archivebox/crawls/statemachines.py b/archivebox/crawls/statemachines.py index 8f76c98b..a62c4b40 100644 --- a/archivebox/crawls/statemachines.py +++ b/archivebox/crawls/statemachines.py @@ -6,7 +6,7 @@ from django.utils import timezone from statemachine import State, StateMachine -from actors.actor import ActorType +from workers.actor import ActorType from crawls.models import Crawl diff --git a/archivebox/main.py b/archivebox/main.py index 88b07f10..63dba52c 100755 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -675,8 +675,8 @@ def add(urls: Union[str, List[str]], """Add a new URL or list of URLs to your archive""" from core.models import Snapshot, Tag - # from queues.supervisor_util import start_cli_workers, tail_worker_logs - # from queues.tasks import bg_archive_link + # from workers.supervisor_util import start_cli_workers, tail_worker_logs + # from workers.tasks import bg_archive_link assert depth in (0, 1), 'Depth must be 0 or 1 (depth >1 is not supported yet)' @@ -873,7 +873,7 @@ def update(resume: Optional[float]=None, from core.models import ArchiveResult from .search import index_links - # from .queues.supervisor_util import start_cli_workers + # from workers.supervisor_util import start_cli_workers check_data_folder() @@ -1494,7 +1494,7 @@ def server(runserver_args: Optional[List[str]]=None, runserver_args.append('--noreload') # '--insecure' call_command("runserver", *runserver_args) else: - from queues.supervisor_util import start_server_workers + from workers.supervisor_util import start_server_workers print() start_server_workers(host=host, port=port, daemonize=False) diff --git a/archivebox/pkgs/abx-plugin-singlefile/abx_plugin_singlefile/actors.py b/archivebox/pkgs/abx-plugin-singlefile/abx_plugin_singlefile/actors.py index d928d0fd..b7b56c6f 100644 --- a/archivebox/pkgs/abx-plugin-singlefile/abx_plugin_singlefile/actors.py +++ b/archivebox/pkgs/abx-plugin-singlefile/abx_plugin_singlefile/actors.py @@ -1,27 +1,27 @@ -__package__ = 'abx_plugin_singlefile' +# __package__ = 'abx_plugin_singlefile' -from typing import ClassVar -from django.db.models import QuerySet -from django.utils.functional import classproperty +# from typing import ClassVar +# from django.db.models import QuerySet +# from django.utils.functional import classproperty -from actors.actor import ActorType +# from workers.actor import ActorType -from .models import SinglefileResult +# from .models import SinglefileResult -class SinglefileActor(ActorType[SinglefileResult]): - CLAIM_ORDER: ClassVar[str] = 'created_at DESC' - CLAIM_WHERE: ClassVar[str] = 'status = "queued" AND extractor = "favicon"' - CLAIM_SET: ClassVar[str] = 'status = "started"' +# class SinglefileActor(ActorType[SinglefileResult]): +# CLAIM_ORDER: ClassVar[str] = 'created_at DESC' +# CLAIM_WHERE: ClassVar[str] = 'status = "queued" AND extractor = "favicon"' +# CLAIM_SET: ClassVar[str] = 'status = "started"' - @classproperty - def QUERYSET(cls) -> QuerySet: - return SinglefileResult.objects.filter(status='queued') +# @classproperty +# def QUERYSET(cls) -> QuerySet: +# return SinglefileResult.objects.filter(status='queued') - def tick(self, obj: SinglefileResult): - print(f'[grey53]{self}.tick({obj.abid or obj.id}, status={obj.status}) remaining:[/grey53]', self.get_queue().count()) - updated = SinglefileResult.objects.filter(id=obj.id, status='started').update(status='success') == 1 - if not updated: - raise Exception(f'Failed to update {obj.abid or obj.id}, interrupted by another actor writing to the same object') - obj.refresh_from_db() - obj.save() +# def tick(self, obj: SinglefileResult): +# print(f'[grey53]{self}.tick({obj.abid or obj.id}, status={obj.status}) remaining:[/grey53]', self.get_queue().count()) +# updated = SinglefileResult.objects.filter(id=obj.id, status='started').update(status='success') == 1 +# if not updated: +# raise Exception(f'Failed to update {obj.abid or obj.id}, interrupted by another actor writing to the same object') +# obj.refresh_from_db() +# obj.save() diff --git a/archivebox/pkgs/abx-plugin-wget/abx_plugin_wget/extractors.py b/archivebox/pkgs/abx-plugin-wget/abx_plugin_wget/extractors.py index ad9bcf86..30389513 100644 --- a/archivebox/pkgs/abx-plugin-wget/abx_plugin_wget/extractors.py +++ b/archivebox/pkgs/abx-plugin-wget/abx_plugin_wget/extractors.py @@ -13,11 +13,11 @@ class WgetExtractor(BaseExtractor): name: ExtractorName = 'wget' binary: BinName = WGET_BINARY.name - def get_output_path(self, snapshot) -> Path | None: - wget_index_path = wget_output_path(snapshot.as_link()) - if wget_index_path: - return Path(wget_index_path) - return None + def get_output_path(self, snapshot) -> str: + # wget_index_path = wget_output_path(snapshot.as_link()) + # if wget_index_path: + # return Path(wget_index_path) + return 'wget' WGET_EXTRACTOR = WgetExtractor() diff --git a/archivebox/pkgs/abx-spec-config/abx_spec_config/__init__.py b/archivebox/pkgs/abx-spec-config/abx_spec_config/__init__.py index 2c705201..f55e7f53 100644 --- a/archivebox/pkgs/abx-spec-config/abx_spec_config/__init__.py +++ b/archivebox/pkgs/abx-spec-config/abx_spec_config/__init__.py @@ -65,16 +65,16 @@ class ConfigPluginSpec: def get_SCOPE_CONFIG(extra=None, archiveresult=None, snapshot=None, crawl=None, user=None, request=None, collection=..., environment=..., machine=..., default=...) -> dict[ConfigKeyStr, Any]: """Get the config as it applies to you right now, based on the current context""" return benedict({ - **pm.hook.get_default_config(default=default), - **pm.hook.get_machine_config(machine=machine), - **pm.hook.get_environment_config(environment=environment), - **pm.hook.get_collection_config(collection=collection), - **pm.hook.get_user_config(user=user), - **pm.hook.get_crawl_config(crawl=crawl), - **pm.hook.get_snapshot_config(snapshot=snapshot), - **pm.hook.get_archiveresult_config(archiveresult=archiveresult), - **pm.hook.get_request_config(request=request), - **(extra or {}), + **pm.hook.get_default_config(default=default), # schema defaults defined in source code + **pm.hook.get_machine_config(machine=machine), # machine defaults set on the Machine model + **pm.hook.get_environment_config(environment=environment), # env config set for just this run on this machine + **pm.hook.get_collection_config(collection=collection), # collection defaults set in ArchiveBox.conf + **pm.hook.get_user_config(user=user), # user config set on User model + **pm.hook.get_request_config(request=request), # extra config derived from the current request + **pm.hook.get_crawl_config(crawl=crawl), # extra config set on the Crawl model + **pm.hook.get_snapshot_config(snapshot=snapshot), # extra config set on the Snapshot model + **pm.hook.get_archiveresult_config(archiveresult=archiveresult), # extra config set on the ArchiveResult model + **(extra or {}), # extra config passed in by the caller }) @staticmethod diff --git a/archivebox/queues/__init__.py b/archivebox/queues/__init__.py deleted file mode 100644 index 24e8643f..00000000 --- a/archivebox/queues/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -__package__ = 'archivebox.queues' - -import abx - -@abx.hookimpl -def register_admin(admin_site): - from queues.admin import register_admin - register_admin(admin_site) diff --git a/archivebox/queues/migrations/__init__.py b/archivebox/queues/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/archivebox/workers/__init__.py b/archivebox/workers/__init__.py new file mode 100644 index 00000000..9ced0d60 --- /dev/null +++ b/archivebox/workers/__init__.py @@ -0,0 +1,9 @@ +__package__ = 'archivebox.workers' +__order__ = 100 + +import abx + +@abx.hookimpl +def register_admin(admin_site): + from workers.admin import register_admin + register_admin(admin_site) diff --git a/archivebox/actors/actor.py b/archivebox/workers/actor.py similarity index 99% rename from archivebox/actors/actor.py rename to archivebox/workers/actor.py index ec0b2984..e4d57ae6 100644 --- a/archivebox/actors/actor.py +++ b/archivebox/workers/actor.py @@ -1,4 +1,4 @@ -__package__ = 'archivebox.actors' +__package__ = 'archivebox.workers' import os import time diff --git a/archivebox/queues/admin.py b/archivebox/workers/admin.py similarity index 95% rename from archivebox/queues/admin.py rename to archivebox/workers/admin.py index aee5788b..dc7d8958 100644 --- a/archivebox/queues/admin.py +++ b/archivebox/workers/admin.py @@ -1,4 +1,4 @@ -__package__ = 'archivebox.queues' +__package__ = 'archivebox.workers' import abx diff --git a/archivebox/queues/apps.py b/archivebox/workers/apps.py similarity index 63% rename from archivebox/queues/apps.py rename to archivebox/workers/apps.py index 4811fab1..1cb787aa 100644 --- a/archivebox/queues/apps.py +++ b/archivebox/workers/apps.py @@ -1,7 +1,7 @@ from django.apps import AppConfig -class QueuesConfig(AppConfig): +class WorkersConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'queues' + name = 'workers' diff --git a/archivebox/actors/management/commands/orchestrator.py b/archivebox/workers/management/commands/orchestrator.py similarity index 89% rename from archivebox/actors/management/commands/orchestrator.py rename to archivebox/workers/management/commands/orchestrator.py index eb02e0f6..e74170b3 100644 --- a/archivebox/actors/management/commands/orchestrator.py +++ b/archivebox/workers/management/commands/orchestrator.py @@ -2,7 +2,7 @@ from django.core.management.base import BaseCommand -from actors.orchestrator import ArchivingOrchestrator +from workers.orchestrator import ArchivingOrchestrator class Command(BaseCommand): diff --git a/archivebox/actors/migrations/__init__.py b/archivebox/workers/migrations/__init__.py similarity index 100% rename from archivebox/actors/migrations/__init__.py rename to archivebox/workers/migrations/__init__.py diff --git a/archivebox/actors/models.py b/archivebox/workers/models.py similarity index 97% rename from archivebox/actors/models.py rename to archivebox/workers/models.py index 36aa191a..84026005 100644 --- a/archivebox/actors/models.py +++ b/archivebox/workers/models.py @@ -60,7 +60,7 @@ class BaseModelWithStateMachine(models.Model, MachineMixin): f'{cls.__name__}.{field.name} must have choices set to {cls.__name__}.StatusChoices.choices', hint=f'{cls.__name__}.{field.name}.choices = {getattr(field, "choices", None)!r}', obj=cls, - id='actors.E011', + id='workers.E011', )) if getattr(field, '_is_retry_at_field', False): if cls.retry_at_field_name == field.name: @@ -73,14 +73,14 @@ class BaseModelWithStateMachine(models.Model, MachineMixin): f'{cls.__name__}.state_field_name must be defined and point to a StatusField()', hint=f'{cls.__name__}.state_field_name = {cls.state_field_name!r} but {cls.__name__}.{cls.state_field_name!r} was not found or does not refer to StatusField', obj=cls, - id='actors.E012', + id='workers.E012', )) if not found_retry_at_field: errors.append(checks.Error( f'{cls.__name__}.retry_at_field_name must be defined and point to a RetryAtField()', hint=f'{cls.__name__}.retry_at_field_name = {cls.retry_at_field_name!r} but {cls.__name__}.{cls.retry_at_field_name!r} was not found or does not refer to RetryAtField', obj=cls, - id='actors.E013', + id='workers.E013', )) if not found_id_field: @@ -88,7 +88,7 @@ class BaseModelWithStateMachine(models.Model, MachineMixin): f'{cls.__name__} must have an id field that is a primary key', hint=f'{cls.__name__}.id = {cls.id!r}', obj=cls, - id='actors.E014', + id='workers.E014', )) if not isinstance(cls.state_machine_name, str): @@ -96,7 +96,7 @@ class BaseModelWithStateMachine(models.Model, MachineMixin): f'{cls.__name__}.state_machine_name must be a dotted-import path to a StateMachine class', hint=f'{cls.__name__}.state_machine_name = {cls.state_machine_name!r}', obj=cls, - id='actors.E015', + id='workers.E015', )) try: @@ -106,7 +106,7 @@ class BaseModelWithStateMachine(models.Model, MachineMixin): f'{cls.__name__}.state_machine_name must point to a valid StateMachine class, but got {type(err).__name__} {err} when trying to access {cls.__name__}.StateMachineClass', hint=f'{cls.__name__}.state_machine_name = {cls.state_machine_name!r}', obj=cls, - id='actors.E016', + id='workers.E016', )) if cls.INITIAL_STATE not in cls.StatusChoices.values: @@ -114,7 +114,7 @@ class BaseModelWithStateMachine(models.Model, MachineMixin): f'{cls.__name__}.StateMachineClass.initial_state must be present within {cls.__name__}.StatusChoices', hint=f'{cls.__name__}.StateMachineClass.initial_state = {cls.StateMachineClass.initial_state!r}', obj=cls, - id='actors.E017', + id='workers.E017', )) if cls.ACTIVE_STATE not in cls.StatusChoices.values: @@ -122,7 +122,7 @@ class BaseModelWithStateMachine(models.Model, MachineMixin): f'{cls.__name__}.active_state must be set to a valid State present within {cls.__name__}.StatusChoices', hint=f'{cls.__name__}.active_state = {cls.active_state!r}', obj=cls, - id='actors.E018', + id='workers.E018', )) @@ -132,7 +132,7 @@ class BaseModelWithStateMachine(models.Model, MachineMixin): f'{cls.__name__}.StateMachineClass.final_states must all be present within {cls.__name__}.StatusChoices', hint=f'{cls.__name__}.StateMachineClass.final_states = {cls.StateMachineClass.final_states!r}', obj=cls, - id='actors.E019', + id='workers.E019', )) break return errors diff --git a/archivebox/actors/orchestrator.py b/archivebox/workers/orchestrator.py similarity index 99% rename from archivebox/actors/orchestrator.py rename to archivebox/workers/orchestrator.py index 01e3475f..b2da179f 100644 --- a/archivebox/actors/orchestrator.py +++ b/archivebox/workers/orchestrator.py @@ -1,4 +1,4 @@ -__package__ = 'archivebox.actors' +__package__ = 'archivebox.workers' import os import time diff --git a/archivebox/queues/semaphores.py b/archivebox/workers/semaphores.py similarity index 100% rename from archivebox/queues/semaphores.py rename to archivebox/workers/semaphores.py diff --git a/archivebox/queues/supervisor_util.py b/archivebox/workers/supervisor_util.py similarity index 99% rename from archivebox/queues/supervisor_util.py rename to archivebox/workers/supervisor_util.py index 3ba5d633..f57fc7ce 100644 --- a/archivebox/queues/supervisor_util.py +++ b/archivebox/workers/supervisor_util.py @@ -1,4 +1,4 @@ -__package__ = 'archivebox.queues' +__package__ = 'archivebox.workers' import sys import time diff --git a/archivebox/queues/tasks.py b/archivebox/workers/tasks.py similarity index 99% rename from archivebox/queues/tasks.py rename to archivebox/workers/tasks.py index 6f62a8c1..e6e3adc3 100644 --- a/archivebox/queues/tasks.py +++ b/archivebox/workers/tasks.py @@ -1,4 +1,4 @@ -__package__ = 'archivebox.queues' +__package__ = 'archivebox.workers' from functools import wraps # from django.utils import timezone diff --git a/archivebox/actors/tests.py b/archivebox/workers/tests.py similarity index 100% rename from archivebox/actors/tests.py rename to archivebox/workers/tests.py diff --git a/archivebox/actors/views.py b/archivebox/workers/views.py similarity index 100% rename from archivebox/actors/views.py rename to archivebox/workers/views.py