From 3763ecf4c3f8a512e4edc3739e27d24a790a26b3 Mon Sep 17 00:00:00 2001 From: sambles Date: Fri, 17 May 2024 09:39:25 +0100 Subject: [PATCH] Fix missing filestore arg in complex model file prep (#1041) --- src/model_execution_worker/tasks.py | 2 +- src/server/oasisapi/analysis_models/v2_api/serializers.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/model_execution_worker/tasks.py b/src/model_execution_worker/tasks.py index ed0384437..a8808067d 100755 --- a/src/model_execution_worker/tasks.py +++ b/src/model_execution_worker/tasks.py @@ -456,7 +456,7 @@ def generate_input(self, os.path.join(oasis_files_dir, 'analysis_settings.json') ) if complex_data_files: - prepare_complex_model_file_inputs(complex_data_files, input_data_dir) + prepare_complex_model_file_inputs(complex_data_files, input_data_dir, filestore) task_params['user_data_dir'] = input_data_dir config_path = get_oasislmf_config_path(settings) diff --git a/src/server/oasisapi/analysis_models/v2_api/serializers.py b/src/server/oasisapi/analysis_models/v2_api/serializers.py index 5e85cd4f5..87f783c58 100644 --- a/src/server/oasisapi/analysis_models/v2_api/serializers.py +++ b/src/server/oasisapi/analysis_models/v2_api/serializers.py @@ -229,7 +229,11 @@ def validate(self, attrs): # Check that `worker_count_min` < `worker_count_max` m_id = self.context['request'].parser_context['kwargs']['pk'] - current_val = ModelScalingOptions.objects.get(id=m_id) + try: + current_val = ModelScalingOptions.objects.get(id=m_id) + except ModelScalingOptions.DoesNotExist: + # create a default config object for validation + current_val = ModelScalingOptions() wrk_min = self.initial_data.get('worker_count_min', current_val.worker_count_min) wrk_max = self.initial_data.get('worker_count_max', current_val.worker_count_max)