convert env on setting

Author: andre-merzky

src/psij/executors/batch/batch_scheduler_executor.py

@@ -53,8 +53,7 @@ def _env_to_mustache(job: Job) -> List[Dict[str, str]]:
 
     r = []
     for k, v in job.spec.environment.items():
-        r.append({'name': k, 'value': bash_escape(str(v))})
-
+        r.append({'name': k, 'value': bash_escape(v)})
     return r
 
 

src/psij/executors/local.py

@@ -98,10 +98,6 @@ def _get_env(spec: JobSpec) -> Optional[Dict[str, str]]:
             # merge current env with spec env
             env = os.environ.copy()
             env.update(spec.environment)
-            # convert integers to strings
-            for k, v in env.items():
-                if isinstance(v, int):
-                    env[k] = str(v)
             return env
     else:
         # only spec env

src/psij/job_spec.py

@@ -111,6 +111,24 @@ def _init_job_spec_dict(self) -> Dict[str, Any]:
 
         return job_spec
 
+    @property
+    def environment(self) -> Optional[Dict[str, str]]:
+        """Return the environment dict."""
+        return self._environment
+
+    @environment.setter
+    def environment(self, env: Optional[Dict[str, Union[str, int]]]) -> None:
+        """Ensure env dict values to be string typed."""
+        self._environment = None
+
+        if env:
+            self._environment = {}
+            for k, v in env.items():
+                if isinstance(v, int):
+                    self._environment[k] = str(v)
+                else:
+                    self._environment[k] = v
+
     @property
     def to_dict(self) -> Dict[str, Any]:
         """Returns a dictionary representation of this object."""

tests/test_job_spec.py

@@ -32,7 +32,7 @@ def test_environment_types() -> None:
 
     spec.environment = {'foo': 'biz', 'bar': 42}
     assert spec.environment['foo'] == 'biz'
-    assert spec.environment['bar'] == 42
+    assert spec.environment['bar'] == '42'
 
 
 test_environment_types()