feat(robot-server, api): accept RTP overrides via /protocols and inject them in python executor

api/src/opentrons/execute.py

@@ -600,7 +600,9 @@ def _run_file_non_pe(
 
     context.home()
     try:
-        execute_apiv2.run_protocol(protocol, context)
+        # TODO (spp, 2024-03-18): use true run-time param overrides once enabled
+        #  for cli protocol simulation/ execution
+        execute_apiv2.run_protocol(protocol, context, run_time_param_overrides=None)
     finally:
         context.cleanup()
 

api/src/opentrons/protocol_engine/types.py

@@ -909,3 +909,7 @@ class EnumParameter(RTPBase):
 
 
 RunTimeParameter = Union[IntParameter, FloatParameter, EnumParameter]
+
+RTPOverridesType = Dict[
+    str, Union[float, bool, str]
+]  # update value types as more RTP types are added

api/src/opentrons/protocol_reader/protocol_reader.py

@@ -53,7 +53,10 @@ def __init__(
         self._file_hasher = file_hasher or FileHasher()
 
     async def save(
-        self, files: Sequence[BufferedFile], directory: Path, content_hash: str
+        self,
+        files: Sequence[BufferedFile],
+        directory: Path,
+        content_hash: str,
     ) -> ProtocolSource:
         """Compute a `ProtocolSource` from buffered files and save them as files.
 

api/src/opentrons/protocol_runner/legacy_wrappers.py

@@ -20,6 +20,7 @@
 )
 from opentrons.legacy_broker import LegacyBroker
 from opentrons.protocol_engine import ProtocolEngine
+from opentrons.protocol_engine.types import RTPOverridesType
 from opentrons.protocol_reader import ProtocolSource, ProtocolFileRole
 from opentrons.util.broker import Broker
 
@@ -168,9 +169,15 @@ class LegacyExecutor:
     """Interface to execute Protocol API v2 protocols in a child thread."""
 
     @staticmethod
-    async def execute(protocol: LegacyProtocol, context: LegacyProtocolContext) -> None:
+    async def execute(
+        protocol: LegacyProtocol,
+        context: LegacyProtocolContext,
+        run_time_param_overrides: Optional[RTPOverridesType],
+    ) -> None:
         """Execute a PAPIv2 protocol with a given ProtocolContext in a child thread."""
-        await to_thread.run_sync(run_protocol, protocol, context)
+        await to_thread.run_sync(
+            run_protocol, protocol, context, run_time_param_overrides
+        )
 
 
 __all__ = [

api/src/opentrons/protocol_runner/protocol_runner.py

@@ -35,7 +35,11 @@
     LegacyExecutor,
     LegacyLoadInfo,
 )
-from ..protocol_engine.types import PostRunHardwareState, DeckConfigurationType
+from ..protocol_engine.types import (
+    PostRunHardwareState,
+    DeckConfigurationType,
+    RTPOverridesType,
+)
 
 
 class RunResult(NamedTuple):
@@ -106,6 +110,7 @@ async def run(
         self,
         deck_configuration: DeckConfigurationType,
         protocol_source: Optional[ProtocolSource] = None,
+        run_time_params_overrides: Optional[RTPOverridesType] = None,
     ) -> RunResult:
         """Run a given protocol to completion."""
 
@@ -135,17 +140,18 @@ def __init__(
         self._legacy_executor = legacy_executor or LegacyExecutor()
         # TODO(mc, 2022-01-11): replace task queue with specific implementations
         # of runner interface
-        self._task_queue = (
-            task_queue or TaskQueue()
-        )  # cleanup_func=protocol_engine.finish))
+        self._task_queue = task_queue or TaskQueue()
         self._task_queue.set_cleanup_func(
             func=protocol_engine.finish,
             drop_tips_after_run=drop_tips_after_run,
             post_run_hardware_state=post_run_hardware_state,
         )
 
     async def load(
-        self, protocol_source: ProtocolSource, python_parse_mode: PythonParseMode
+        self,
+        protocol_source: ProtocolSource,
+        python_parse_mode: PythonParseMode,
+        run_time_params_overrides: Optional[RTPOverridesType],
     ) -> None:
         """Load a Python or JSONv5(& older) ProtocolSource into managed ProtocolEngine."""
         labware_definitions = await protocol_reader.extract_labware_definitions(
@@ -182,26 +188,30 @@ async def load(
         initial_home_command = pe_commands.HomeCreate(
             params=pe_commands.HomeParams(axes=None)
         )
-        # this command homes all axes, including pipette plugner and gripper jaw
+        # this command homes all axes, including pipette plunger and gripper jaw
         self._protocol_engine.add_command(request=initial_home_command)
 
         self._task_queue.set_run_func(
             func=self._legacy_executor.execute,
             protocol=protocol,
             context=context,
+            run_time_param_overrides=run_time_params_overrides,
         )
 
     async def run(  # noqa: D102
         self,
         deck_configuration: DeckConfigurationType,
         protocol_source: Optional[ProtocolSource] = None,
+        run_time_params_overrides: Optional[RTPOverridesType] = None,
         python_parse_mode: PythonParseMode = PythonParseMode.NORMAL,
     ) -> RunResult:
         # TODO(mc, 2022-01-11): move load to runner creation, remove from `run`
-        # currently `protocol_source` arg is only used by tests
+        # currently `protocol_source` arg is only used by tests & protocol analyzer
         if protocol_source:
             await self.load(
-                protocol_source=protocol_source, python_parse_mode=python_parse_mode
+                protocol_source=protocol_source,
+                python_parse_mode=python_parse_mode,
+                run_time_params_overrides=run_time_params_overrides,
             )
 
         self.play(deck_configuration=deck_configuration)
@@ -301,6 +311,7 @@ async def run(  # noqa: D102
         self,
         deck_configuration: DeckConfigurationType,
         protocol_source: Optional[ProtocolSource] = None,
+        run_time_params_overrides: Optional[RTPOverridesType] = None,
     ) -> RunResult:
         # TODO(mc, 2022-01-11): move load to runner creation, remove from `run`
         # currently `protocol_source` arg is only used by tests
@@ -344,6 +355,7 @@ async def run(  # noqa: D102
         self,
         deck_configuration: DeckConfigurationType,
         protocol_source: Optional[ProtocolSource] = None,
+        run_time_params_overrides: Optional[RTPOverridesType] = None,
     ) -> RunResult:
         assert protocol_source is None
         await self._hardware_api.home()

api/src/opentrons/protocols/execution/execute.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Optional, Dict, Union
 
 from opentrons.protocol_api import ProtocolContext
 from opentrons.protocols.execution.execute_python import run_python
@@ -16,7 +17,11 @@
 MODULE_LOG = logging.getLogger(__name__)
 
 
-def run_protocol(protocol: Protocol, context: ProtocolContext) -> None:
+def run_protocol(
+    protocol: Protocol,
+    context: ProtocolContext,
+    run_time_param_overrides: Optional[Dict[str, Union[float, bool, str]]] = None,
+) -> None:
     """Run a protocol.
 
     :param protocol: The :py:class:`.protocols.types.Protocol` to execute

api/src/opentrons/simulate.py

@@ -866,7 +866,9 @@ def _run_file_non_pe(
     context.home()
     with scraper.scrape():
         try:
-            execute.run_protocol(protocol, context)
+            # TODO (spp, 2024-03-18): use true run-time param overrides once enabled
+            #  for cli protocol simulation/ execution
+            execute.run_protocol(protocol, context, run_time_param_overrides=None)
             if (
                 isinstance(protocol, PythonProtocol)
                 and protocol.api_level >= APIVersion(2, 0)

api/tests/opentrons/protocol_runner/smoke_tests/test_protocol_runner.py

@@ -43,7 +43,11 @@ async def test_runner_with_python(
         robot_type="OT-2 Standard",
         protocol_config=protocol_source.config,
     )
-    result = await subject.run(deck_configuration=[], protocol_source=protocol_source)
+    result = await subject.run(
+        deck_configuration=[],
+        protocol_source=protocol_source,
+        run_time_params_overrides=None,
+    )
     commands_result = result.commands
     pipettes_result = result.state_summary.pipettes
     labware_result = result.state_summary.labware
@@ -114,7 +118,10 @@ async def test_runner_with_json(json_protocol_file: Path) -> None:
     subject = await create_simulating_runner(
         robot_type="OT-2 Standard", protocol_config=protocol_source.config
     )
-    result = await subject.run(deck_configuration=[], protocol_source=protocol_source)
+    result = await subject.run(
+        deck_configuration=[],
+        protocol_source=protocol_source,
+    )
 
     commands_result = result.commands
     pipettes_result = result.state_summary.pipettes
@@ -176,7 +183,11 @@ async def test_runner_with_legacy_python(legacy_python_protocol_file: Path) -> N
         robot_type="OT-2 Standard",
         protocol_config=protocol_source.config,
     )
-    result = await subject.run(deck_configuration=[], protocol_source=protocol_source)
+    result = await subject.run(
+        deck_configuration=[],
+        protocol_source=protocol_source,
+        run_time_params_overrides=None,
+    )
 
     commands_result = result.commands
     pipettes_result = result.state_summary.pipettes
@@ -235,7 +246,11 @@ async def test_runner_with_legacy_json(legacy_json_protocol_file: Path) -> None:
     subject = await create_simulating_runner(
         robot_type="OT-2 Standard", protocol_config=protocol_source.config
     )
-    result = await subject.run(deck_configuration=[], protocol_source=protocol_source)
+    result = await subject.run(
+        deck_configuration=[],
+        protocol_source=protocol_source,
+        run_time_params_overrides=None,
+    )
 
     commands_result = result.commands
     pipettes_result = result.state_summary.pipettes

api/tests/opentrons/protocol_runner/test_protocol_runner.py

@@ -456,6 +456,7 @@ async def test_load_legacy_python(
     await legacy_python_runner_subject.load(
         legacy_protocol_source,
         python_parse_mode=PythonParseMode.ALLOW_LEGACY_METADATA_AND_REQUIREMENTS,
+        run_time_params_overrides=None,
     )
 
     decoy.verify(
@@ -468,6 +469,7 @@ async def test_load_legacy_python(
             func=legacy_executor.execute,
             protocol=legacy_protocol,
             context=legacy_context,
+            run_time_param_overrides=None,
         ),
     )
     assert broker_captor.value is legacy_python_runner_subject.broker
@@ -526,6 +528,7 @@ async def test_load_python_with_pe_papi_core(
     await legacy_python_runner_subject.load(
         legacy_protocol_source,
         python_parse_mode=PythonParseMode.ALLOW_LEGACY_METADATA_AND_REQUIREMENTS,
+        run_time_params_overrides=None,
     )
 
     decoy.verify(protocol_engine.add_plugin(matchers.IsA(LegacyContextPlugin)), times=0)
@@ -587,6 +590,7 @@ async def test_load_legacy_json(
     await legacy_python_runner_subject.load(
         legacy_protocol_source,
         python_parse_mode=PythonParseMode.ALLOW_LEGACY_METADATA_AND_REQUIREMENTS,
+        run_time_params_overrides=None,
     )
 
     decoy.verify(
@@ -599,6 +603,7 @@ async def test_load_legacy_json(
             func=legacy_executor.execute,
             protocol=legacy_protocol,
             context=legacy_context,
+            run_time_param_overrides=None,
         ),
     )
 

robot-server/robot_server/protocols/protocol_analyzer.py

@@ -1,8 +1,10 @@
 """Protocol analysis module."""
 import logging
+from typing import Optional
 
 from opentrons import protocol_runner
 from opentrons.protocol_engine.errors import ErrorOccurrence
+from opentrons.protocol_engine.types import RTPOverridesType
 import opentrons.util.helpers as datetime_helper
 
 import robot_server.errors.error_mappers as em
@@ -27,6 +29,7 @@ async def analyze(
         self,
         protocol_resource: ProtocolResource,
         analysis_id: str,
+        run_time_param_overrides: Optional[RTPOverridesType],
     ) -> None:
         """Analyze a given protocol, storing the analysis when complete."""
         runner = await protocol_runner.create_simulating_runner(
@@ -35,7 +38,9 @@ async def analyze(
         )
         try:
             result = await runner.run(
-                protocol_source=protocol_resource.source, deck_configuration=[]
+                protocol_source=protocol_resource.source,
+                deck_configuration=[],
+                run_time_params_overrides=run_time_param_overrides,
             )
         except BaseException as error:
             internal_error = em.map_unexpected_error(error=error)

robot-server/robot_server/protocols/router.py

@@ -1,4 +1,5 @@
 """Router for /protocols endpoints."""
+import json
 import logging
 from textwrap import dedent
 from datetime import datetime
@@ -165,6 +166,10 @@ async def create_protocol(
             " protocol resources on the robot."
         ),
     ),
+    runTimeParameterValues: Optional[str] = Form(
+        default=None,
+        description="Key value pairs of run-time parameters defined in a protocol.",
+    ),
     protocol_directory: Path = Depends(get_protocol_directory),
     protocol_store: ProtocolStore = Depends(get_protocol_store),
     analysis_store: AnalysisStore = Depends(get_analysis_store),
@@ -184,6 +189,7 @@ async def create_protocol(
     Arguments:
         files: List of uploaded files, from form-data.
         key: Optional key for client-side tracking
+        runTimeParameterValues: Key value pairs of run-time parameters defined in a protocol.
         protocol_directory: Location to store uploaded files.
         protocol_store: In-memory database of protocol resources.
         analysis_store: In-memory database of protocol analyses.
@@ -205,11 +211,32 @@ async def create_protocol(
         assert file.filename is not None
     buffered_files = await file_reader_writer.read(files=files)  # type: ignore[arg-type]
 
+    if isinstance(runTimeParameterValues, str):
+        # We have to do this isinstance check because if `runTimeParameterValues` is
+        # not specified in the request, then it gets assigned a Form(None) value
+        # instead of just a None. \(O.o)/
+        parsed_rtp = json.loads(runTimeParameterValues)
+    else:
+        parsed_rtp = None
     content_hash = await file_hasher.hash(buffered_files)
     cached_protocol_id = protocol_store.get_id_by_hash(content_hash)
 
     if cached_protocol_id is not None:
+        # Protocol exists in database
         resource = protocol_store.get(protocol_id=cached_protocol_id)
+        if parsed_rtp:
+            # This protocol exists in database but needs to be re-analyzed with the
+            # passed-in RTP overrides
+            task_runner.run(
+                protocol_analyzer.analyze,
+                protocol_resource=resource,
+                analysis_id=analysis_id,
+                run_time_param_overrides=parsed_rtp,
+            )
+            analysis_store.add_pending(
+                protocol_id=cached_protocol_id,
+                analysis_id=analysis_id,
+            )
         analyses = analysis_store.get_summaries_by_protocol(
             protocol_id=cached_protocol_id
         )
@@ -228,7 +255,8 @@ async def create_protocol(
         )
 
         log.info(
-            f'Protocol with id "{cached_protocol_id}" with same contents already exists. returning existing protocol data in response payload'
+            f'Protocol with id "{cached_protocol_id}" with same contents already exists.'
+            f" Returning existing protocol data in response payload."
         )
 
         return await PydanticResponse.create(
@@ -238,7 +266,6 @@ async def create_protocol(
         )
 
     try:
-        # Can make the passed in RTPs as part of protocolSource returned here
         source = await protocol_reader.save(
             files=buffered_files,
             directory=protocol_directory / protocol_id,
@@ -272,6 +299,7 @@ async def create_protocol(
         protocol_analyzer.analyze,
         protocol_resource=protocol_resource,
         analysis_id=analysis_id,
+        run_time_param_overrides=parsed_rtp,
     )
     pending_analysis = analysis_store.add_pending(
         protocol_id=protocol_id,

robot-server/robot_server/runs/engine_store.py

@@ -214,6 +214,8 @@ async def create(
                 # was uploaded before we added stricter validation, and that
                 # doesn't conform to the new rules.
                 python_parse_mode=PythonParseMode.ALLOW_LEGACY_METADATA_AND_REQUIREMENTS,
+                # TODO (spp, 2024-03-18): update when we start accepting RTP overrides for run
+                run_time_params_overrides=None,
             )
         elif isinstance(runner, JsonRunner):
             assert (