Skip to content

Commit f16f6a0

Browse files
jeraderjerader
authored
feat(protocol-designer): add designerApplication labware, pipettes, m… (#17432)
…odules keys closes AUTH-1407 This PR introduces `designerApplication` top level keys for `modules`, `labware`, and `pipettes`. Then when you import a protocol, the migration will grab that info from the load commands and the `load-file` reducer will use that info to populate the `labwareEntities`, `pipetteEntities`, and `moduleEntities`. Additionally, this pr deprecates the `defaultValues` key that was not in use at all
1 parent 476c0a3 commit f16f6a0

17 files changed

+613
-199
lines changed

‎protocol-designer/fixtures/protocol/8/doItAllV3MigratedToV8.json

+22-8
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
"name": "opentrons/protocol-designer",
1616
"version": "8.5.0",
1717
"data": {
18-
"_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT",
19-
"defaultValues": {
20-
"aspirate_mmFromBottom": 1,
21-
"dispense_mmFromBottom": 1,
22-
"touchTip_mmFromTop": -1,
23-
"blowout_mmFromTop": 0
24-
},
18+
"_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT",
2519
"pipetteTiprackAssignments": {
2620
"0b3f2210-75c7-11ea-b42f-4b64e50f43e5": [
2721
"opentrons/opentrons_96_tiprack_300ul/1"
@@ -266,7 +260,27 @@
266260
"3961e4c0-75c7-11ea-b42f-4b64e50f43e5",
267261
"54dc3200-75c7-11ea-b42f-4b64e50f43e5",
268262
"a4cee9a0-75dc-11ea-b42f-4b64e50f43e5"
269-
]
263+
],
264+
"pipettes": {
265+
"0b3f2210-75c7-11ea-b42f-4b64e50f43e5": {
266+
"pipetteName": "p300_single_gen2"
267+
}
268+
},
269+
"modules": {},
270+
"labware": {
271+
"0b44c760-75c7-11ea-b42f-4b64e50f43e5:opentrons/opentrons_96_tiprack_300ul/1": {
272+
"displayName": "Opentrons 96 Tip Rack 300 µL",
273+
"labwareDefURI": "opentrons/opentrons_96_tiprack_300ul/1"
274+
},
275+
"1e610d40-75c7-11ea-b42f-4b64e50f43e5:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1": {
276+
"displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt",
277+
"labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1"
278+
},
279+
"21ed8f60-75c7-11ea-b42f-4b64e50f43e5:opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1": {
280+
"displayName": "Opentrons 24 Well Aluminum Block with Generic 2 mL Screwcap",
281+
"labwareDefURI": "opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1"
282+
}
283+
}
270284
}
271285
},
272286
"robot": {

‎protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json

+29-8
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
"name": "opentrons/protocol-designer",
1616
"version": "8.5.0",
1717
"data": {
18-
"_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT",
19-
"defaultValues": {
20-
"aspirate_mmFromBottom": 1,
21-
"dispense_mmFromBottom": 1,
22-
"touchTip_mmFromTop": -1,
23-
"blowout_mmFromTop": 0
24-
},
18+
"_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT",
2519
"pipetteTiprackAssignments": {
2620
"0b3f2210-75c7-11ea-b42f-4b64e50f43e5": [
2721
"opentrons/opentrons_96_tiprack_300ul/1"
@@ -288,7 +282,34 @@
288282
"4f4057e0-75c7-11ea-b42f-4b64e50f43e5",
289283
"54dc3200-75c7-11ea-b42f-4b64e50f43e5",
290284
"80c00130-75c7-11ea-b42f-4b64e50f43e5"
291-
]
285+
],
286+
"pipettes": {
287+
"0b3f2210-75c7-11ea-b42f-4b64e50f43e5": {
288+
"pipetteName": "p300_single_gen2"
289+
}
290+
},
291+
"modules": {
292+
"0b419310-75c7-11ea-b42f-4b64e50f43e5:magneticModuleType": {
293+
"model": "magneticModuleV2"
294+
},
295+
"0b4319b0-75c7-11ea-b42f-4b64e50f43e5:temperatureModuleType": {
296+
"model": "temperatureModuleV2"
297+
}
298+
},
299+
"labware": {
300+
"0b44c760-75c7-11ea-b42f-4b64e50f43e5:opentrons/opentrons_96_tiprack_300ul/1": {
301+
"displayName": "Opentrons 96 Tip Rack 300 µL",
302+
"labwareDefURI": "opentrons/opentrons_96_tiprack_300ul/1"
303+
},
304+
"1e610d40-75c7-11ea-b42f-4b64e50f43e5:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1": {
305+
"displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt",
306+
"labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1"
307+
},
308+
"21ed8f60-75c7-11ea-b42f-4b64e50f43e5:opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1": {
309+
"displayName": "Opentrons 24 Well Aluminum Block with Generic 2 mL Screwcap",
310+
"labwareDefURI": "opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1"
311+
}
312+
}
292313
}
293314
},
294315
"robot": {

‎protocol-designer/fixtures/protocol/8/doItAllV7MigratedToV8.json

+46-8
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
"name": "opentrons/protocol-designer",
1616
"version": "8.5.0",
1717
"data": {
18-
"_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT",
19-
"defaultValues": {
20-
"aspirate_mmFromBottom": 1,
21-
"dispense_mmFromBottom": 1,
22-
"touchTip_mmFromTop": -1,
23-
"blowout_mmFromTop": 0
24-
},
18+
"_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT",
2519
"pipetteTiprackAssignments": {
2620
"2e7c6344-58ab-465c-b542-489883cb63fe": [
2721
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
@@ -409,7 +403,51 @@
409403
"7747287c-abea-4855-843e-d61b272124b2",
410404
"dcc6a6c7-2db8-417b-a1aa-3927abccfadd",
411405
"2f862881-7ce3-4d20-b0ef-53c8244f6ef3"
412-
]
406+
],
407+
"pipettes": {
408+
"2e7c6344-58ab-465c-b542-489883cb63fe": {
409+
"pipetteName": "p1000_single_flex"
410+
},
411+
"6d1e53c3-2db3-451b-ad60-3fe13781a193": {
412+
"pipetteName": "p50_multi_flex"
413+
}
414+
},
415+
"modules": {
416+
"1be16305-74e7-4bdb-9737-61ec726d2b44:magneticBlockType": {
417+
"model": "magneticBlockV1"
418+
},
419+
"c19dffa3-cb34-4702-bcf6-dcea786257d1:heaterShakerModuleType": {
420+
"model": "heaterShakerModuleV1"
421+
},
422+
"ef44ad7f-0fd9-46d6-8bc0-c70785644cc8:temperatureModuleType": {
423+
"model": "temperatureModuleV2"
424+
},
425+
"627b7a27-5bb7-46de-a530-67af45652e3b:thermocyclerModuleType": {
426+
"model": "thermocyclerModuleV2"
427+
}
428+
},
429+
"labware": {
430+
"d95bb3be-b453-457c-a947-bd03dc8e56b9:opentrons/opentrons_96_flat_bottom_adapter/1": {
431+
"displayName": "Opentrons 96 Flat Bottom Heater-Shaker Adapter",
432+
"labwareDefURI": "opentrons/opentrons_96_flat_bottom_adapter/1"
433+
},
434+
"23ed35de-5bfd-4bb0-8f54-da99a2804ed9:opentrons/opentrons_flex_96_filtertiprack_50ul/1": {
435+
"displayName": "Opentrons Flex 96 Filter Tip Rack 50 µL",
436+
"labwareDefURI": "opentrons/opentrons_flex_96_filtertiprack_50ul/1"
437+
},
438+
"fcba73e7-b88e-438e-963e-f8b9a5de0983:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2": {
439+
"displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt",
440+
"labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2"
441+
},
442+
"a793a135-06aa-4ed6-a1d3-c176c7810afa:opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1": {
443+
"displayName": "Opentrons 24 Well Aluminum Block with NEST 1.5 mL Snapcap",
444+
"labwareDefURI": "opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1"
445+
},
446+
"239ceac8-23ec-4900-810a-70aeef880273:opentrons/nest_96_wellplate_200ul_flat/2": {
447+
"displayName": "NEST 96 Well Plate 200 µL Flat",
448+
"labwareDefURI": "opentrons/nest_96_wellplate_200ul_flat/2"
449+
}
450+
}
413451
}
414452
},
415453
"robot": {

‎protocol-designer/fixtures/protocol/8/doItAllV8.json

+33-8
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
"name": "opentrons/protocol-designer",
1616
"version": "8.5.0",
1717
"data": {
18-
"_internalAppBuildDate": "Wed, 05 Feb 2025 18:32:26 GMT",
19-
"defaultValues": {
20-
"aspirate_mmFromBottom": 1,
21-
"dispense_mmFromBottom": 1,
22-
"touchTip_mmFromTop": -1,
23-
"blowout_mmFromTop": 0
24-
},
18+
"_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT",
2519
"pipetteTiprackAssignments": {
2620
"9fcd50d9-92b2-45ac-acf1-e2cf773feffc": [
2721
"opentrons/opentrons_flex_96_tiprack_1000ul/1"
@@ -358,7 +352,38 @@
358352
"2b8f84e2-b079-41e8-a66e-ff8d9c5dfe1d",
359353
"07dd4472-3ea4-475c-8fd3-18819519b401",
360354
"ed84f11e-db82-4039-9e04-e619b03af42f"
361-
]
355+
],
356+
"pipettes": {
357+
"9fcd50d9-92b2-45ac-acf1-e2cf773feffc": {
358+
"pipetteName": "p1000_single_flex"
359+
}
360+
},
361+
"modules": {
362+
"23347241-80bb-4a7e-9c91-5d9727a9e483:heaterShakerModuleType": {
363+
"model": "heaterShakerModuleV1"
364+
},
365+
"fd6da9f1-d63b-414b-929e-c646b64790e9:thermocyclerModuleType": {
366+
"model": "thermocyclerModuleV2"
367+
}
368+
},
369+
"labware": {
370+
"7c4d59fa-0e50-442f-adce-9e4b0c7f0b88:opentrons/opentrons_96_pcr_adapter/1": {
371+
"displayName": "Opentrons 96 PCR Heater-Shaker Adapter",
372+
"labwareDefURI": "opentrons/opentrons_96_pcr_adapter/1"
373+
},
374+
"f2d371ea-5146-4c89-8200-9c056a7f321a:opentrons/opentrons_flex_96_tiprack_1000ul/1": {
375+
"displayName": "Opentrons Flex 96 Tip Rack 1000 µL",
376+
"labwareDefURI": "opentrons/opentrons_flex_96_tiprack_1000ul/1"
377+
},
378+
"54370838-4fca-4a14-b88a-7840e4903649:opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2": {
379+
"displayName": "Opentrons Tough 96 Well Plate 200 µL PCR Full Skirt",
380+
"labwareDefURI": "opentrons/opentrons_96_wellplate_200ul_pcr_full_skirt/2"
381+
},
382+
"8bacda22-9e05-45e8-bef4-cc04414a204f:opentrons/axygen_1_reservoir_90ml/1": {
383+
"displayName": "Axygen 1 Well Reservoir 90 mL",
384+
"labwareDefURI": "opentrons/axygen_1_reservoir_90ml/1"
385+
}
386+
}
362387
}
363388
},
364389
"robot": {

‎protocol-designer/fixtures/protocol/8/example_1_1_0MigratedToV8.json

+25-8
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
"name": "opentrons/protocol-designer",
1616
"version": "8.5.0",
1717
"data": {
18-
"_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT",
19-
"defaultValues": {
20-
"aspirate_mmFromBottom": 1,
21-
"dispense_mmFromBottom": 1,
22-
"touchTip_mmFromTop": -1,
23-
"blowout_mmFromTop": 0
24-
},
18+
"_internalAppBuildDate": "Thu, 30 Jan 2025 17:05:24 GMT",
2519
"pipetteTiprackAssignments": {
2620
"c6f45030-92a5-11e9-ac62-1b173f839d9e": [
2721
"opentrons/opentrons_96_tiprack_10ul/1"
@@ -235,7 +229,30 @@
235229
"e7d36200-92a5-11e9-ac62-1b173f839d9e",
236230
"18113c80-92a6-11e9-ac62-1b173f839d9e",
237231
"2e622080-92a6-11e9-ac62-1b173f839d9e"
238-
]
232+
],
233+
"pipettes": {
234+
"c6f45030-92a5-11e9-ac62-1b173f839d9e": {
235+
"pipetteName": "p10_single"
236+
},
237+
"c6f47740-92a5-11e9-ac62-1b173f839d9e": {
238+
"pipetteName": "p50_single"
239+
}
240+
},
241+
"modules": {},
242+
"labware": {
243+
"c6f4ec70-92a5-11e9-ac62-1b173f839d9e:tiprack-10ul:opentrons/opentrons_96_tiprack_10ul/1": {
244+
"displayName": "tiprack 10ul (1)",
245+
"labwareDefURI": "opentrons/opentrons_96_tiprack_10ul/1"
246+
},
247+
"c6f51380-92a5-11e9-ac62-1b173f839d9e:tiprack-200ul:opentrons/tipone_96_tiprack_200ul/1": {
248+
"displayName": "tiprack 200ul (1)",
249+
"labwareDefURI": "opentrons/tipone_96_tiprack_200ul/1"
250+
},
251+
"dafd4000-92a5-11e9-ac62-1b173f839d9e:96-deep-well:opentrons/usascientific_96_wellplate_2.4ml_deep/1": {
252+
"displayName": "96 deep well (1)",
253+
"labwareDefURI": "opentrons/usascientific_96_wellplate_2.4ml_deep/1"
254+
}
255+
}
239256
}
240257
},
241258
"robot": {

‎protocol-designer/fixtures/protocol/8/mix_8_0_0.json

+18-8
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,9 @@
1313
},
1414
"designerApplication": {
1515
"name": "opentrons/protocol-designer",
16-
"version": "8.2.0",
16+
"version": "8.5.0",
1717
"data": {
1818
"_internalAppBuildDate": "Wed, 01 May 2024 13:32:34 GMT",
19-
"defaultValues": {
20-
"aspirate_mmFromBottom": 1,
21-
"dispense_mmFromBottom": 1,
22-
"touchTip_mmFromTop": -1,
23-
"blowout_mmFromTop": 0
24-
},
2519
"pipetteTiprackAssignments": {
2620
"pipetteId": ["opentrons/opentrons_96_tiprack_10ul/1"]
2721
},
@@ -91,7 +85,23 @@
9185
"orderedStepIds": [
9286
"f59ea8e0-fc3a-11ea-8809-e959e7d61d96",
9387
"fc4dc7c0-fc3a-11ea-8809-e959e7d61d96"
94-
]
88+
],
89+
"pipettes": {
90+
"pipetteId": {
91+
"pipetteName": "p20_single_gen2"
92+
}
93+
},
94+
"modules": {},
95+
"labware": {
96+
"f1c677c0-fc3a-11ea-8809-e959e7d61d96:opentrons/opentrons_96_tiprack_10ul/1": {
97+
"displayName": "Opentrons OT-2 96 Tip Rack 10 µL",
98+
"labwareDefURI": "opentrons/opentrons_96_tiprack_10ul/1"
99+
},
100+
"fe572c50-fc3a-11ea-8809-e959e7d61d96:opentrons/biorad_96_wellplate_200ul_pcr/1": {
101+
"displayName": "Bio-Rad 96 Well Plate 200 µL PCR",
102+
"labwareDefURI": "opentrons/biorad_96_wellplate_200ul_pcr/1"
103+
}
104+
}
95105
}
96106
},
97107
"robot": { "model": "OT-2 Standard", "deckId": "ot2_standard" },

