Cancel job run only if it is in cancellable state when force deleting a job (#911)

Author: qiuosier

ads/jobs/builders/infrastructure/dsc_job.py

@@ -377,13 +377,12 @@ def delete(self, force_delete: bool = False) -> DSCJob:
         """
         runs = self.run_list()
         for run in runs:
-            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)
+            if force_delete and 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
@@ -894,10 +893,14 @@ def download(self, to_dir):
         return self
 
     def delete(self, force_delete: bool = False):
-        if force_delete:
+        if force_delete and self.status in [
+            DataScienceJobRun.LIFECYCLE_STATE_ACCEPTED,
+            DataScienceJobRun.LIFECYCLE_STATE_IN_PROGRESS,
+            DataScienceJobRun.LIFECYCLE_STATE_NEEDS_ATTENTION,
+        ]:
             self.cancel(wait_for_completion=True)
         super().delete()
-        return
+        return self
 
 
 # This is for backward compatibility