reverted create_run_orchestartor and lint fixing

Author: TamarZanzouri

api/src/opentrons/execute.py

@@ -631,13 +631,28 @@ async def run(protocol_source: ProtocolSource) -> None:
             load_fixed_trash=should_load_fixed_trash(protocol_source.config),
         )
 
-        orchestrator = RunOrchestrator.build_orchestrator(
+        protocol_runner = create_protocol_runner(
+            protocol_config=protocol_source.config,
+            protocol_engine=protocol_engine,
+            hardware_api=hardware_api_wrapped,
+        )
+
+        orchestrator = RunOrchestrator(
             hardware_api=hardware_api_wrapped,
             protocol_engine=protocol_engine,
-            protocol_config=protocol_source.config,
+            json_or_python_protocol_runner=protocol_runner,
+            fixit_runner=LiveRunner(
+                protocol_engine=protocol_engine, hardware_api=hardware_api_wrapped
+            ),
+            setup_runner=LiveRunner(
+                protocol_engine=protocol_engine, hardware_api=hardware_api_wrapped
+            ),
+            protocol_live_runner=LiveRunner(
+                protocol_engine=protocol_engine, hardware_api=hardware_api_wrapped
+            ),
         )
 
-        unsubscribe = orchestrator.get_protocol_runner().broker.subscribe(
+        unsubscribe = protocol_runner.broker.subscribe(
             "command", lambda event: emit_runlog(event) if emit_runlog else None
         )
         try:

api/src/opentrons/protocol_engine/execution/queue_worker.py

@@ -70,6 +70,6 @@ async def join(self) -> None:
     async def _run_commands(self) -> None:
         async for command_id in self._command_generator():
             await self._command_executor.execute(command_id=command_id)
-                # Yield to the event loop in case we're executing a long sequence of commands
-                 # that never yields internally. For example, a long sequence of comment commands.
+            # Yield to the event loop in case we're executing a long sequence of commands
+            # that never yields internally. For example, a long sequence of comment commands.
             await asyncio.sleep(0)

api/tests/opentrons/protocol_runner/test_run_orchestrator.py

@@ -6,7 +6,7 @@
 
 from pytest_lazyfixture import lazy_fixture  # type: ignore[import-untyped]
 from decoy import Decoy
-from typing import Union, AsyncGenerator
+from typing import Union, Generator
 
 from opentrons.protocol_engine.errors import RunStoppedError
 from opentrons.protocol_engine.state import StateStore
@@ -509,7 +509,7 @@ async def test_command_generator(
 ) -> None:
     """Should get the next command to execute."""
 
-    def get_next_to_execute() -> AsyncGenerator[str, None]:
+    def get_next_to_execute() -> Generator[str, None, None]:
         yield "command-id-1"
         yield "command-id-2"
         raise RunStoppedError()