Allow HipRaInputParameters to be initialized from either input file path or params dict

Author: softwareengineerprogrammer

src/geophires_monte_carlo/MC_GeoPHIRES3.py

@@ -218,12 +218,14 @@ def work_package(pass_list: list):
         shutil.copyfile(result.output_file_path, tmp_output_file)
     elif args.Code_File.endswith('HIP_RA.py'):
         hip_ra_client: HipRaClient = HipRaClient()
-        result: HipRaResult = hip_ra_client.get_hip_ra_result(HipRaInputParameters(from_file_path=Path(tmp_input_file)))
+        result: HipRaResult = hip_ra_client.get_hip_ra_result(
+            HipRaInputParameters(file_path_or_params_dict=Path(tmp_input_file))
+        )
         shutil.copyfile(result.output_file_path, tmp_output_file)
     elif args.Code_File.endswith('hip_ra_x.py'):
         hip_ra_x_client: HipRaXClient = HipRaXClient()
         result: HipRaResult = hip_ra_x_client.get_hip_ra_result(
-            HipRaInputParameters(from_file_path=Path(tmp_input_file))
+            HipRaInputParameters(file_path_or_params_dict=Path(tmp_input_file))
         )
         shutil.copyfile(result.output_file_path, tmp_output_file)
     else:

src/hip_ra/__init__.py

@@ -4,14 +4,24 @@
 import tempfile
 import uuid
 from pathlib import Path
+from types import MappingProxyType
 
 from geophires_x_client.common import _get_logger
 from hip_ra import HIP_RA
 
 
 class HipRaInputParameters:
-    def __init__(self, from_file_path: str):
-        self._input_file_path = Path(from_file_path)
+
+    def __init__(self, file_path_or_params_dict: str | MappingProxyType):
+        if isinstance(file_path_or_params_dict, dict):
+            tmp_file_path = Path(tempfile.gettempdir(), f'hip-ra-params_{uuid.uuid1()}.txt')
+            with open(tmp_file_path, 'w') as f:
+                f.writelines(
+                    [', '.join([str(p) for p in param_item]) + '\n' for param_item in file_path_or_params_dict.items()]
+                )
+            file_path_or_params_dict = str(tmp_file_path)
+
+        self._input_file_path = Path(file_path_or_params_dict)
         self._output_file_path = Path(
             tempfile.gettempdir(), f'hip-ra-result_{self._input_file_path.stem}_{uuid.uuid1()!s}.out'
         )

tests/hip_ra_x_tests/test_hip_ra_x.py

@@ -414,13 +414,37 @@ def test_handling_input_file_not_found(self):
         with self.assertRaises(RuntimeError) as rex:
             client.get_hip_ra_result(
                 HipRaInputParameters(
-                    from_file_path=Path(tempfile.gettempdir(), f'a-non-existent-file_{uuid.uuid1()!s}.txt')
+                    file_path_or_params_dict=Path(tempfile.gettempdir(), f'a-non-existent-file_{uuid.uuid1()!s}.txt')
                 )
             )
 
         self.assertIn('Unable to read input file', str(rex.exception))
         self.assertIn('.txt not found', str(rex.exception))
 
+    def test_hip_ra_input_parameters_init(self):
+        input_from_params: HipRaInputParameters = HipRaInputParameters(
+            {
+                'Reservoir Temperature': 250.0,
+                'Rejection Temperature': 60.0,
+                'Reservoir Porosity': 10.0,
+                'Reservoir Area': 55.0,
+                'Reservoir Thickness': 0.25,
+                'Reservoir Life Cycle': 25,
+            }
+        )
+
+        with open(input_from_params.as_file_path()) as f:
+            input_file_contents = f.read()
+            self.assertEqual(
+                'Reservoir Temperature, 250.0\n'
+                'Rejection Temperature, 60.0\n'
+                'Reservoir Porosity, 10.0\n'
+                'Reservoir Area, 55.0\n'
+                'Reservoir Thickness, 0.25\n'
+                'Reservoir Life Cycle, 25\n',
+                input_file_contents,
+            )
+
     def _new_hip_ra_test_instance(self, enable_hip_ra_logging_config=False, pre_re_stash_runner=None) -> HIP_RA_X:
         stash_cwd = Path.cwd()
         stash_sys_argv = sys.argv