merge queues and actors apps into new workers app

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

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
 

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

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
 

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

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