Add force_delete option when calling delete() on job runs.

Author: qiuosier

ads/jobs/builders/infrastructure/dsc_job.py

@@ -376,12 +376,13 @@ def delete(self, force_delete: bool = False) -> DSCJob:
         """
         runs = self.run_list()
         for run in runs:
-            if run.lifecycle_state in [
-                DataScienceJobRun.LIFECYCLE_STATE_ACCEPTED,
-                DataScienceJobRun.LIFECYCLE_STATE_IN_PROGRESS,
-                DataScienceJobRun.LIFECYCLE_STATE_NEEDS_ATTENTION,
-            ]:
-                run.cancel(wait_for_completion=True)
+            if force_delete:
+                if run.lifecycle_state in [
+                    DataScienceJobRun.LIFECYCLE_STATE_ACCEPTED,
+                    DataScienceJobRun.LIFECYCLE_STATE_IN_PROGRESS,
+                    DataScienceJobRun.LIFECYCLE_STATE_NEEDS_ATTENTION,
+                ]:
+                    run.cancel(wait_for_completion=True)
             run.delete()
         self.client.delete_job(self.id)
         return self
@@ -866,6 +867,12 @@ def download(self, to_dir):
         self.job.download(to_dir)
         return self
 
+    def delete(self, force_delete: bool = False):
+        if force_delete:
+            self.cancel(wait_for_completion=True)
+        super().delete()
+        return
+
 
 # This is for backward compatibility
 DSCJobRun = DataScienceJobRun

tests/unitary/default_setup/jobs/test_jobs_run.py

@@ -45,3 +45,18 @@ def test_job_run_exit_code(self):
         run.lifecycle_state = run.LIFECYCLE_STATE_FAILED
         run.lifecycle_details = "Job run artifact execution failed with exit code 21."
         self.assertEqual(run.exit_code, 21)
+
+    @mock.patch("ads.jobs.builders.infrastructure.dsc_job.DataScienceJobRun.cancel")
+    @mock.patch("ads.common.oci_datascience.OCIDataScienceMixin.delete")
+    def test_job_run_delete(self, mock_delete, mock_cancel):
+        """Tests deleting job run."""
+        run = DataScienceJobRun()
+        # Cancel will not be called if job run is succeeded.
+        run.lifecycle_state = run.LIFECYCLE_STATE_SUCCEEDED
+        run.delete()
+        mock_delete.assert_called_once()
+        mock_cancel.assert_not_called()
+        # Cancel will be called if job run is in progress and force_delete is set.
+        run.lifecycle_state = run.LIFECYCLE_STATE_IN_PROGRESS
+        run.delete(force_delete=True)
+        mock_cancel.assert_called_once()