run orchestrator engine and runner as prop

api/src/opentrons/protocol_runner/run_orchestrator.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import Optional, Union
 
-from . import protocol_runner
+from . import protocol_runner, AnyRunner
 from ..hardware_control import HardwareControlAPI
 from ..protocol_engine import ProtocolEngine
 from ..protocol_engine.types import PostRunHardwareState
@@ -31,6 +31,16 @@ def __init__(
         self._setup_runner = setup_runner
         self._fixit_runner = fixit_runner
 
+    @property
+    def engine(self) -> ProtocolEngine:
+        """Get the "current" persisted ProtocolEngine."""
+        return self._protocol_engine
+
+    @property
+    def runner(self) -> AnyRunner:
+        """Get the "current" persisted ProtocolRunner."""
+        return self._json_or_python_runner or self._setup_runner
+
     @classmethod
     def build_orchestrator(
         cls,
@@ -73,8 +83,8 @@ def build_orchestrator(
             protocol_engine=protocol_engine,
         )
 
-    def get_protocol_runner(self) -> protocol_runner.AnyRunner:
-        return self._json_or_python_runner or self._setup_runner
-
-    def get_protocol_engine(self) -> ProtocolEngine:
-        return self._protocol_engine
+    # def get_protocol_runner(self) -> protocol_runner.AnyRunner:
+    #     return self._json_or_python_runner or self._setup_runner
+    #
+    # def get_protocol_engine(self) -> ProtocolEngine:
+    #     return self._protocol_engine

robot-server/robot_server/runs/engine_store.py

@@ -127,14 +127,14 @@ def engine(self) -> ProtocolEngine:
         """Get the "current" persisted ProtocolEngine."""
         if self._run_orchestrator is None:
             raise NoRunnerEnginePairError()
-        return self._run_orchestrator.get_protocol_engine()
+        return self._run_orchestrator.engine
 
     @property
     def runner(self) -> AnyRunner:
         """Get the "current" persisted ProtocolRunner."""
         if self._run_orchestrator is None:
             raise NoRunnerEnginePairError()
-        return self._run_orchestrator.get_protocol_runner()
+        return self._run_orchestrator.runner
 
     @property
     def current_run_id(self) -> Optional[str]: