Skip to content

Commit 47b8f91

Browse files
sanni-tsanni-t
committed
added tests
1 parent ab5db25 commit 47b8f91

File tree

3 files changed

+216
-34
lines changed

3 files changed

+216
-34
lines changed

‎api/src/opentrons/protocol_api/core/engine/instrument.py

+20-10
Original file line numberDiff line numberDiff line change
@@ -1079,6 +1079,13 @@ def _pick_up_tip() -> None:
10791079
# TODO: make sure that the tip has air gap when moving to the trash
10801080
_drop_tip()
10811081

1082+
post_disp_tip_contents = [
1083+
tx_comps_executor.LiquidAndAirGapPair(
1084+
liquid=45,
1085+
air_gap=67,
1086+
)
1087+
]
1088+
10821089
def _get_location_and_well_core_from_next_tip_info(
10831090
self,
10841091
tip_info: NextTipInfo,
@@ -1107,6 +1114,7 @@ def aspirate_liquid_class(
11071114
transfer_type: tx_comps_executor.TransferType,
11081115
tip_contents: List[tx_comps_executor.LiquidAndAirGapPair],
11091116
) -> List[tx_comps_executor.LiquidAndAirGapPair]:
1117+
print("!!!!", tip_contents)
11101118
"""Execute aspiration steps.
11111119
11121120
1. Submerge
@@ -1119,6 +1127,7 @@ def aspirate_liquid_class(
11191127
Return: List of liquid and air gap pairs in tip.
11201128
"""
11211129
aspirate_props = transfer_properties.aspirate
1130+
_tip_contents = tip_contents.copy()
11221131
tx_commons.check_valid_volume_parameters(
11231132
disposal_volume=0, # No disposal volume for 1-to-1 transfer
11241133
air_gap=aspirate_props.retract.air_gap_by_volume.get_for_volume(volume),
@@ -1133,14 +1142,14 @@ def aspirate_liquid_class(
11331142
)
11341143
)
11351144
aspirate_location = Location(aspirate_point, labware=source_loc.labware)
1136-
if len(tip_contents) > 0:
1137-
last_liquid_and_airgap_in_tip = tip_contents[-1]
1145+
if len(_tip_contents) > 0:
1146+
last_liquid_and_airgap_in_tip = _tip_contents[-1]
11381147
else:
11391148
last_liquid_and_airgap_in_tip = tx_comps_executor.LiquidAndAirGapPair(
11401149
liquid=0,
11411150
air_gap=0,
11421151
)
1143-
tip_contents = [last_liquid_and_airgap_in_tip]
1152+
_tip_contents = [last_liquid_and_airgap_in_tip]
11441153
components_executor = tx_comps_executor.TransferComponentsExecutor(
11451154
instrument_core=self,
11461155
transfer_properties=transfer_properties,
@@ -1163,8 +1172,8 @@ def aspirate_liquid_class(
11631172
components_executor.aspirate_and_wait(volume=volume)
11641173
components_executor.retract_after_aspiration(volume=volume)
11651174
last_contents = components_executor.tip_state.last_liquid_and_air_gap_in_tip
1166-
tip_contents[-1] = last_contents
1167-
return tip_contents
1175+
_tip_contents[-1] = last_contents
1176+
return _tip_contents
11681177

11691178
def dispense_liquid_class(
11701179
self,
@@ -1208,6 +1217,7 @@ def dispense_liquid_class(
12081217
"""
12091218
dispense_props = transfer_properties.dispense
12101219
dest_loc, dest_well = dest
1220+
_tip_contents = tip_contents.copy()
12111221
dispense_point = (
12121222
tx_comps_executor.absolute_point_from_position_reference_and_offset(
12131223
well=dest_well,
@@ -1216,14 +1226,14 @@ def dispense_liquid_class(
12161226
)
12171227
)
12181228
dispense_location = Location(dispense_point, labware=dest_loc.labware)
1219-
if len(tip_contents) > 0:
1220-
last_liquid_and_airgap_in_tip = tip_contents[-1]
1229+
if len(_tip_contents) > 0:
1230+
last_liquid_and_airgap_in_tip = _tip_contents[-1]
12211231
else:
12221232
last_liquid_and_airgap_in_tip = tx_comps_executor.LiquidAndAirGapPair(
12231233
liquid=0,
12241234
air_gap=0,
12251235
)
1226-
tip_contents = [last_liquid_and_airgap_in_tip]
1236+
_tip_contents = [last_liquid_and_airgap_in_tip]
12271237
components_executor = tx_comps_executor.TransferComponentsExecutor(
12281238
instrument_core=self,
12291239
transfer_properties=transfer_properties,
@@ -1254,8 +1264,8 @@ def dispense_liquid_class(
12541264
source_well=source[1] if source else None,
12551265
)
12561266
last_contents = components_executor.tip_state.last_liquid_and_air_gap_in_tip
1257-
tip_contents[-1] = last_contents
1258-
return tip_contents
1267+
_tip_contents[-1] = last_contents
1268+
return _tip_contents
12591269

12601270
def retract(self) -> None:
12611271
"""Retract this instrument to the top of the gantry."""

‎api/src/opentrons/protocol_api/core/engine/transfer_components_executor.py

+1
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ def retract_after_dispensing(
387387
blowout_props.enabled
388388
and blowout_props.location != BlowoutLocation.DESTINATION
389389
):
390+
# TODO: no-op touch tip if touch tip is enabled and blowout is in trash/ reservoir/ any labware with touch-tip disabled
390391
assert blowout_props.flow_rate is not None
391392
self._instrument.set_flow_rate(blow_out=blowout_props.flow_rate)
392393
touch_tip_and_air_gap_location: Optional[Location]

‎api/tests/opentrons/protocol_api_integration/test_transfer_with_liquid_classes.py

+195-24
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
"""Tests for the transfer APIs using liquid classes."""
22
import pytest
3+
import mock
34
from decoy import Decoy
45
from opentrons_shared_data.robot.types import RobotTypeEnum
56

67
from opentrons.protocol_api import ProtocolContext
78
from opentrons.config import feature_flags as ff
9+
from opentrons.protocol_api.core.engine import InstrumentCore
10+
from opentrons.protocol_api.core.engine.transfer_components_executor import (
11+
TransferType,
12+
LiquidAndAirGapPair,
13+
)
814

915

1016
@pytest.mark.ot3_only
1117
@pytest.mark.parametrize(
1218
"simulated_protocol_context", [("2.20", "Flex")], indirect=True
1319
)
14-
def test_water_transfer(
20+
def test_water_transfer_with_volume_more_than_tip_max(
1521
decoy: Decoy, mock_feature_flags: None, simulated_protocol_context: ProtocolContext
1622
) -> None:
1723
"""It should run the transfer steps without any errors.
@@ -36,29 +42,194 @@ def test_water_transfer(
3642
)
3743

3844
water = simulated_protocol_context.define_liquid_class("water")
39-
pipette_50.transfer_liquid(
40-
liquid_class=water,
41-
volume=60,
42-
source=nest_plate.rows()[0],
43-
dest=arma_plate.rows()[0],
44-
new_tip="always",
45-
trash_location=trash,
45+
with mock.patch.object(
46+
InstrumentCore,
47+
"pick_up_tip",
48+
side_effect=InstrumentCore.pick_up_tip,
49+
autospec=True,
50+
) as patched_pick_up_tip:
51+
mock_manager = mock.Mock()
52+
mock_manager.attach_mock(patched_pick_up_tip, "pick_up_tip")
53+
54+
pipette_50.transfer_liquid(
55+
liquid_class=water,
56+
volume=60,
57+
source=nest_plate.rows()[0],
58+
dest=arma_plate.rows()[0],
59+
new_tip="always",
60+
trash_location=trash,
61+
)
62+
assert patched_pick_up_tip.call_count == 24
63+
patched_pick_up_tip.reset_mock()
64+
65+
pipette_50.transfer_liquid(
66+
liquid_class=water,
67+
volume=100,
68+
source=nest_plate.rows()[0],
69+
dest=arma_plate.rows()[0],
70+
new_tip="per source",
71+
trash_location=trash,
72+
)
73+
assert patched_pick_up_tip.call_count == 12
74+
patched_pick_up_tip.reset_mock()
75+
76+
pipette_50.pick_up_tip()
77+
pipette_50.transfer_liquid(
78+
liquid_class=water,
79+
volume=50,
80+
source=nest_plate.rows()[0],
81+
dest=arma_plate.rows()[0],
82+
new_tip="never",
83+
trash_location=trash,
84+
)
85+
pipette_50.drop_tip()
86+
assert patched_pick_up_tip.call_count == 1
87+
88+
89+
@pytest.mark.ot3_only
90+
@pytest.mark.parametrize(
91+
"simulated_protocol_context", [("2.20", "Flex")], indirect=True
92+
)
93+
def test_order_of_water_transfer_steps(
94+
decoy: Decoy, mock_feature_flags: None, simulated_protocol_context: ProtocolContext
95+
) -> None:
96+
"""It should run the transfer steps without any errors.
97+
98+
This test only checks that various supported configurations for a transfer
99+
analyze successfully. It doesn't check whether the steps are as expected.
100+
That will be covered in analysis snapshot tests.
101+
"""
102+
decoy.when(ff.allow_liquid_classes(RobotTypeEnum.FLEX)).then_return(True)
103+
trash = simulated_protocol_context.load_trash_bin("A3")
104+
tiprack = simulated_protocol_context.load_labware(
105+
"opentrons_flex_96_tiprack_50ul", "D1"
46106
)
47-
pipette_50.transfer_liquid(
48-
liquid_class=water,
49-
volume=60,
50-
source=nest_plate.rows()[0],
51-
dest=arma_plate.rows()[0],
52-
new_tip="per source",
53-
trash_location=trash,
107+
pipette_50 = simulated_protocol_context.load_instrument(
108+
"flex_1channel_50", mount="left", tip_racks=[tiprack]
54109
)
55-
pipette_50.pick_up_tip()
56-
pipette_50.transfer_liquid(
57-
liquid_class=water,
58-
volume=50,
59-
source=nest_plate.rows()[0],
60-
dest=arma_plate.rows()[0],
61-
new_tip="never",
62-
trash_location=trash,
110+
nest_plate = simulated_protocol_context.load_labware(
111+
"nest_96_wellplate_200ul_flat", "C3"
63112
)
64-
pipette_50.drop_tip()
113+
arma_plate = simulated_protocol_context.load_labware(
114+
"armadillo_96_wellplate_200ul_pcr_full_skirt", "C2"
115+
)
116+
117+
water = simulated_protocol_context.define_liquid_class("water")
118+
with (
119+
mock.patch.object(
120+
InstrumentCore,
121+
"load_liquid_class",
122+
side_effect=InstrumentCore.load_liquid_class,
123+
autospec=True,
124+
) as patched_load_liquid_class,
125+
mock.patch.object(
126+
InstrumentCore,
127+
"pick_up_tip",
128+
side_effect=InstrumentCore.pick_up_tip,
129+
autospec=True,
130+
) as patched_pick_up_tip,
131+
mock.patch.object(
132+
InstrumentCore,
133+
"aspirate_liquid_class",
134+
side_effect=InstrumentCore.aspirate_liquid_class,
135+
autospec=True,
136+
) as patched_aspirate,
137+
mock.patch.object(
138+
InstrumentCore,
139+
"dispense_liquid_class",
140+
side_effect=InstrumentCore.dispense_liquid_class,
141+
autospec=True,
142+
) as patched_dispense,
143+
mock.patch.object(
144+
InstrumentCore,
145+
"drop_tip_in_disposal_location",
146+
side_effect=InstrumentCore.drop_tip_in_disposal_location,
147+
autospec=True,
148+
) as patched_drop_tip,
149+
):
150+
mock_manager = mock.Mock()
151+
mock_manager.attach_mock(patched_pick_up_tip, "pick_up_tip")
152+
mock_manager.attach_mock(patched_load_liquid_class, "load_liquid_class")
153+
mock_manager.attach_mock(patched_aspirate, "aspirate_liquid_class")
154+
mock_manager.attach_mock(patched_dispense, "dispense_liquid_class")
155+
mock_manager.attach_mock(patched_drop_tip, "drop_tip_in_disposal_location")
156+
pipette_50.transfer_liquid(
157+
liquid_class=water,
158+
volume=40,
159+
source=nest_plate.rows()[0][:2],
160+
dest=arma_plate.rows()[0][:2],
161+
new_tip="always",
162+
trash_location=trash,
163+
)
164+
expected_calls = [
165+
mock.call.load_liquid_class(
166+
mock.ANY,
167+
name="water",
168+
transfer_properties=mock.ANY,
169+
tiprack_uri="opentrons/opentrons_flex_96_tiprack_50ul/1",
170+
),
171+
mock.call.pick_up_tip(
172+
mock.ANY,
173+
location=mock.ANY,
174+
well_core=mock.ANY,
175+
presses=mock.ANY,
176+
increment=mock.ANY,
177+
),
178+
mock.call.aspirate_liquid_class(
179+
mock.ANY,
180+
volume=40,
181+
source=mock.ANY,
182+
transfer_properties=mock.ANY,
183+
transfer_type=TransferType.ONE_TO_ONE,
184+
tip_contents=[LiquidAndAirGapPair(liquid=0, air_gap=0)],
185+
),
186+
mock.call.dispense_liquid_class(
187+
mock.ANY,
188+
volume=40,
189+
dest=mock.ANY,
190+
source=mock.ANY,
191+
transfer_properties=mock.ANY,
192+
transfer_type=TransferType.ONE_TO_ONE,
193+
tip_contents=[LiquidAndAirGapPair(liquid=0, air_gap=0.1)],
194+
trash_location=mock.ANY,
195+
),
196+
mock.call.drop_tip_in_disposal_location(
197+
mock.ANY,
198+
disposal_location=trash,
199+
home_after=False,
200+
alternate_tip_drop=True,
201+
),
202+
mock.call.pick_up_tip(
203+
mock.ANY,
204+
location=mock.ANY,
205+
well_core=mock.ANY,
206+
presses=mock.ANY,
207+
increment=mock.ANY,
208+
),
209+
mock.call.aspirate_liquid_class(
210+
mock.ANY,
211+
volume=40,
212+
source=mock.ANY,
213+
transfer_properties=mock.ANY,
214+
transfer_type=TransferType.ONE_TO_ONE,
215+
tip_contents=[LiquidAndAirGapPair(liquid=0, air_gap=0)],
216+
),
217+
mock.call.dispense_liquid_class(
218+
mock.ANY,
219+
volume=40,
220+
dest=mock.ANY,
221+
source=mock.ANY,
222+
transfer_properties=mock.ANY,
223+
transfer_type=TransferType.ONE_TO_ONE,
224+
tip_contents=[LiquidAndAirGapPair(liquid=40, air_gap=0.1)],
225+
trash_location=mock.ANY,
226+
),
227+
mock.call.drop_tip_in_disposal_location(
228+
mock.ANY,
229+
disposal_location=trash,
230+
home_after=False,
231+
alternate_tip_drop=True,
232+
),
233+
]
234+
assert len(mock_manager.mock_calls) == 9
235+
assert mock_manager.mock_calls == expected_calls

0 commit comments

Comments
 (0)