‎protocol-designer/fixtures/protocol/8/newAdvancedSettingsAndMultiTemp.json

+33-8
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
"name": "opentrons/protocol-designer",
1616
"version": "8.5.0",
1717
"data": {
18-
"_internalAppBuildDate": "Tue, 04 Feb 2025 15:16:30 GMT",
19-
"defaultValues": {
20-
"aspirate_mmFromBottom": 1,
21-
"dispense_mmFromBottom": 1,
22-
"touchTip_mmFromTop": -1,
23-
"blowout_mmFromTop": 0
24-
},
18+
"_internalAppBuildDate": "Wed, 29 Jan 2025 13:23:47 GMT",
2519
"pipetteTiprackAssignments": {
2620
"21087f15-4c03-4587-8a2b-1ba0b5a501a0": [
2721
"opentrons/opentrons_flex_96_tiprack_50ul/1"
@@ -186,7 +180,38 @@
186180
"c72b4af9-7488-4109-8221-15a5433f4fd8",
187181
"ffb0d1ff-8146-409c-9248-2065a3b27c4d",
188182
"eab2ec89-6d11-4246-ae91-d451cb3a5b1d"
189-
]
183+
],
184+
"pipettes": {
185+
"21087f15-4c03-4587-8a2b-1ba0b5a501a0": {
186+
"pipetteName": "p50_single_flex"
187+
}
188+
},
189+
"modules": {
190+
"d6966555-6c0e-45e0-8056-428d7c486401:temperatureModuleType": {
191+
"model": "temperatureModuleV2"
192+
},
193+
"b9c56153-9026-42d1-8113-949e15254571:temperatureModuleType": {
194+
"model": "temperatureModuleV2"
195+
}
196+
},
197+
"labware": {
198+
"32b596f6-79bb-4ad8-a34a-c44620fdb68f:opentrons/opentrons_96_well_aluminum_block/1": {
199+
"displayName": "Opentrons 96 Well Aluminum Block",
200+
"labwareDefURI": "opentrons/opentrons_96_well_aluminum_block/1"
201+
},
202+
"0d39213c-49c2-4170-bf19-4c09e1b72aca:opentrons/opentrons_flex_96_tiprack_50ul/1": {
203+
"displayName": "Opentrons Flex 96 Tip Rack 50 µL",
204+
"labwareDefURI": "opentrons/opentrons_flex_96_tiprack_50ul/1"
205+
},
206+
"c3c4e3fd-069f-4f3d-9b70-016a20f36de7:opentrons/opentrons_24_aluminumblock_nest_1.5ml_screwcap/1": {
207+
"displayName": "Opentrons 24 Well Aluminum Block with NEST 1.5 mL Screwcap",
208+
"labwareDefURI": "opentrons/opentrons_24_aluminumblock_nest_1.5ml_screwcap/1"
209+
},
210+
"c0093e5f-3f7d-4cbf-aa17-d88394108501:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2": {
211+
"displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt",
212+
"labwareDefURI": "opentrons/nest_96_wellplate_100ul_pcr_full_skirt/2"
213+
}
214+
}
190215
}
191216
},
192217
"robot": {

0 commit comments

Comments
 (0)