From 1e3ce67834ceb9ac843ad9ad7a780ad9839a9a20 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <github@sweeting.me>
Date: Mon, 18 Nov 2024 02:25:49 -0800
Subject: [PATCH] fix API and CLU calls

---
 archivebox/api/v1_actors.py      | 10 ++++------
 archivebox/cli/archivebox_add.py |  9 ++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/archivebox/api/v1_actors.py b/archivebox/api/v1_actors.py
index edf838c3..b35ce608 100644
--- a/archivebox/api/v1_actors.py
+++ b/archivebox/api/v1_actors.py
@@ -42,9 +42,7 @@ class ActorSchema(Schema):
     
     model: str
     statemachine: str
-    STATE_FIELD_NAME: str
-    # ACTIVE_STATE: str
-    FINAL_STATES: list[str]
+    ACTIVE_STATE: str
     EVENT_NAME: str
     CLAIM_ORDER: list[str]
     CLAIM_FROM_TOP_N: int
@@ -67,9 +65,9 @@ class ActorSchema(Schema):
     def resolve_name(obj) -> str:
         return str(obj)
 
-    # @staticmethod
-    # def resolve_ACTIVE_STATE(obj) -> str:
-    #     return str(obj.ACTIVE_STATE)
+    @staticmethod
+    def resolve_ACTIVE_STATE(obj) -> str:
+        return str(obj.ACTIVE_STATE)
     
     @staticmethod
     def resolve_FINAL_STATES(obj) -> list[str]:
diff --git a/archivebox/cli/archivebox_add.py b/archivebox/cli/archivebox_add.py
index 60f17d97..a33b25de 100644
--- a/archivebox/cli/archivebox_add.py
+++ b/archivebox/cli/archivebox_add.py
@@ -64,8 +64,11 @@ def add(urls: str | list[str],
     sources_file.write_text(urls if isinstance(urls, str) else '\n'.join(urls))
     
     # 2. create a new Seed pointing to the sources/2024-11-05__23-59-59__cli_add.txt
-    cmd = ' '.join(sys.argv)
-    seed = Seed.from_file(sources_file, label=f'{USER}@{HOSTNAME} $ {cmd}', parser=parser, tag=tag, created_by=created_by_id, config={
+    cli_args = [*sys.argv]
+    if cli_args[0].lower().endswith('archivebox'):
+        cli_args[0] = 'archivebox'  # full path to archivebox bin to just archivebox e.g. /Volumes/NVME/Users/squash/archivebox/.venv/bin/archivebox -> archivebox
+    cmd_str = ' '.join(cli_args)
+    seed = Seed.from_file(sources_file, label=f'{USER}@{HOSTNAME} $ {cmd_str}', parser=parser, tag=tag, created_by=created_by_id, config={
         'ONLY_NEW': not update,
         'INDEX_ONLY': index_only,
         'OVERWRITE': overwrite,
@@ -80,7 +83,7 @@ def add(urls: str | list[str],
     # from crawls.actors import CrawlActor
     # from core.actors import SnapshotActor, ArchiveResultActor
 
-    orchestrator = Orchestrator(exit_on_idle=True)
+    orchestrator = Orchestrator(exit_on_idle=True, max_concurrent_actors=2)
     orchestrator.start()
     
     # 5. return the list of new Snapshots created