Changed so that files are not relative to cwd, fixed test

Author: wk9874

simvue/executor.py

@@ -208,20 +208,10 @@ def callback_function(status_code: int, std_out: str, std_err: str) -> None:
             )
 
         if script:
-            if cwd:
-                self._runner.save_file(
-                    file_path=os.path.join(cwd, script), category="code"
-                )
-            else:
-                self._runner.save_file(file_path=script, category="code")
+            self._runner.save_file(file_path=script, category="code")
 
         if input_file:
-            if cwd:
-                self._runner.save_file(
-                    file_path=os.path.join(cwd, input_file), category="input"
-                )
-            else:
-                self._runner.save_file(file_path=input_file, category="input")
+            self._runner.save_file(file_path=input_file, category="input")
 
         command: typing.List[str] = []
 

simvue/run.py

@@ -653,8 +653,8 @@ def add_process(
         identifier: str,
         *cmd_args,
         executable: typing.Optional[typing.Union[str, pathlib.Path]] = None,
-        script: typing.Optional[typing.Union[str, pathlib.Path]] = None,
-        input_file: typing.Optional[typing.Union[str, pathlib.Path]] = None,
+        script: typing.Optional[pydantic.FilePath] = None,
+        input_file: typing.Optional[pydantic.FilePath] = None,
         completion_callback: typing.Optional[
             typing.Callable[[int, str, str], None]
         ] = None,
@@ -704,10 +704,10 @@ def callback_function(status_code: int, std_out: str, std_err: str) -> None:
             positional argument, by default None
         *positional_arguments : Any, ..., optional
             all other positional arguments are taken to be part of the command to execute
-        script : str | None, optional
+        script : pydantic.FilePath | None, optional
             the script to run, note this only work if the script is not an option, if this is the case
             you should provide it as such and perform the upload manually, by default None
-        input_file : str | None, optional
+        input_file : pydantic.FilePath | None, optional
             the input file to run, note this only work if the input file is not an option, if this is the case
             you should provide it as such and perform the upload manually, by default None
         completion_callback : typing.Callable | None, optional
@@ -717,7 +717,8 @@ def callback_function(status_code: int, std_out: str, std_err: str) -> None:
         env : typing.Dict[str, str], optional
             environment variables for process
         cwd: typing.Optional[pathlib.Path], optional
-            working directory to execute the process within
+            working directory to execute the process within. Note that executable, input and script file paths should
+            be absolute or relative to the directory where this method is called, not relative to the new working directory.
         **kwargs : Any, ..., optional
             all other keyword arguments are interpreted as options to the command
         """

tests/functional/test_run_process_cwd.py

@@ -5,7 +5,7 @@
 from simvue import Run
 import os
 import filecmp
-
+import time
 class TestRunProcess(unittest.TestCase):
     def test_processes_cwd(self):
         """Check that cwd argument works correctly in add_process.
@@ -18,10 +18,12 @@ def test_processes_cwd(self):
             with tempfile.NamedTemporaryFile(dir=temp_dir, suffix=".py") as temp_file:
                 with open(temp_file.name, "w") as out_f:
                     out_f.writelines([
-                        "import time\n",
-                        "time.sleep(10)\n"
+                        "import os\n",
+                        "f = open('new_file.txt', 'w')\n",
+                        "f.write('Test Line')\n",
+                        "f.close()"
                     ])
-                    file_name = os.path.basename(temp_file.name)
+                    import pdb; pdb.set_trace()
 
                 with Run() as run:
                     run.init(
@@ -32,22 +34,23 @@ def test_processes_cwd(self):
                     run.add_process(
                         identifier="sleep_10_process",
                         executable="python",
-                        script=file_name,
+                        script=temp_file.name,
                         cwd=temp_dir
                     )
+                    time.sleep(1)
+                    run.save_file(os.path.join(temp_dir, "new_file.txt"), 'output')
 
                 client = simvue.Client()
 
-                # Check that run existed for more than 10s, meaning the process ran correctly
-                data = client.get_run(run_id)
-                runtime = data['runtime']
-                runtime_seconds = float(runtime.split(":")[-1])
-                self.assertGreater(runtime_seconds, 10.0)
-
                 # Check that the script was uploaded to the run correctly
                 os.makedirs(os.path.join(temp_dir, "downloaded"))
-                client.get_artifact_as_file(run_id, file_name, path=os.path.join(temp_dir, "downloaded"))
-                assert filecmp.cmp(os.path.join(temp_dir, "downloaded", file_name), temp_file.name)
+                client.get_artifact_as_file(run_id, os.path.basename(temp_file.name), path=os.path.join(temp_dir, "downloaded"))
+                assert filecmp.cmp(os.path.join(temp_dir, "downloaded", os.path.basename(temp_file.name)), temp_file.name)
+
+                client.get_artifact_as_file(run_id, "new_file.txt", path=os.path.join(temp_dir, "downloaded"))
+                new_file = open(os.path.join(temp_dir, "downloaded", "new_file.txt"), "r")
+                assert new_file.read() == "Test Line"
+                new_file.close()
 
 if __name__ == '__main__':
     unittest.main()