Change TASK_ID to PONOS_TASK

arkindex_worker/worker/base.py

@@ -136,16 +136,15 @@ class BaseWorker(object):
         if self.args.database is not None:
             self.use_cache = True
 
+        task_id = os.environ.get("PONOS_TASK")
         if self.use_cache is True:
             if self.args.database is not None:
                 assert os.path.isfile(
                     self.args.database
                 ), f"Database in {self.args.database} does not exist"
                 self.cache_path = self.args.database
-            elif os.environ.get("TASK_ID"):
-                cache_dir = os.path.join(
-                    os.environ.get("PONOS_DATA", "/data"), os.environ.get("TASK_ID")
-                )
+            elif task_id:
+                cache_dir = os.path.join(os.environ.get("PONOS_DATA", "/data"), task_id)
                 assert os.path.isdir(cache_dir), f"Missing task cache in {cache_dir}"
                 self.cache_path = os.path.join(cache_dir, "db.sqlite")
             else:
@@ -157,7 +156,6 @@ class BaseWorker(object):
             logger.debug("Cache is disabled")
 
         # Merging parents caches (if there are any) in the current task local cache, unless the database got overridden
-        task_id = os.environ.get("TASK_ID")
         if self.use_cache and self.args.database is None and task_id is not None:
             task = self.request("RetrieveTaskFromAgent", id=task_id)
             merge_parents_cache(

tests/conftest.py

@@ -174,11 +174,11 @@ def mock_elements_worker(monkeypatch, mock_worker_version_api):
 
 @pytest.fixture
 def mock_base_worker_with_cache(mocker, monkeypatch, mock_worker_version_api):
-    """Build a BaseWorker using SQLite cache, also mocking a TASK_ID"""
+    """Build a BaseWorker using SQLite cache, also mocking a PONOS_TASK"""
     monkeypatch.setattr(sys, "argv", ["worker"])
 
     worker = BaseWorker(use_cache=True)
-    monkeypatch.setenv("TASK_ID", "my_task")
+    monkeypatch.setenv("PONOS_TASK", "my_task")
     return worker