4040from faker import Faker
4141from fastapi .applications import FastAPI
4242from models_library .api_schemas_directorv2 .services import NodeRequirements
43- from models_library .clusters import ClusterID , ClusterTypeInModel , NoAuthentication
43+ from models_library .clusters import ClusterTypeInModel , NoAuthentication
4444from models_library .docker import to_simcore_runtime_docker_label_key
4545from models_library .projects import ProjectID
4646from models_library .projects_nodes_io import NodeID
@@ -433,7 +433,6 @@ async def test_send_computation_task(
433433 user_id : UserID ,
434434 project_id : ProjectID ,
435435 node_id : NodeID ,
436- cluster_id : ClusterID ,
437436 image_params : ImageParams ,
438437 _mocked_node_ports : None ,
439438 mocked_user_completed_cb : mock .AsyncMock ,
@@ -481,7 +480,6 @@ def fake_sidecar_fct(
481480 node_id_to_job_ids = await dask_client .send_computation_tasks (
482481 user_id = user_id ,
483482 project_id = project_id ,
484- cluster_id = cluster_id ,
485483 tasks = image_params .fake_tasks ,
486484 callback = mocked_user_completed_cb ,
487485 remote_fct = functools .partial (
@@ -552,7 +550,6 @@ async def test_computation_task_is_persisted_on_dask_scheduler(
552550 dask_client : DaskClient ,
553551 user_id : UserID ,
554552 project_id : ProjectID ,
555- cluster_id : ClusterID ,
556553 image_params : ImageParams ,
557554 _mocked_node_ports : None ,
558555 mocked_user_completed_cb : mock .AsyncMock ,
@@ -589,7 +586,6 @@ def fake_sidecar_fct(
589586 published_computation_task = await dask_client .send_computation_tasks (
590587 user_id = user_id ,
591588 project_id = project_id ,
592- cluster_id = cluster_id ,
593589 tasks = image_params .fake_tasks ,
594590 callback = mocked_user_completed_cb ,
595591 remote_fct = fake_sidecar_fct ,
@@ -639,7 +635,6 @@ async def test_abort_computation_tasks(
639635 dask_client : DaskClient ,
640636 user_id : UserID ,
641637 project_id : ProjectID ,
642- cluster_id : ClusterID ,
643638 image_params : ImageParams ,
644639 _mocked_node_ports : None ,
645640 mocked_user_completed_cb : mock .AsyncMock ,
@@ -680,7 +675,6 @@ def fake_remote_fct(
680675 published_computation_task = await dask_client .send_computation_tasks (
681676 user_id = user_id ,
682677 project_id = project_id ,
683- cluster_id = cluster_id ,
684678 tasks = image_params .fake_tasks ,
685679 callback = mocked_user_completed_cb ,
686680 remote_fct = fake_remote_fct ,
@@ -731,7 +725,6 @@ async def test_failed_task_returns_exceptions(
731725 dask_client : DaskClient ,
732726 user_id : UserID ,
733727 project_id : ProjectID ,
734- cluster_id : ClusterID ,
735728 gpu_image : ImageParams ,
736729 _mocked_node_ports : None ,
737730 mocked_user_completed_cb : mock .AsyncMock ,
@@ -753,7 +746,6 @@ def fake_failing_sidecar_fct(
753746 published_computation_task = await dask_client .send_computation_tasks (
754747 user_id = user_id ,
755748 project_id = project_id ,
756- cluster_id = cluster_id ,
757749 tasks = gpu_image .fake_tasks ,
758750 callback = mocked_user_completed_cb ,
759751 remote_fct = fake_failing_sidecar_fct ,
@@ -795,7 +787,6 @@ async def test_send_computation_task_with_missing_resources_raises(
795787 dask_client : DaskClient ,
796788 user_id : UserID ,
797789 project_id : ProjectID ,
798- cluster_id : ClusterID ,
799790 image_params : ImageParams ,
800791 _mocked_node_ports : None ,
801792 mocked_user_completed_cb : mock .AsyncMock ,
@@ -823,7 +814,6 @@ async def test_send_computation_task_with_missing_resources_raises(
823814 await dask_client .send_computation_tasks (
824815 user_id = user_id ,
825816 project_id = project_id ,
826- cluster_id = cluster_id ,
827817 tasks = image_params .fake_tasks ,
828818 callback = mocked_user_completed_cb ,
829819 remote_fct = None ,
@@ -841,7 +831,6 @@ async def test_send_computation_task_with_hardware_info_raises(
841831 dask_client : DaskClient ,
842832 user_id : UserID ,
843833 project_id : ProjectID ,
844- cluster_id : ClusterID ,
845834 image_params : ImageParams ,
846835 _mocked_node_ports : None ,
847836 mocked_user_completed_cb : mock .AsyncMock ,
@@ -854,7 +843,6 @@ async def test_send_computation_task_with_hardware_info_raises(
854843 await dask_client .send_computation_tasks (
855844 user_id = user_id ,
856845 project_id = project_id ,
857- cluster_id = cluster_id ,
858846 tasks = image_params .fake_tasks ,
859847 callback = mocked_user_completed_cb ,
860848 remote_fct = None ,
@@ -872,7 +860,6 @@ async def test_too_many_resources_send_computation_task(
872860 user_id : UserID ,
873861 project_id : ProjectID ,
874862 node_id : NodeID ,
875- cluster_id : ClusterID ,
876863 _mocked_node_ports : None ,
877864 mocked_user_completed_cb : mock .AsyncMock ,
878865 mocked_storage_service_api : respx .MockRouter ,
@@ -896,7 +883,6 @@ async def test_too_many_resources_send_computation_task(
896883 await dask_client .send_computation_tasks (
897884 user_id = user_id ,
898885 project_id = project_id ,
899- cluster_id = cluster_id ,
900886 tasks = fake_task ,
901887 callback = mocked_user_completed_cb ,
902888 remote_fct = None ,
@@ -912,7 +898,6 @@ async def test_disconnected_backend_raises_exception(
912898 dask_client : DaskClient ,
913899 user_id : UserID ,
914900 project_id : ProjectID ,
915- cluster_id : ClusterID ,
916901 cpu_image : ImageParams ,
917902 _mocked_node_ports : None ,
918903 mocked_user_completed_cb : mock .AsyncMock ,
@@ -926,7 +911,6 @@ async def test_disconnected_backend_raises_exception(
926911 await dask_client .send_computation_tasks (
927912 user_id = user_id ,
928913 project_id = project_id ,
929- cluster_id = cluster_id ,
930914 tasks = cpu_image .fake_tasks ,
931915 callback = mocked_user_completed_cb ,
932916 remote_fct = None ,
@@ -944,7 +928,6 @@ async def test_changed_scheduler_raises_exception(
944928 dask_client : DaskClient ,
945929 user_id : UserID ,
946930 project_id : ProjectID ,
947- cluster_id : ClusterID ,
948931 cpu_image : ImageParams ,
949932 _mocked_node_ports : None ,
950933 mocked_user_completed_cb : mock .AsyncMock ,
@@ -976,7 +959,6 @@ async def test_changed_scheduler_raises_exception(
976959 await dask_client .send_computation_tasks (
977960 user_id = user_id ,
978961 project_id = project_id ,
979- cluster_id = cluster_id ,
980962 tasks = cpu_image .fake_tasks ,
981963 callback = mocked_user_completed_cb ,
982964 remote_fct = None ,
@@ -991,7 +973,6 @@ async def test_get_tasks_status(
991973 dask_client : DaskClient ,
992974 user_id : UserID ,
993975 project_id : ProjectID ,
994- cluster_id : ClusterID ,
995976 cpu_image : ImageParams ,
996977 _mocked_node_ports : None ,
997978 mocked_user_completed_cb : mock .AsyncMock ,
@@ -1022,7 +1003,6 @@ def fake_remote_fct(
10221003 published_computation_task = await dask_client .send_computation_tasks (
10231004 user_id = user_id ,
10241005 project_id = project_id ,
1025- cluster_id = cluster_id ,
10261006 tasks = cpu_image .fake_tasks ,
10271007 callback = mocked_user_completed_cb ,
10281008 remote_fct = fake_remote_fct ,
@@ -1082,7 +1062,6 @@ async def test_dask_sub_handlers(
10821062 dask_client : DaskClient ,
10831063 user_id : UserID ,
10841064 project_id : ProjectID ,
1085- cluster_id : ClusterID ,
10861065 cpu_image : ImageParams ,
10871066 _mocked_node_ports : None ,
10881067 mocked_user_completed_cb : mock .AsyncMock ,
@@ -1114,7 +1093,6 @@ def fake_remote_fct(
11141093 published_computation_task = await dask_client .send_computation_tasks (
11151094 user_id = user_id ,
11161095 project_id = project_id ,
1117- cluster_id = cluster_id ,
11181096 tasks = cpu_image .fake_tasks ,
11191097 callback = mocked_user_completed_cb ,
11201098 remote_fct = fake_remote_fct ,
@@ -1153,7 +1131,6 @@ async def test_get_cluster_details(
11531131 dask_client : DaskClient ,
11541132 user_id : UserID ,
11551133 project_id : ProjectID ,
1156- cluster_id : ClusterID ,
11571134 image_params : ImageParams ,
11581135 _mocked_node_ports : None ,
11591136 mocked_user_completed_cb : mock .AsyncMock ,
@@ -1190,7 +1167,6 @@ def fake_sidecar_fct(
11901167 published_computation_task = await dask_client .send_computation_tasks (
11911168 user_id = user_id ,
11921169 project_id = project_id ,
1193- cluster_id = cluster_id ,
11941170 tasks = image_params .fake_tasks ,
11951171 callback = mocked_user_completed_cb ,
11961172 remote_fct = functools .partial (
0 commit comments