diff --git a/api/src/opentrons/protocol_engine/commands/dispense.py b/api/src/opentrons/protocol_engine/commands/dispense.py index cd00d50df3b..7e18cc6560b 100644 --- a/api/src/opentrons/protocol_engine/commands/dispense.py +++ b/api/src/opentrons/protocol_engine/commands/dispense.py @@ -83,12 +83,7 @@ async def execute(self, params: DispenseParams) -> _ExecuteReturn: well_name = params.wellName volume = params.volume - self._state_view.geometry.validate_dispense_volume_into_well( - labware_id=labware_id, - well_name=well_name, - well_location=well_location, - volume=volume, - ) + # TODO(pbm, 10-15-24): call self._state_view.geometry.validate_dispense_volume_into_well() position = await self._movement.move_to_well( pipette_id=params.pipetteId, diff --git a/api/src/opentrons/protocol_engine/commands/move_to_well.py b/api/src/opentrons/protocol_engine/commands/move_to_well.py index 5b5f32a1f95..309f2e89513 100644 --- a/api/src/opentrons/protocol_engine/commands/move_to_well.py +++ b/api/src/opentrons/protocol_engine/commands/move_to_well.py @@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Optional, Type from typing_extensions import Literal -from ..types import DeckPoint, WellOrigin +from ..types import DeckPoint from .pipetting_common import ( PipetteIdMixin, WellLocationMixin, @@ -56,11 +56,12 @@ async def execute( state_update = update_types.StateUpdate() - if (self._state_view.labware.is_tiprack(labware_id)) and ( - well_location.origin == WellOrigin.MENISCUS or well_location.volumeOffset + if ( + self._state_view.labware.is_tiprack(labware_id) + and well_location.volumeOffset ): raise LabwareIsTipRackError( - "Cannot specify a WellLocation with an origin of MENISCUS or any volumeOffset with movement to a tip rack" + "Cannot specify a WellLocation with a volumeOffset with movement to a tip rack" ) x, y, z = await self._movement.move_to_well( diff --git a/api/tests/opentrons/protocol_engine/commands/test_move_to_well.py b/api/tests/opentrons/protocol_engine/commands/test_move_to_well.py index 73ef22e04c6..1b01009dc0e 100644 --- a/api/tests/opentrons/protocol_engine/commands/test_move_to_well.py +++ b/api/tests/opentrons/protocol_engine/commands/test_move_to_well.py @@ -4,7 +4,6 @@ from opentrons.protocol_engine import ( WellLocation, - WellOrigin, WellOffset, DeckPoint, errors, @@ -73,32 +72,6 @@ async def test_move_to_well_implementation( ) -async def test_move_to_well_with_tip_rack_and_meniscus( - decoy: Decoy, - mock_state_view: StateView, - movement: MovementHandler, -) -> None: - """It should disallow movement to a tip rack when MENISCUS is specified.""" - subject = MoveToWellImplementation(state_view=mock_state_view, movement=movement) - - data = MoveToWellParams( - pipetteId="abc", - labwareId="123", - wellName="A3", - wellLocation=WellLocation( - origin=WellOrigin.MENISCUS, offset=WellOffset(x=1, y=2, z=3) - ), - forceDirect=True, - minimumZHeight=4.56, - speed=7.89, - ) - - decoy.when(mock_state_view.labware.is_tiprack("123")).then_return(True) - - with pytest.raises(errors.LabwareIsTipRackError): - await subject.execute(data) - - async def test_move_to_well_with_tip_rack_and_volume_offset( decoy: Decoy, mock_state_view: StateView,