Skip to content

Commit 5983cd6

Browse files
sfoster1sfoster1
committed
lint and format
1 parent 0bd0350 commit 5983cd6

File tree

5 files changed

+61
-22
lines changed

5 files changed

+61
-22
lines changed

‎api/src/opentrons/protocol_engine/state/addressable_areas.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ def _add_addressable_area(self, addressable_area_name: str) -> None:
211211
deck_definition=self._state.deck_definition,
212212
)
213213
)
214-
self._state.loaded_addressable_areas_by_name[addressable_area.area_name] = (
215-
addressable_area
216-
)
214+
self._state.loaded_addressable_areas_by_name[
215+
addressable_area.area_name
216+
] = addressable_area
217217

218218
def _validate_addressable_area_for_simulation(
219219
self, addressable_area_name: str
@@ -236,9 +236,9 @@ def _validate_addressable_area_for_simulation(
236236
set(potential_fixtures)
237237
)
238238

239-
self._state.potential_cutout_fixtures_by_cutout_id[cutout_id] = (
240-
remaining_fixtures
241-
)
239+
self._state.potential_cutout_fixtures_by_cutout_id[
240+
cutout_id
241+
] = remaining_fixtures
242242
else:
243243
self._state.potential_cutout_fixtures_by_cutout_id[cutout_id] = set(
244244
potential_fixtures

‎api/tests/opentrons/protocol_engine/state/test_geometry_view.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
OnLabwareLocationSequenceComponent,
7777
NotOnDeckLocationSequenceComponent,
7878
OnCutoutFixtureLocationSequenceComponent,
79-
PotentialCutoutFixture,
8079
)
8180
from opentrons.protocol_engine.commands import (
8281
CommandStatus,

‎robot-server/tests/integration/http_api/protocols/test_v6_json_upload.tavern.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,10 @@ stages:
212212
moduleId: temperatureModuleId
213213
- kind: onAddressableArea
214214
addressableAreaName: '1'
215-
slotName: '1'
215+
- kind: onCutoutFixture
216+
cutoutId: cutout1
217+
possibleCutoutFixtureIds:
218+
- 'singleStandardSlot'
216219
notes: []
217220
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
218221
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
@@ -237,7 +240,10 @@ stages:
237240
moduleId: magneticModuleId
238241
- kind: onAddressableArea
239242
addressableAreaName: '3'
240-
slotName: '3'
243+
- kind: onCutoutFixture
244+
cutoutId: cutout3
245+
possibleCutoutFixtureIds:
246+
- 'singleStandardSlot'
241247
notes: []
242248
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
243249
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
@@ -260,7 +266,10 @@ stages:
260266
locationSequence:
261267
- kind: onAddressableArea
262268
addressableAreaName: '8'
263-
slotName: '8'
269+
- kind: onCutoutFixture
270+
cutoutId: cutout8
271+
possibleCutoutFixtureIds:
272+
- 'singleStandardSlot'
264273
notes: []
265274
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
266275
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"

‎robot-server/tests/integration/http_api/protocols/test_v8_json_upload_flex.tavern.yaml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,19 @@ stages:
219219
labwareId: sourcePlateId
220220
definition: !anydict
221221
locationSequence:
222-
- kind: onModule
223-
moduleId: temperatureModuleId
224222
- kind: onAddressableArea
225223
addressableAreaName: temperatureModuleV2D1
226-
slotName: D1
224+
- kind: onModule
225+
moduleId: temperatureModuleId
226+
- kind: onCutoutFixture
227+
cutoutId: cutoutD1
228+
# note: this is not how it should work and happens because the loadModule
229+
# command always loads onto an addressable area, presenting a conflict between
230+
# the cutout fixture required by the module being present and the cutout fixture
231+
# required by the deck slot addressable area that was used to load the module
232+
# being present. other work will fix this, and once that other work is merged
233+
# this value should be ["temperatureModuleV2"]
234+
possibleCutoutFixtureIds: []
227235
notes: []
228236
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
229237
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
@@ -244,11 +252,14 @@ stages:
244252
labwareId: destPlateId
245253
definition: !anydict
246254
locationSequence:
247-
- kind: onModule
248-
moduleId: magneticBlockId
249255
- kind: onAddressableArea
250256
addressableAreaName: magneticBlockV1D3
251-
slotName: D3
257+
- kind: onModule
258+
moduleId: magneticBlockId
259+
- kind: onCutoutFixture
260+
cutoutId: cutoutD3
261+
# note: this should be ["magneticBlockV1"], see above
262+
possibleCutoutFixtureIds: []
252263
notes: []
253264
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
254265
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
@@ -271,7 +282,10 @@ stages:
271282
locationSequence:
272283
- kind: onAddressableArea
273284
addressableAreaName: B2
274-
slotName: B2
285+
- kind: onCutoutFixture
286+
cutoutId: cutoutB2
287+
possibleCutoutFixtureIds:
288+
- singleCenterSlot
275289
notes: []
276290
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
277291
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
@@ -294,7 +308,12 @@ stages:
294308
locationSequence:
295309
- kind: onAddressableArea
296310
addressableAreaName: A3
297-
slotName: A3
311+
- kind: onCutoutFixture
312+
cutoutId: cutoutA3
313+
possibleCutoutFixtureIds:
314+
- flexStackerModuleV1
315+
- singleRightSlot
316+
- stagingAreaRightSlot
298317
notes: []
299318
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
300319
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"

‎robot-server/tests/integration/http_api/protocols/test_v8_json_upload_ot2.tavern.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,10 @@ stages:
223223
moduleId: temperatureModuleId
224224
- kind: onAddressableArea
225225
addressableAreaName: '1'
226-
slotName: '1'
226+
- kind: onCutoutFixture
227+
cutoutId: cutout1
228+
possibleCutoutFixtureIds:
229+
- singleStandardSlot
227230
notes: []
228231
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
229232
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
@@ -248,7 +251,10 @@ stages:
248251
moduleId: magneticModuleId
249252
- kind: onAddressableArea
250253
addressableAreaName: '3'
251-
slotName: '3'
254+
- kind: onCutoutFixture
255+
cutoutId: cutout3
256+
possibleCutoutFixtureIds:
257+
- singleStandardSlot
252258
notes: []
253259
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
254260
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
@@ -271,7 +277,10 @@ stages:
271277
locationSequence:
272278
- kind: onAddressableArea
273279
addressableAreaName: '8'
274-
slotName: '8'
280+
- kind: onCutoutFixture
281+
cutoutId: cutout8
282+
possibleCutoutFixtureIds:
283+
- singleStandardSlot
275284
notes: []
276285
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
277286
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
@@ -294,7 +303,10 @@ stages:
294303
locationSequence:
295304
- kind: onAddressableArea
296305
addressableAreaName: '12'
297-
slotName: '12'
306+
- kind: onCutoutFixture
307+
cutoutId: cutout12
308+
possibleCutoutFixtureIds:
309+
- singleStandardSlot
298310
notes: []
299311
startedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"
300312
completedAt: !re_fullmatch "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+(Z|([+-]\\d{2}:\\d{2}))"

0 commit comments

Comments
 (0)