@sanderegg change names

Author: bisgaard-itis

services/director-v2/src/simcore_service_director_v2/api/routes/computations.py

@@ -464,9 +464,9 @@ async def get_computation(
             detail="The tasks referenced by the pipeline are missing",
         ) from exc
     # create the complete DAG graph
-    complete_dag = create_complete_dag_from_tasks(pipeline_info.all_tasks)
+    complete_dag = create_complete_dag_from_tasks(pipeline_info.project_tasks)
     pipeline_details = await compute_pipeline_details(
-        complete_dag, pipeline_info.pipeline_dag, pipeline_info.filtered_tasks
+        complete_dag, pipeline_info.pipeline_dag, pipeline_info.pipeline_tasks
     )
 
     # get run details if any
@@ -499,10 +499,10 @@ async def get_computation(
         iteration=last_run.iteration if last_run else None,
         result=None,
         started=compute_pipeline_started_timestamp(
-            pipeline_info.pipeline_dag, pipeline_info.all_tasks
+            pipeline_info.pipeline_dag, pipeline_info.project_tasks
         ),
         stopped=compute_pipeline_stopped_timestamp(
-            pipeline_info.pipeline_dag, pipeline_info.all_tasks
+            pipeline_info.pipeline_dag, pipeline_info.project_tasks
         ),
         submitted=last_run.created if last_run else None,
     )

services/director-v2/src/simcore_service_director_v2/api/routes/computations_tasks.py

@@ -65,7 +65,7 @@ async def get_all_tasks_log_files(
             status_code=status.HTTP_409_CONFLICT,
             detail="The tasks referenced by the pipeline are missing",
         ) from exc
-    iter_task_ids = (t.node_id for t in info.filtered_tasks)
+    iter_task_ids = (t.node_id for t in info.pipeline_tasks)
 
     tasks_logs_files: list[TaskLogFileGet] = await logged_gather(
         *[

services/director-v2/src/simcore_service_director_v2/api/rpc/_computations_tasks.py

@@ -35,7 +35,7 @@ async def get_computation_task_log_file_ids(
     except (PipelineNotFoundError, PipelineTaskMissingError) as exc:
         raise ComputationalTaskMissingError(project_id=project_id) from exc
 
-    iter_task_ids = (t.node_id for t in info.filtered_tasks)
+    iter_task_ids = (t.node_id for t in info.pipeline_tasks)
 
     return [
         TaskLogFileIdGet(

services/director-v2/src/simcore_service_director_v2/models/comp_tasks.py

@@ -281,7 +281,7 @@ class ComputationTaskForRpcDBGet(BaseModel):
 
 class PipelineInfo(BaseModel):
     pipeline_dag: nx.DiGraph
-    all_tasks: list[CompTaskAtDB]
-    filtered_tasks: list[CompTaskAtDB]
+    project_tasks: list[CompTaskAtDB]
+    pipeline_tasks: list[CompTaskAtDB]
 
     model_config = ConfigDict(arbitrary_types_allowed=True)

services/director-v2/src/simcore_service_director_v2/utils/computations_tasks.py

@@ -31,7 +31,9 @@ async def _get_pipeline_info(
     ]
 
     return PipelineInfo(
-        pipeline_dag=pipeline_dag, all_tasks=all_tasks, filtered_tasks=filtered_tasks
+        pipeline_dag=pipeline_dag,
+        project_tasks=all_tasks,
+        pipeline_tasks=filtered_tasks,
     )
 
 
@@ -54,7 +56,7 @@ async def validate_pipeline(
     )
 
     # check that we have the expected tasks
-    if len(pipeline_info.filtered_tasks) != len(pipeline_info.pipeline_dag):
+    if len(pipeline_info.pipeline_tasks) != len(pipeline_info.pipeline_dag):
         raise PipelineTaskMissingError(project_id=project_id)
 
     return pipeline_info