fix: Better structure, and launcher now returns the command

Author: Alan Christie

tests/instance_launcher.py

@@ -9,13 +9,6 @@
 
 _JOB_DIRECTORY: str = os.path.join(os.path.dirname(__file__), "jobs")
 
-_SUCCESS_LAUNCH_RESULT: LaunchResult = LaunchResult(
-    error=0,
-    error_msg=None,
-    instance_id="instance-00000000-0000-0000-0000-000000000000",
-    task_id="task-00000000-0000-0000-0000-000000000000",
-)
-
 
 class UnitTestInstanceLauncher(InstanceLauncher):
     """A unit test instance launcher, which runs the
@@ -47,4 +40,10 @@ def launch(
         completed_process: CompletedProcess = subprocess.run(job_cmd, check=True)
         assert completed_process.returncode == 0
 
-        return _SUCCESS_LAUNCH_RESULT
+        return LaunchResult(
+            error=0,
+            error_msg=None,
+            instance_id="instance-00000000-0000-0000-0000-000000000000",
+            task_id="task-00000000-0000-0000-0000-000000000000",
+            command=" ".join(job_cmd),
+        )

tests/test_test_instance_launcher.py

@@ -23,3 +23,5 @@ def test_get_nop_job():
 
     # Assert
     assert result.error == 0
+    assert result.command.startswith("python ")
+    assert result.command.endswith("tests/jobs/nop.py")

workflow/workflow_abc.py

@@ -18,6 +18,7 @@ class LaunchResult:
     error_msg: Optional[str]
     instance_id: Optional[str]
     task_id: Optional[str]
+    command: Optional[str]
 
 
 class InstanceLauncher(ABC):

workflow/workflow_engine.py

@@ -6,7 +6,7 @@
 
 from informaticsmatters.protobuf.datamanager.pod_message_pb2 import PodMessage
 
-from .workflow_abc import DatabaseAdapter, InstanceLauncher, MessageDispatcher
+from .workflow_abc import DatabaseAdapter, InstanceLauncher
 
 
 @dataclass
@@ -33,12 +33,10 @@ def __init__(
         *,
         instance_launcher: InstanceLauncher,
         db_adapter: DatabaseAdapter,
-        msg_dispatcher: MessageDispatcher,
     ):
         # Keep the dependent objects
         self._instance_launcher = instance_launcher
         self._db_adapter = db_adapter
-        self._msg_dispatcher = msg_dispatcher
 
     def handle_pod_message(
         self,

workflow/worklfow_validator.py

@@ -67,8 +67,8 @@ def validate(
         workflow_definition: Dict[str, Any],
         workflow_inputs: Optional[Dict[str, Any]] = None,
     ) -> ValidationResult:
-        """Validates the workflow definition (and inputs) based
-        on the provided 'level'."""
+        """Validates the workflow definition (and inputs)
+        based on the provided 'level'."""
         assert level in ValidationLevel
         assert isinstance(workflow_definition, dict)
         if workflow_inputs: