revert wiring up unit for enum RTPs

Opentrons · Apr 2, 2024 · a37f5e4 · a37f5e4
1 parent 18561c0
commit a37f5e4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/api/src/opentrons/protocol_engine/types.py b/api/src/opentrons/protocol_engine/types.py
@@ -847,6 +847,7 @@ def from_hw_state(cls, state: HwTipStateType) -> "TipPresenceStatus":
         }[state]
 
 
+# TODO (spp, 2024-04-02): move all RTP types to runner
 class RTPBase(BaseModel):
     """Parameters defined in a protocol."""
 

diff --git a/api/src/opentrons/protocols/parameters/parameter_definition.py b/api/src/opentrons/protocols/parameters/parameter_definition.py
@@ -143,7 +143,6 @@ def as_protocol_engine_type(self) -> RunTimeParameter:
                 choices=choices,
                 value=self._value,
                 default=self._default,
-                suffix=self._unit,
             )
         elif self._minimum is not None and self._maximum is not None:
             parameter = NumberParameter(

diff --git a/robot-server/robot_server/protocols/analysis_store.py b/robot-server/robot_server/protocols/analysis_store.py
@@ -346,9 +346,10 @@ async def matching_rtp_values_in_last_analysis(
             parameter,
             prev_value_and_default,
         ) in rtp_values_and_defaults_in_last_analysis.items():
-            if new_rtp_values.get(
-                parameter, prev_value_and_default.default
-            ) == prev_value_and_default.value:
+            if (
+                new_rtp_values.get(parameter, prev_value_and_default.default)
+                == prev_value_and_default.value
+            ):
                 continue
             else:
                 return False

diff --git a/...r/tests/integration/http_api/protocols/test_analyses_with_run_time_parameters.tavern.yaml b/...r/tests/integration/http_api/protocols/test_analyses_with_run_time_parameters.tavern.yaml
@@ -78,7 +78,6 @@ stages:
                   value: 50.5
               value: 20.1
               description: How many microliters to pipette of each sample.
-              suffix: µL
             - displayName: Dry Run
               variableName: dry_run
               type: bool
@@ -159,7 +158,6 @@ stages:
                   value: 50.5
               value: 10.23
               description: How many microliters to pipette of each sample.
-              suffix: µL
             - displayName: Dry Run
               variableName: dry_run
               type: bool

diff --git a/robot-server/tests/integration/protocols/basic_transfer_with_run_time_parameters.py b/robot-server/tests/integration/protocols/basic_transfer_with_run_time_parameters.py
@@ -26,7 +26,7 @@ def add_parameters(parameters: ParameterContext):
             {"display_name": "High Volume", "value": 50.5},
         ],
         description="How many microliters to pipette of each sample.",
-        unit="µL",
+        unit="µL",  # Unit is not wired up, and it doesn't raise errors either.
     )
     parameters.add_bool(
         display_name="Dry Run",