Merge branch 'dev' into feature/auto-abort

Author: kzscisoft

simvue/executor.py

@@ -16,6 +16,7 @@
 import multiprocessing
 import os
 import subprocess
+import pathlib
 import time
 import typing
 
@@ -100,13 +101,13 @@ def add_process(
         identifier: str,
         *args,
         executable: typing.Optional[str] = None,
-        script: typing.Optional[str] = None,
-        input_file: typing.Optional[str] = None,
+        script: typing.Optional[pathlib.Path] = None,
+        input_file: typing.Optional[pathlib.Path] = None,
         env: typing.Optional[typing.Dict[str, str]] = None,
         completion_callback: typing.Optional[
             typing.Callable[[int, str, str], None]
         ] = None,
-        completion_trigger: multiprocessing.synchronize.Event,
+        completion_trigger: typing.Optional[multiprocessing.synchronize.Event] = None,
         **kwargs,
     ) -> None:
         """Add a process to be executed to the executor.

simvue/run.py

@@ -106,6 +106,7 @@ def __init__(
         self._executor = Executor(self)
         self._dispatcher: typing.Optional[DispatcherBaseClass] = None
         self._id: typing.Optional[str] = None
+        self._term_color: bool = True
         self._suppress_errors: bool = False
         self._queue_blocking: bool = False
         self._status: typing.Optional[
@@ -191,8 +192,8 @@ def __exit__(
             click.secho(
                 "[simvue] Process executor terminated with non-zero exit status "
                 f"{_non_zero}{_error_msg}",
-                fg="red",
-                bold=True,
+                fg="red" if self._term_color else None,
+                bold=self._term_color,
             )
             sys.exit(_non_zero)
 
@@ -504,6 +505,7 @@ def init(
         visibility: typing.Union[
             typing.Literal["public", "tenant"], list[str], None
         ] = None,
+        no_color: bool = False,
     ) -> bool:
         """Initialise a Simvue run
 
@@ -531,12 +533,15 @@ def init(
                 * public - run viewable to all.
                 * tenant - run viewable to all within the current tenant.
                 * A list of usernames with which to share this run
+        no_color : bool, optional
+            disable terminal colors. Default False.
 
         Returns
         -------
         bool
             whether the initialisation was successful
         """
+        self._term_color = not no_color
 
         if isinstance(visibility, str) and visibility not in ("public", "tenant"):
             self._error(
@@ -616,11 +621,15 @@ def init(
             self._start()
 
         if self._mode == "online":
-            click.secho(f"[simvue] Run {self._name} created", bold=True, fg="green")
+            click.secho(
+                f"[simvue] Run {self._name} created",
+                bold=self._term_color,
+                fg="green" if self._term_color else None,
+            )
             click.secho(
                 f"[simvue] Monitor in the UI at {self._url}/dashboard/runs/run/{self._id}",
-                bold=True,
-                fg="green",
+                bold=self._term_color,
+                fg="green" if self._term_color else None,
             )
 
         return True
@@ -631,9 +640,9 @@ def add_process(
         self,
         identifier: str,
         *cmd_args,
-        executable: typing.Optional[str] = None,
-        script: typing.Optional[str] = None,
-        input_file: typing.Optional[str] = None,
+        executable: typing.Optional[typing.Union[str]] = 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,
@@ -1234,8 +1243,8 @@ def save_file(
         if not file_size:
             click.secho(
                 "[simvue] WARNING: saving zero-sized files not currently supported",
-                bold=True,
-                fg="yellow",
+                bold=self._term_color,
+                fg="yellow" if self._term_color else None,
             )
             return True
 
@@ -1423,8 +1432,8 @@ def close(self) -> bool:
             click.secho(
                 "[simvue] Process executor terminated with non-zero exit status "
                 f"{_non_zero}{_error_msg}",
-                fg="red",
-                bold=True,
+                fg="red" if self._term_color else None,
+                bold=self._term_color,
             )
             sys.exit(_non_zero)
 

tests/refactor/conftest.py

@@ -91,7 +91,8 @@ def setup_test_run(run: sv_run.Run, create_objects: bool, request: pytest.Fixtur
         tags=TEST_DATA["tags"],
         folder=TEST_DATA["folder"],
         visibility="tenant" if os.environ.get("CI") else None,
-        retention_period="1 hour"
+        retention_period="1 hour",
+        no_color=True
     )
     run._dispatcher._max_buffer_size = MAX_BUFFER_SIZE