Skip to content

Commit

Permalink
Fixed sever setting an analyses to an error state when submitting a b…
Browse files Browse the repository at this point in the history
…ad request. (#1086)

* Dont set analyses state as RUN_ERROR on run submit validation issues

* Add back raise_validate_errors method ~ needed in V1

* pep
  • Loading branch information
sambles authored Jul 24, 2024
1 parent 4d3ff13 commit 0fc2759
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions src/server/oasisapi/analyses/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,6 @@ def run(self, initiator, run_mode_override=None):
errors['model_settings_file'] = [f"Option 'number_of_events' is not set for event_set = '{events_selected}'"]

if errors:
self.status = self.status_choices.RUN_ERROR
self.save()
raise ValidationError(detail=errors)

# Start V1 run
Expand Down Expand Up @@ -516,12 +514,8 @@ def run(self, initiator, run_mode_override=None):
self.task_finished = None
self.save()

def raise_validate_errors(self, errors, error_state=None):
if error_state:
self.status = error_state
self.save()
if errors:
raise ValidationError(detail=errors)
def raise_validate_errors(self, errors):
raise ValidationError(detail=errors)

def generate_and_run(self, initiator):
valid_choices = [
Expand Down Expand Up @@ -559,7 +553,8 @@ def generate_and_run(self, initiator):
events_total = self.get_num_events()

# Raise for error
self.raise_validate_errors(errors)
if errors:
raise ValidationError(detail=errors)

self.status = self.status_choices.INPUTS_GENERATION_QUEUED
self.lookup_errors_file = None
Expand Down

0 comments on commit 0fc2759

Please sign in to comment.