Add missing calls to method param func, this checks and aligns any de…

…precated param names
OasisLMF · May 17, 2024 · cfde705 · cfde705
1 parent 626469d
commit cfde705
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/model_execution_worker/tasks.py b/src/model_execution_worker/tasks.py
@@ -274,6 +274,8 @@ def start_analysis(analysis_settings, input_location, complex_data_files=None, *
     """
     # Check that the input archive exists and is valid
     filestore = get_filestore(settings)
+    from oasislmf.manager import OasisManager
+
     logger.info("args: {}".format(str(locals())))
     logger.info(str(get_worker_versions()))
     tmpdir_persist = settings.getboolean('worker', 'KEEP_RUN_DIR', fallback=False)
@@ -342,7 +344,10 @@ def start_analysis(analysis_settings, input_location, complex_data_files=None, *
 
         # Create and log params
         run_params = {**config, **task_params}
-        params = paths_to_absolute_paths(run_params, config_path)
+        gen_losses_params = OasisManager()._params_generate_losses(**run_params)
+        post_hook_params = OasisManager()._params_post_analysis(**run_params)
+        params = paths_to_absolute_paths({**gen_losses_params, **post_hook_params}, config_path)
+
         if debug_worker:
             log_params(params, kwargs)
 
@@ -353,7 +358,6 @@ def start_analysis(analysis_settings, input_location, complex_data_files=None, *
 
         # Run generate losses
         try:
-            from oasislmf.manager import OasisManager
             OasisManager().generate_oasis_losses(**params)
             returncode = 0
         except Exception as e:
@@ -410,6 +414,8 @@ def generate_input(self,
     # Start Oasis file generation
     notify_api_status(analysis_pk, 'INPUTS_GENERATION_STARTED')
     filestore = get_filestore(settings)
+    from oasislmf.manager import OasisManager
+
     # filestore.media_root = settings.get('worker', 'MEDIA_ROOT')
     tmpdir_persist = settings.getboolean('worker', 'KEEP_RUN_DIR', fallback=False)
     tmpdir_base = settings.get('worker', 'BASE_RUN_DIR', fallback=None)
@@ -462,7 +468,11 @@ def generate_input(self,
         config_path = get_oasislmf_config_path(settings)
         config = get_json(config_path)
         lookup_params = {**{k: v for k, v in config.items() if not k.startswith('oed_')}, **task_params}
-        params = paths_to_absolute_paths(lookup_params, config_path)
+
+        gen_files_params = OasisManager()._params_generate_files(**lookup_params)
+        pre_hook_params = OasisManager()._params_exposure_pre_analysis(**lookup_params)
+        params = paths_to_absolute_paths({**gen_files_params, **pre_hook_params}, config_path)
+
         if debug_worker:
             log_params(params, kwargs, exclude_keys=[
                 'profile_loc',
@@ -484,7 +494,6 @@ def generate_input(self,
                 json.dump(params, f, indent=4)
 
         try:
-            from oasislmf.manager import OasisManager
             OasisManager().generate_oasis_files(**params)
             returncode = 0
         except Exception as e: