Merge pull request #3 from ExaWorks/str2

Str2

Author: Andrew-S-Rosen

src/psij/job_spec.py

@@ -2,7 +2,7 @@
 
 import sys
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from typeguard import check_argument_types
 
@@ -11,16 +11,29 @@
 from psij.utils import path_object_to_full_path as o2p
 
 
+StrOrPath = Union[str, Path]
+
+
+def _to_path(arg: Optional[StrOrPath]) -> Optional[Path]    :
+    if isinstance(arg, Path):
+        return arg
+    elif arg is None:
+        return None
+    else:
+        assert isinstance(arg, str)
+        return Path(arg)
+
+
 class JobSpec(object):
     """A class to hold information about the characteristics of a:class:`~psij.Job`."""
 
     def __init__(self, name: Optional[str] = None, executable: Optional[str] = None,
-                 arguments: Optional[List[str]] = None, directory: Optional[str | Path] = None,
+                 arguments: Optional[List[str]] = None, directory: Optional[StrOrPath] = None,
                  inherit_environment: bool = True, environment: Optional[Dict[str, str]] = None,
-                 stdin_path: Optional[str | Path] = None, stdout_path: Optional[str | Path] = None,
-                 stderr_path: Optional[str | Path] = None, resources: Optional[ResourceSpec] = None,
-                 attributes: Optional[JobAttributes] = None, pre_launch: Optional[str | Path] = None,
-                 post_launch: Optional[str | Path] = None, launcher: Optional[str] = None):
+                 stdin_path: Optional[StrOrPath] = None, stdout_path: Optional[StrOrPath] = None,
+                 stderr_path: Optional[StrOrPath] = None, resources: Optional[ResourceSpec] = None,
+                 attributes: Optional[JobAttributes] = None, pre_launch: Optional[StrOrPath] = None,
+                 post_launch: Optional[StrOrPath] = None, launcher: Optional[str] = None):
         """
         Constructs a `JobSpec` object while allowing its properties to be initialized.
 
@@ -101,16 +114,18 @@ def __init__(self, name: Optional[str] = None, executable: Optional[str] = None,
         self._name = name
         self.executable = executable
         self.arguments = arguments
-        self.directory = Path(directory) if directory is not None else None
+        # I would do self.directory = directory, because that goes through the setter, which takes
+        # care of the conversion, but mypy gets confused
+        self._directory = _to_path(directory)
         self.inherit_environment = inherit_environment
         self.environment = environment
-        self.stdin_path = Path(stdin_path) if stdin_path is not None else None
-        self.stdout_path = Path(stdout_path) if stdout_path is not None else None
-        self.stderr_path = Path(stderr_path) if stderr_path is not None else None
+        self._stdin_path = _to_path(stdin_path)
+        self._stdout_path = _to_path(stdout_path)
+        self._stderr_path = _to_path(stderr_path)
         self.resources = resources
         self.attributes = attributes if attributes is not None else JobAttributes()
-        self.pre_launch = Path(pre_launch) if pre_launch is not None else None
-        self.post_launch = Path(post_launch) if post_launch is not None else None
+        self._pre_launch = _to_path(pre_launch)
+        self._post_launch = _to_path(post_launch)
         self.launcher = launcher
 
         # TODO: `resources` is of type `ResourceSpec`, not `ResourceSpecV1`.  An
@@ -126,6 +141,53 @@ def name(self) -> Optional[str]:
             return self._name
 
     @property
+    def directory(self) -> Optional[Path]:
+        return self._directory
+
+    @directory.setter
+    def directory(self, directory: Optional[StrOrPath]) -> None:
+        self._directory = _to_path(directory)
+
+    @property
+    def stdin_path(self) -> Optional[Path]:
+        return self._stdin_path
+
+    @stdin_path.setter
+    def stdin_path(self, stdin_path: Optional[StrOrPath]) -> None:
+        self._stdin_path = _to_path(stdin_path)
+
+    @property
+    def stdout_path(self) -> Optional[Path]:
+        return self._stdout_path
+
+    @stdout_path.setter
+    def stdout_path(self, stdout_path: Optional[StrOrPath]) -> None:
+        self._stdout_path = _to_path(stdout_path)
+
+    @property
+    def stderr_path(self) -> Optional[Path]:
+        return self._stderr_path
+
+    @stderr_path.setter
+    def stderr_path(self, stderr_path: Optional[StrOrPath]) -> None:
+        self._stderr_path = _to_path(stderr_path)
+
+    @property
+    def pre_launch(self) -> Optional[Path]:
+        return self._pre_launch
+
+    @pre_launch.setter
+    def pre_launch(self, pre_launch: Optional[StrOrPath]) -> None:
+        self._pre_launch = _to_path(pre_launch)
+
+    @property
+    def post_launch(self) -> Optional[Path]:
+        return self._post_launch
+
+    @post_launch.setter
+    def post_launch(self, post_launch: Optional[StrOrPath]) -> None:
+        self._post_launch = _to_path(post_launch)
+
     def _init_job_spec_dict(self) -> Dict[str, Any]:
         """Returns jobspec structure as dict."""
         # convention:

tests/test_job_spec.py

@@ -37,12 +37,14 @@ def test_environment_types() -> None:
     spec.environment = {'foo': 'biz'}
     assert spec.environment['foo'] == 'biz'
 
+
+def test_path_conversion() -> None:
     assert JobSpec(directory=os.path.join("test", "path")).directory == Path("test") / "path"
-    assert JobSpec(stdin_path=os.path.join("test", "path")).directory == Path("test") / "path"
-    assert JobSpec(stdout_path=os.path.join("test", "path")).directory == Path("test") / "path"
-    assert JobSpec(stderr_path=os.path.join("test", "path")).directory == Path("test") / "path"
-    assert JobSpec(pre_launch=os.path.join("test", "path")).directory == Path("test") / "path"
-    assert JobSpec(post_launch=os.path.join("test", "path")).directory == Path("test") / "path"
+    assert JobSpec(stdin_path=os.path.join("test", "path")).stdin_path == Path("test") / "path"
+    assert JobSpec(stdout_path=os.path.join("test", "path")).stdout_path == Path("test") / "path"
+    assert JobSpec(stderr_path=os.path.join("test", "path")).stderr_path == Path("test") / "path"
+    assert JobSpec(pre_launch=os.path.join("test", "path")).pre_launch == Path("test") / "path"
+    assert JobSpec(post_launch=os.path.join("test", "path")).post_launch == Path("test") / "path"
 
 
 test_environment_types()