Fix client cwd stashing regression introduced in d8e2973

Author: softwareengineerprogrammer

src/geophires_x_client/__init__.py

@@ -1,8 +1,10 @@
 import atexit
+import os
 import sys
 import threading
 from multiprocessing import Manager
 from multiprocessing import current_process
+from pathlib import Path
 
 # noinspection PyPep8Naming
 from geophires_x import GEOPHIRESv3 as geophires
@@ -110,6 +112,7 @@ def get_geophires_result(self, input_params: GeophiresInputParameters) -> Geophi
 
     def _run_simulation(self, input_params: GeophiresInputParameters) -> GeophiresXResult:
         """Helper method to encapsulate the actual GEOPHIRES run."""
+        stash_cwd = Path.cwd()
         stash_sys_argv = sys.argv
         sys.argv = ['', input_params.as_file_path(), input_params.get_output_file_path()]
 
@@ -121,6 +124,7 @@ def _run_simulation(self, input_params: GeophiresInputParameters) -> GeophiresXR
             raise RuntimeError('GEOPHIRES exited without giving a reason') from None
         finally:
             sys.argv = stash_sys_argv
+            os.chdir(stash_cwd)
 
         self._logger.info(f'GEOPHIRES-X output file: {input_params.get_output_file_path()}')
         result = GeophiresXResult(input_params.get_output_file_path())

tests/test_geophires_x_client.py

@@ -14,7 +14,7 @@
 class GeophiresXClientTestCase(BaseTestCase):
     """
     Note that these are tests of the geophires_x_client package only and not of the core geophires_x package.
-    If a test calls geophires_x_client.GeophiresXClient.get_geophires_result then it belongs in
+    If a test calls geophires_x_client.GeophiresXClient.get_geophires_result then it generally belongs in
     test_geophires_x.GeophiresXTestCase.
     """
 
@@ -615,3 +615,19 @@ def test_parse_sam_cash_flow_profile(self):
         cash_flow = result.result['SAM CASH FLOW PROFILE']
         self.assertIsNotNone(cash_flow)
         self.assertListEqual([''] + [f'Year {y}' for y in range(21)], cash_flow[0])
+
+    def test_stash_cwd(self):
+        start_cwd = Path.cwd()
+        GeophiresXClient().get_geophires_result(
+            GeophiresInputParameters(
+                {
+                    'End-Use Option': EndUseOption.DIRECT_USE_HEAT.value,
+                    'Reservoir Model': 1,
+                    'Time steps per year': 1,
+                    'Reservoir Depth': 3,
+                    'Gradient 1': 50,
+                }
+            )
+        )
+
+        self.assertEqual(start_cwd, Path.cwd())