add no_fail mode to run job/scenario

Author: FChataigner

dataikuapi/dss/project.py

@@ -279,7 +279,7 @@ def start_job(self, definition):
         job_def = self.client._perform_json("POST", "/projects/%s/jobs/" % self.project_key, body = definition)
         return DSSJob(self.client, self.project_key, job_def['id'])
 
-    def start_job_and_wait(self, definition):
+    def start_job_and_wait(self, definition, no_fail=False):
         """
         Create a new job. Wait the end of the job to complete.
         
@@ -298,8 +298,11 @@ def start_job_and_wait(self, definition):
             time.sleep(sleep_time)
             job_state = job.get_status().get("baseStatus", {}).get("state", "")
             if job_state in ["ABORTED", "FAILED"]:
-                raise DataikuException("Job run did not finish. Status: %s" % (job_state))
-
+                if no_fail:
+                    break
+                else:
+                    raise DataikuException("Job run did not finish. Status: %s" % (job_state))
+        return job_state
 
     ########################################################
     # Variables

dataikuapi/dss/scenario.py

@@ -46,7 +46,7 @@ def get_trigger_fire(self, trigger_id, trigger_run_id):
             })
         return DSSTriggerFire(self, trigger_fire)
 
-    def run_and_wait(self, params={}):
+    def run_and_wait(self, params={}, no_fail=False):
         """
         Requests a run of the scenario, which will start after a few seconds. Wait the end of the run to complete.
 
@@ -64,7 +64,10 @@ def run_and_wait(self, params={}):
             if refresh_trigger_counter == 10:
                 refresh_trigger_counter = 0
             if trigger_fire.is_cancelled(refresh=refresh_trigger_counter == 0):
-                raise DataikuException("Scenario run has been cancelled")
+                if no_fail:
+                    return None
+                else:
+                    raise DataikuException("Scenario run has been cancelled")
             scenario_run = trigger_fire.get_scenario_run()
             time.sleep(5)
         while not scenario_run.run.get('result', False):