Merge pull request #295 from ExaWorks/fix-path-type

ensure that workdir is converted to `Path` type

Author: hategan

src/psij/job_executor_config.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Union
 
 
 class JobExecutorConfig(object):
@@ -25,11 +25,49 @@ def __init__(self, launcher_log_file: Optional[Path] = None,
             that the exit code file, likely written on a service node, can be accessed by PSI/J,
             likely running on a head node.
         """
-        self.launcher_log_file = launcher_log_file
+        self._launcher_log_file = launcher_log_file
+
         if work_directory:
-            self.work_directory = work_directory
+            self._work_directory = work_directory
         else:
-            self.work_directory = JobExecutorConfig.DEFAULT_WORK_DIRECTORY
+            self._work_directory = JobExecutorConfig.DEFAULT_WORK_DIRECTORY
+
+    @property
+    def launcher_log_file(self) -> Optional[Path]:
+        """
+        Configure the executor's launcher log file.
+
+        Parameters
+        ----------
+        launcher_log_file
+            If specified, log messages from launcher scripts (including
+            output from pre- and post- launch scripts) will be directed to this file.
+        """
+        return self._launcher_log_file
+
+    @launcher_log_file.setter
+    def launcher_log_file(self, value: Optional[Union[str, Path]]) -> None:
+        if value:
+            self._launcher_log_file = Path(value)
+
+    @property
+    def work_directory(self) -> Path:
+        """
+        Configure the execor's work directory.
+
+        Parameters
+        ----------
+        work_directory
+            A directory where submit scripts and auxiliary job files will be generated. In a,
+            cluster this directory needs to point to a directory on a shared filesystem. This is so
+            that the exit code file, likely written on a service node, can be accessed by PSI/J,
+            likely running on a head node.
+        """
+        return self._work_directory
+
+    @work_directory.setter
+    def work_directory(self, value: Union[str, Path]) -> None:
+        self._work_directory = Path(value)
 
 
 JobExecutorConfig.DEFAULT = JobExecutorConfig()

tests/plugins1/_batch_test/_batch_test.py

@@ -28,6 +28,8 @@ def __init__(self, launcher_log_file: Optional[Path] = None,
         super().__init__(launcher_log_file, work_directory, queue_polling_interval,
                          initial_queue_polling_delay, queue_polling_error_threshold, keep_files)
 
+        assert isinstance(self.work_directory, Path)
+
 
 class _TestJobExecutor(BatchSchedulerExecutor):
     _STATE_MAP = {