feat: replace ComputePlan EMPTY, TODO & WAITINGby CREATED

Signed-off-by: Guilhem Barthés <guilhem.barthes@owkin.com>
Substra · Feb 26, 2024 · 533b506 · 533b506
1 parent 0ecfbd6
commit 533b506
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/substra/sdk/backends/local/backend.py b/substra/sdk/backends/local/backend.py
@@ -213,7 +213,7 @@ def __add_compute_plan(
             key=key,
             creation_date=self.__now(),
             start_date=self.__now(),
-            status=models.ComputePlanStatus.waiting,
+            status=models.ComputePlanStatus.created,
             tag="",
             name=key,
             task_count=task_count,
@@ -244,7 +244,7 @@ def __create_compute_plan_from_task(self, spec, in_tasks):
             # Add to the compute plan
             compute_plan.task_count += 1
             compute_plan.waiting_executor_slot_count += 1
-            compute_plan.status = models.ComputePlanStatus.waiting
+            compute_plan.status = models.ComputePlanStatus.created
 
         elif not spec.compute_plan_key and (spec.rank == 0 or spec.rank is None):
             # Create a compute plan
@@ -388,7 +388,7 @@ def _add_compute_plan(self, spec: schemas.ComputePlanSpec, spec_options: dict =
             start_date=self.__now(),
             tag=spec.tag or "",
             name=spec.name,
-            status=models.ComputePlanStatus.empty,
+            status=models.ComputePlanStatus.created,
             metadata=spec.metadata or dict(),
             task_count=0,
             waiting_builder_slot_count=0,

diff --git a/substra/sdk/models.py b/substra/sdk/models.py
@@ -51,10 +51,8 @@ class ComputePlanStatus(str, enum.Enum):
     doing = "PLAN_STATUS_DOING"
     done = "PLAN_STATUS_DONE"
     failed = "PLAN_STATUS_FAILED"
-    todo = "PLAN_STATUS_TODO"
-    waiting = "PLAN_STATUS_WAITING"
+    created = "PLAN_STATUS_CREATED"
     canceled = "PLAN_STATUS_CANCELED"
-    empty = "PLAN_STATUS_EMPTY"
 
 
 class FunctionStatus(str, enum.Enum):

diff --git a/tests/sdk/local/test_debug.py b/tests/sdk/local/test_debug.py
@@ -82,7 +82,7 @@ def test_compute_plan_add_update_tasks(self, asset_factory, clients):
             )
         )
 
-        assert compute_plan.status == models.ComputePlanStatus.empty
+        assert compute_plan.status == models.ComputePlanStatus.created
 
         dataset_query = asset_factory.create_dataset()
         dataset_key = client.add_dataset(dataset_query)

diff --git a/tests/sdk/test_wait.py b/tests/sdk/test_wait.py
@@ -61,7 +61,7 @@ def test_wait_task_failed(client, mocker):
         (datastore.TRAINTASK, "wait_task", ComputeTaskStatus.waiting_for_parent_tasks),
         (datastore.TRAINTASK, "wait_task", ComputeTaskStatus.waiting_for_builder_slot),
         (datastore.TRAINTASK, "wait_task", ComputeTaskStatus.waiting_for_executor_slot),
-        (datastore.COMPUTE_PLAN, "wait_compute_plan", ComputePlanStatus.todo),
+        (datastore.COMPUTE_PLAN, "wait_compute_plan", ComputePlanStatus.created),
     ],
     ids=_param_name_maker,
 )