cleanup

Author: sanderegg

services/director-v2/tests/helpers/shared_comp_utils.py

@@ -4,7 +4,6 @@
 
 import httpx
 from models_library.api_schemas_directorv2.comp_tasks import ComputationGet
-from models_library.clusters import ClusterID
 from models_library.projects import ProjectAtDB
 from models_library.projects_pipeline import PipelineDetails
 from models_library.projects_state import RunningState
@@ -26,8 +25,7 @@ async def assert_computation_task_out_obj(
     exp_task_state: RunningState,
     exp_pipeline_details: PipelineDetails,
     iteration: PositiveInt | None,
-    cluster_id: ClusterID | None,
-):
+) -> None:
     assert task_out.id == project.uuid
     assert task_out.state == exp_task_state
     assert task_out.url.path == f"/v2/computations/{project.uuid}"
@@ -41,7 +39,6 @@ async def assert_computation_task_out_obj(
     else:
         assert task_out.stop_url is None
     assert task_out.iteration == iteration
-    assert task_out.cluster_id == cluster_id
     # check pipeline details contents
     received_task_out_pipeline = task_out.pipeline_details.model_dump()
     expected_task_out_pipeline = exp_pipeline_details.model_dump()

services/director-v2/tests/integration/01/test_computation_api.py

@@ -21,7 +21,7 @@
     assert_computation_task_out_obj,
 )
 from models_library.api_schemas_directorv2.comp_tasks import ComputationGet
-from models_library.clusters import DEFAULT_CLUSTER_ID, ClusterAuthentication
+from models_library.clusters import ClusterAuthentication
 from models_library.projects import ProjectAtDB
 from models_library.projects_nodes import NodeState
 from models_library.projects_nodes_io import NodeID
@@ -463,7 +463,6 @@ def _convert_to_pipeline_details(
         exp_task_state=RunningState.PUBLISHED,
         exp_pipeline_details=expected_pipeline_details,
         iteration=1,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
     # now wait for the computation to finish
@@ -479,7 +478,6 @@ def _convert_to_pipeline_details(
         exp_task_state=RunningState.SUCCESS,
         exp_pipeline_details=expected_pipeline_details_after_run,
         iteration=1,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
     # run it a second time. the tasks are all up-to-date, nothing should be run
@@ -531,7 +529,6 @@ def _convert_to_pipeline_details(
         exp_task_state=RunningState.PUBLISHED,
         exp_pipeline_details=expected_pipeline_details_forced,
         iteration=2,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
     # now wait for the computation to finish
@@ -572,7 +569,6 @@ async def test_run_computation(
         exp_task_state=RunningState.PUBLISHED,
         exp_pipeline_details=fake_workbench_computational_pipeline_details,
         iteration=1,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
     # wait for the computation to start
@@ -595,7 +591,6 @@ async def test_run_computation(
         exp_task_state=RunningState.SUCCESS,
         exp_pipeline_details=fake_workbench_computational_pipeline_details_completed,
         iteration=1,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
     # NOTE: currently the webserver is the one updating the projects table so we need to fake this by copying the run_hash
@@ -642,7 +637,6 @@ async def test_run_computation(
         exp_task_state=RunningState.PUBLISHED,
         exp_pipeline_details=expected_pipeline_details_forced,  # NOTE: here the pipeline already ran so its states are different
         iteration=2,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
     # wait for the computation to finish
@@ -655,7 +649,6 @@ async def test_run_computation(
         exp_task_state=RunningState.SUCCESS,
         exp_pipeline_details=fake_workbench_computational_pipeline_details_completed,
         iteration=2,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
 
@@ -692,7 +685,6 @@ async def test_abort_computation(
         exp_task_state=RunningState.PUBLISHED,
         exp_pipeline_details=fake_workbench_computational_pipeline_details,
         iteration=1,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
     # wait until the pipeline is started
@@ -765,7 +757,6 @@ async def test_update_and_delete_computation(
         exp_task_state=RunningState.NOT_STARTED,
         exp_pipeline_details=fake_workbench_computational_pipeline_details_not_started,
         iteration=None,
-        cluster_id=None,
     )
 
     # update the pipeline
@@ -784,7 +775,6 @@ async def test_update_and_delete_computation(
         exp_task_state=RunningState.NOT_STARTED,
         exp_pipeline_details=fake_workbench_computational_pipeline_details_not_started,
         iteration=None,
-        cluster_id=None,
     )
 
     # update the pipeline
@@ -803,7 +793,6 @@ async def test_update_and_delete_computation(
         exp_task_state=RunningState.NOT_STARTED,
         exp_pipeline_details=fake_workbench_computational_pipeline_details_not_started,
         iteration=None,
-        cluster_id=None,
     )
 
     # start it now
@@ -821,7 +810,6 @@ async def test_update_and_delete_computation(
         exp_task_state=RunningState.PUBLISHED,
         exp_pipeline_details=fake_workbench_computational_pipeline_details,
         iteration=1,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
 
     # wait until the pipeline is started

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

@@ -29,7 +29,7 @@
     assert_computation_task_out_obj,
 )
 from models_library.api_schemas_directorv2.comp_tasks import ComputationGet
-from models_library.clusters import DEFAULT_CLUSTER_ID, ClusterAuthentication
+from models_library.clusters import ClusterAuthentication
 from models_library.projects import (
     Node,
     NodesDict,
@@ -983,7 +983,6 @@ async def test_nodeports_integration(
         exp_task_state=RunningState.SUCCESS,
         exp_pipeline_details=PipelineDetails.model_validate(fake_dy_success),
         iteration=1,
-        cluster_id=DEFAULT_CLUSTER_ID,
     )
     update_project_workbench_with_comp_tasks(str(current_study.uuid))
 

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_route_computations.py

@@ -4,6 +4,7 @@
 # pylint: disable=too-many-arguments
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
+# pylint: disable=too-many-positional-arguments
 
 import datetime as dt
 import json