diff --git a/arkindex/process/models.py b/arkindex/process/models.py index e0f1dd2eb7b0433c243e2356b52574c3b3792473..187621b93f8d4aa556d6b83d3dbdaa51ec95b035 100644 --- a/arkindex/process/models.py +++ b/arkindex/process/models.py @@ -586,7 +586,6 @@ class Process(IndexableModel): ) env['ARKINDEX_WORKER_RUN_ID'] = str(worker_run.id) - env['WORKER_VERSION_ID'] = str(worker_version.id) # Build the training task, as there is no initial task training_task = self.build_task( @@ -1257,7 +1256,6 @@ class WorkerRun(models.Model): ) task_env["TASK_ELEMENTS"] = elements_path - task_env["WORKER_VERSION_ID"] = str(self.version.id) task_env["ARKINDEX_WORKER_RUN_ID"] = str(self.id) if chunk: task_env['ARKINDEX_TASK_CHUNK'] = str(chunk) diff --git a/arkindex/process/tests/test_create_process.py b/arkindex/process/tests/test_create_process.py index eb44a7d035f5575cdbb11742a0d26f3ccad58e44..e4c6e6b68ef370f47a2516b230f3a4e8c2e34377 100644 --- a/arkindex/process/tests/test_create_process.py +++ b/arkindex/process/tests/test_create_process.py @@ -608,7 +608,6 @@ class TestCreateProcess(FixtureAPITestCase): self.assertEqual(list(reco_task.parents.all()), [init_task]) self.assertEqual(reco_task.env, { 'TASK_ELEMENTS': '/data/initialisation/elements.json', - 'WORKER_VERSION_ID': str(self.version_1.id), 'ARKINDEX_WORKER_RUN_ID': str(run_1.id), 'ARKINDEX_PROCESS_ID': str(process_2.id), 'ARKINDEX_CORPUS_ID': str(self.corpus.id), @@ -622,7 +621,6 @@ class TestCreateProcess(FixtureAPITestCase): self.assertEqual(list(dla_task.parents.all()), [reco_task]) self.assertEqual(dla_task.env, { 'TASK_ELEMENTS': '/data/initialisation/elements.json', - 'WORKER_VERSION_ID': str(self.version_2.id), 'ARKINDEX_WORKER_RUN_ID': str(run_2.id), 'ARKINDEX_PROCESS_ID': str(process_2.id), 'ARKINDEX_CORPUS_ID': str(self.corpus.id), @@ -702,7 +700,6 @@ class TestCreateProcess(FixtureAPITestCase): 'TASK_ELEMENTS': '/data/initialisation/elements.json', 'ARKINDEX_PROCESS_ID': str(process_2.id), 'ARKINDEX_WORKER_RUN_ID': str(process_2.worker_runs.get().id), - 'WORKER_VERSION_ID': str(self.version_1.id) }) self.assertEqual(len(worker_task.parents.all()), 1) self.assertEqual(worker_task.parents.first(), init_task) @@ -747,7 +744,6 @@ class TestCreateProcess(FixtureAPITestCase): 'ARKINDEX_CORPUS_ID': str(self.corpus.id), 'ARKINDEX_PROCESS_ID': str(process_2.id), 'ARKINDEX_WORKER_RUN_ID': str(process_2.worker_runs.get().id), - 'WORKER_VERSION_ID': str(self.version_3.id), 'ARKINDEX_TASK_TOKEN': '67891' }) self.assertEqual(worker_task.requires_gpu, True) diff --git a/arkindex/process/tests/test_create_training_process.py b/arkindex/process/tests/test_create_training_process.py index 991662a4455d1b61b4bacc105072e71b6f2952a6..c22fd6cf59d43bc0fd92b9628e85bf07ed8e9155 100644 --- a/arkindex/process/tests/test_create_training_process.py +++ b/arkindex/process/tests/test_create_training_process.py @@ -312,7 +312,6 @@ class TestCreateTrainingProcess(FixtureTestCase): 'ARKINDEX_PROCESS_ID': str(training_process.id), 'ARKINDEX_TASK_TOKEN': '12345', 'ARKINDEX_WORKER_RUN_ID': str(worker_run.id), - 'WORKER_VERSION_ID': str(self.training_worker_version.id), }) self.assertEqual(training_task.image, '1337') self.assertEqual(training_task.command, None) @@ -397,7 +396,6 @@ class TestCreateTrainingProcess(FixtureTestCase): 'ARKINDEX_PROCESS_ID', 'ARKINDEX_TASK_TOKEN', 'ARKINDEX_WORKER_RUN_ID', - 'WORKER_VERSION_ID', ]) self.assertEqual(task.requires_gpu, True) self.assertEqual(task.env['ARKINDEX_TASK_TOKEN'], task.token) @@ -430,7 +428,6 @@ class TestCreateTrainingProcess(FixtureTestCase): 'ARKINDEX_PROCESS_ID': str(training_process.id), 'ARKINDEX_TASK_TOKEN': '12345', 'ARKINDEX_WORKER_RUN_ID': str(worker_run.id), - 'WORKER_VERSION_ID': str(self.training_worker_version.id), }) self.assertEqual(task.slug, 'training') self.assertEqual(task.image, '1337') diff --git a/arkindex/process/tests/test_processes.py b/arkindex/process/tests/test_processes.py index 84fbc98fe011e97e55b704e9863407da35d08ef4..004bdcda8309ef36fc30c1eb4eadf9d36c3f4234 100644 --- a/arkindex/process/tests/test_processes.py +++ b/arkindex/process/tests/test_processes.py @@ -2561,7 +2561,6 @@ class TestProcesses(FixtureAPITestCase): 'ARKINDEX_CORPUS_ID': str(self.corpus.id), 'ARKINDEX_TASK_TOKEN': '78945', 'ARKINDEX_WORKER_RUN_ID': str(run.id), - 'WORKER_VERSION_ID': str(self.version_with_model.id), 'TASK_ELEMENTS': '/data/initialisation/elements.json' }) self.assertEqual(worker_task.image, run.version.docker_image_iid or run.version.docker_image_name) diff --git a/arkindex/process/tests/test_workerruns.py b/arkindex/process/tests/test_workerruns.py index 23547ea961c06ba34a4b701ecd4061d0065b84ed..e629556a5cd8699a9a02352d62a4e7850059bd60 100644 --- a/arkindex/process/tests/test_workerruns.py +++ b/arkindex/process/tests/test_workerruns.py @@ -2592,7 +2592,6 @@ class TestWorkerRuns(FixtureAPITestCase): 'ARKINDEX_PROCESS_ID': '12345', 'ARKINDEX_TASK_TOKEN': str(task.token), 'TASK_ELEMENTS': '/data/import/elements.json', - 'WORKER_VERSION_ID': str(self.version_1.id), 'ARKINDEX_WORKER_RUN_ID': str(self.run_1.id), }) @@ -2611,7 +2610,6 @@ class TestWorkerRuns(FixtureAPITestCase): 'ARKINDEX_TASK_TOKEN': str(task.token), 'ARKINDEX_TASK_CHUNK': '4', 'TASK_ELEMENTS': '/data/import/elements.json', - 'WORKER_VERSION_ID': str(self.version_1.id), 'ARKINDEX_WORKER_RUN_ID': str(self.run_1.id), }) @@ -2645,7 +2643,6 @@ class TestWorkerRuns(FixtureAPITestCase): 'ARKINDEX_PROCESS_ID': '12345', 'ARKINDEX_TASK_TOKEN': str(task.token), 'TASK_ELEMENTS': '/data/import/elements.json', - 'WORKER_VERSION_ID': str(version_2.id), 'ARKINDEX_WORKER_RUN_ID': str(run_2.id), }) @@ -2680,7 +2677,6 @@ class TestWorkerRuns(FixtureAPITestCase): 'ARKINDEX_TASK_TOKEN': str(task.token), 'ARKINDEX_TASK_CHUNK': '4', 'TASK_ELEMENTS': '/data/import/elements.json', - 'WORKER_VERSION_ID': str(version_2.id), 'ARKINDEX_WORKER_RUN_ID': str(run_2.id), }) @@ -2703,7 +2699,6 @@ class TestWorkerRuns(FixtureAPITestCase): 'ARKINDEX_PROCESS_ID': '12345', 'ARKINDEX_TASK_TOKEN': str(task.token), 'TASK_ELEMENTS': '/data/import/elements.json', - 'WORKER_VERSION_ID': str(self.version_1.id), 'ARKINDEX_WORKER_RUN_ID': str(self.run_1.id), })