diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[004ebb2b82][OT2_S_v2_11_P10S_P300M_MM_TC1_TM_Swift].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[004ebb2b82][OT2_S_v2_11_P10S_P300M_MM_TC1_TM_Swift].json index 4585677390bb..e299763ce0e1 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[004ebb2b82][OT2_S_v2_11_P10S_P300M_MM_TC1_TM_Swift].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[004ebb2b82][OT2_S_v2_11_P10S_P300M_MM_TC1_TM_Swift].json @@ -254,7 +254,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -1406,7 +1412,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2558,7 +2570,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3710,7 +3728,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "6", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -5222,7 +5246,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -5625,7 +5659,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "4", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -6829,7 +6873,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "7", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[011481812b][OT2_S_v2_7_P20S_None_Walkthrough].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[011481812b][OT2_S_v2_7_P20S_None_Walkthrough].json index dab1dbcf5c2b..2dc216617162 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[011481812b][OT2_S_v2_7_P20S_None_Walkthrough].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[011481812b][OT2_S_v2_7_P20S_None_Walkthrough].json @@ -1162,7 +1162,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2314,7 +2320,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[1c19a2055c][OT2_S_v2_4_P300M_None_MM_TM_Zymo].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[1c19a2055c][OT2_S_v2_4_P300M_None_MM_TM_Zymo].json index b38362f01811..5b53fb81af51 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[1c19a2055c][OT2_S_v2_4_P300M_None_MM_TM_Zymo].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[1c19a2055c][OT2_S_v2_4_P300M_None_MM_TM_Zymo].json @@ -1502,7 +1502,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "6", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3128,7 +3138,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3221,7 +3241,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "9", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3468,7 +3494,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3715,7 +3747,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -4868,7 +4906,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -6021,7 +6065,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "7", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -7174,7 +7224,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "8", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -8327,7 +8383,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "10", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -9480,7 +9542,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "11", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -10633,7 +10701,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "4", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[3251c6e175][OT2_S_v2_2_P300S_None_MM1_MM2_EngageMagHeightFromBase].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[3251c6e175][OT2_S_v2_2_P300S_None_MM1_MM2_EngageMagHeightFromBase].json index df67145c9d73..6c493165ae96 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[3251c6e175][OT2_S_v2_2_P300S_None_MM1_MM2_EngageMagHeightFromBase].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[3251c6e175][OT2_S_v2_2_P300S_None_MM1_MM2_EngageMagHeightFromBase].json @@ -1425,7 +1425,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[6f3e297a11][OT2_S_v2_3_P300S_None_MM1_MM2_TM_Mix].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[6f3e297a11][OT2_S_v2_3_P300S_None_MM1_MM2_TM_Mix].json index c37d22a7b4be..9e81328e05b1 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[6f3e297a11][OT2_S_v2_3_P300S_None_MM1_MM2_TM_Mix].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[6f3e297a11][OT2_S_v2_3_P300S_None_MM1_MM2_TM_Mix].json @@ -1190,7 +1190,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2342,7 +2348,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8455adcea9][OT2_S_v2_12_P300M_P20S_FailOnRun].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8455adcea9][OT2_S_v2_12_P300M_P20S_FailOnRun].json index 78518efc2cde..17e8c8952910 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8455adcea9][OT2_S_v2_12_P300M_P20S_FailOnRun].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8455adcea9][OT2_S_v2_12_P300M_P20S_FailOnRun].json @@ -1161,7 +1161,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2314,7 +2320,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2595,7 +2607,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[94913d2988][OT2_S_v3_P300SGen1_None_Gen1PipetteSimple].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[94913d2988][OT2_S_v3_P300SGen1_None_Gen1PipetteSimple].json index bf6463ac3546..b3bd87c52222 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[94913d2988][OT2_S_v3_P300SGen1_None_Gen1PipetteSimple].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[94913d2988][OT2_S_v3_P300SGen1_None_Gen1PipetteSimple].json @@ -111,7 +111,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "12", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -1264,7 +1270,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -1357,7 +1369,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2609,7 +2627,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "4", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3762,7 +3786,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "6", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[9618a6623c][OT2_X_v2_11_P300S_TC1_TC2_ThermocyclerMoamError].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[9618a6623c][OT2_X_v2_11_P300S_TC1_TC2_ThermocyclerMoamError].json index 407236c5c352..7ce5e6b336a1 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[9618a6623c][OT2_X_v2_11_P300S_TC1_TC2_ThermocyclerMoamError].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[9618a6623c][OT2_X_v2_11_P300S_TC1_TC2_ThermocyclerMoamError].json @@ -254,7 +254,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -1406,7 +1412,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2695,7 +2707,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "7", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[a66d700ed6][OT2_S_v2_13_P300M_P20S_HS_TC_TM_SmokeTestV3].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[a66d700ed6][OT2_S_v2_13_P300M_P20S_HS_TC_TM_SmokeTestV3].json index e3a2348a77bb..e26d7485abbb 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[a66d700ed6][OT2_S_v2_13_P300M_P20S_HS_TC_TM_SmokeTestV3].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[a66d700ed6][OT2_S_v2_13_P300M_P20S_HS_TC_TM_SmokeTestV3].json @@ -1217,7 +1217,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2370,7 +2376,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "4", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -4606,7 +4618,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "9", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -5770,7 +5792,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -6925,7 +6957,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "7", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -7049,7 +7091,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "6", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -8205,7 +8253,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -8452,7 +8506,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[c821e64fad][OT2_S_v2_13_P300M_P20S_MM_TC_TM_Smoke620Release].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[c821e64fad][OT2_S_v2_13_P300M_P20S_MM_TC_TM_Smoke620Release].json index 5f7c058b2cff..3b9d53528063 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[c821e64fad][OT2_S_v2_13_P300M_P20S_MM_TC_TM_Smoke620Release].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[c821e64fad][OT2_S_v2_13_P300M_P20S_MM_TC_TM_Smoke620Release].json @@ -1161,7 +1161,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2314,7 +2320,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3899,7 +3911,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "4", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -5054,7 +5076,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "9", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -6209,7 +6241,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "7", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -6333,7 +6375,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "6", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -7489,7 +7537,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -7736,7 +7790,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[c9e6e3d59d][OT2_X_v4_P300M_P20S_MM_TC1_TM_e2eTests].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[c9e6e3d59d][OT2_X_v4_P300M_P20S_MM_TC1_TM_e2eTests].json index e361a7704037..04814db50f2e 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[c9e6e3d59d][OT2_X_v4_P300M_P20S_MM_TC1_TM_e2eTests].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[c9e6e3d59d][OT2_X_v4_P300M_P20S_MM_TC1_TM_e2eTests].json @@ -856,7 +856,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "12", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2009,7 +2015,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3162,7 +3174,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "4", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3255,7 +3273,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3502,7 +3526,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "6", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -4658,7 +4688,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -5822,7 +5862,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -6975,7 +7025,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "9", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[d6026e11c5][OT2_X_v2_7_P300S_TwinningError].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[d6026e11c5][OT2_X_v2_7_P300S_TwinningError].json index 43e37f78a664..0a9c67879a9a 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[d6026e11c5][OT2_X_v2_7_P300S_TwinningError].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[d6026e11c5][OT2_X_v2_7_P300S_TwinningError].json @@ -1160,7 +1160,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -1406,7 +1412,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2588,7 +2600,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[e4660ca6df][OT2_S_v4_P300S_None_MM_TM_TM_MOAMTemps].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[e4660ca6df][OT2_S_v4_P300S_None_MM_TM_TM_MOAMTemps].json index ad31529bb19e..b9b8ca465cca 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[e4660ca6df][OT2_S_v4_P300S_None_MM_TM_TM_MOAMTemps].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[e4660ca6df][OT2_S_v4_P300S_None_MM_TM_TM_MOAMTemps].json @@ -1250,7 +1250,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "12", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2403,7 +2409,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[f345e8e33a][OT2_S_v4_P300M_P20S_MM_TM_TC1_PD40].json b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[f345e8e33a][OT2_S_v4_P300M_P20S_MM_TM_TC1_PD40].json index edad4755cf88..e41dc3fb546e 100644 --- a/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[f345e8e33a][OT2_S_v4_P300M_P20S_MM_TM_TC1_PD40].json +++ b/analyses-snapshot-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[f345e8e33a][OT2_S_v4_P300M_P20S_MM_TM_TC1_PD40].json @@ -856,7 +856,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "12", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -2009,7 +2015,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "2", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3162,7 +3174,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "4", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3255,7 +3273,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "5", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -3502,7 +3526,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "6", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -4658,7 +4688,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "1", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -5822,7 +5862,17 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "kind": "onModule", + "moduleId": "UUID" + }, + { + "addressableAreaName": "3", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" @@ -6975,7 +7025,13 @@ } } }, - "labwareId": "UUID" + "labwareId": "UUID", + "locationSequence": [ + { + "addressableAreaName": "9", + "kind": "onAddressableArea" + } + ] }, "startedAt": "TIMESTAMP", "status": "succeeded" diff --git a/api/src/opentrons/protocol_runner/legacy_command_mapper.py b/api/src/opentrons/protocol_runner/legacy_command_mapper.py index 4df76910a340..5237db9dffd4 100644 --- a/api/src/opentrons/protocol_runner/legacy_command_mapper.py +++ b/api/src/opentrons/protocol_runner/legacy_command_mapper.py @@ -634,13 +634,21 @@ def _map_labware_load( count = self._command_count["LOAD_LABWARE"] slot = labware_load_info.deck_slot location: pe_types.LabwareLocation + location_sequence: pe_types.LabwareLocationSequence = [] if labware_load_info.on_module: - location = pe_types.ModuleLocation.model_construct( - moduleId=self._module_id_by_slot[slot] + module_id = self._module_id_by_slot[slot] + location = pe_types.ModuleLocation.model_construct(moduleId=module_id) + location_sequence.append( + pe_types.OnModuleLocationSequenceComponent(moduleId=module_id) ) else: location = pe_types.DeckSlotLocation.model_construct(slotName=slot) + location_sequence.append( + pe_types.OnAddressableAreaLocationSequenceComponent( + addressableAreaName=slot.value + ) + ) command_id = f"commands.LOAD_LABWARE-{count}" labware_id = f"labware-{count}" @@ -665,8 +673,7 @@ def _map_labware_load( labware_load_info.labware_definition ), offsetId=labware_load_info.offset_id, - # These legacy json protocols don't get location sequences because - # to do so we'd have to go back and look up where the module gets loaded + locationSequence=location_sequence, ), ) queue_action = pe_actions.QueueCommandAction( diff --git a/api/tests/opentrons/protocol_runner/test_legacy_command_mapper.py b/api/tests/opentrons/protocol_runner/test_legacy_command_mapper.py index 605df5435ed8..a6026c32f03e 100644 --- a/api/tests/opentrons/protocol_runner/test_legacy_command_mapper.py +++ b/api/tests/opentrons/protocol_runner/test_legacy_command_mapper.py @@ -22,12 +22,11 @@ ModuleLoadInfo as LegacyModuleLoadInfo, ) from opentrons.protocol_engine import ( - DeckSlotLocation, - ModuleLocation, ModuleModel, ModuleDefinition, commands as pe_commands, actions as pe_actions, + types as pe_types, ) from opentrons.protocol_engine.error_recovery_policy import ErrorRecoveryType from opentrons.protocol_engine.resources import ( @@ -282,7 +281,7 @@ def test_map_labware_load(minimal_labware_def: LabwareDefinition2) -> None: expected_id_and_key = "commands.LOAD_LABWARE-0" expected_params = pe_commands.LoadLabwareParams( - location=DeckSlotLocation(slotName=DeckSlotName.SLOT_1), + location=pe_types.DeckSlotLocation(slotName=DeckSlotName.SLOT_1), namespace="some_namespace", loadName="some_load_name", version=123, @@ -317,6 +316,11 @@ def test_map_labware_load(minimal_labware_def: LabwareDefinition2) -> None: # get passed through correctly. definition=matchers.Anything(), offsetId="labware-offset-id-123", + locationSequence=[ + pe_types.OnAddressableAreaLocationSequenceComponent( + addressableAreaName="1" + ) + ], ), notes=[], ), @@ -325,7 +329,7 @@ def test_map_labware_load(minimal_labware_def: LabwareDefinition2) -> None: labware_id="labware-0", definition=matchers.Anything(), offset_id="labware-offset-id-123", - new_location=DeckSlotLocation(slotName=DeckSlotName.SLOT_1), + new_location=pe_types.DeckSlotLocation(slotName=DeckSlotName.SLOT_1), display_name="My special labware", ) ), @@ -426,7 +430,7 @@ def test_map_module_load( expected_id_and_key = "commands.LOAD_MODULE-0" expected_params = pe_commands.LoadModuleParams.model_construct( model=ModuleModel.TEMPERATURE_MODULE_V1, - location=DeckSlotLocation(slotName=DeckSlotName.SLOT_1), + location=pe_types.DeckSlotLocation(slotName=DeckSlotName.SLOT_1), moduleId=matchers.IsA(str), ) expected_queue = pe_actions.QueueCommandAction( @@ -483,7 +487,7 @@ def test_map_module_labware_load(minimal_labware_def: LabwareDefinition2) -> Non expected_id_and_key = "commands.LOAD_LABWARE-0" expected_params = pe_commands.LoadLabwareParams.model_construct( - location=ModuleLocation(moduleId="module-123"), + location=pe_types.ModuleLocation(moduleId="module-123"), namespace="some_namespace", loadName="some_load_name", version=123, @@ -518,6 +522,12 @@ def test_map_module_labware_load(minimal_labware_def: LabwareDefinition2) -> Non # get passed through correctly. definition=matchers.Anything(), offsetId="labware-offset-id-123", + locationSequence=[ + pe_types.OnModuleLocationSequenceComponent(moduleId="module-123"), + pe_types.OnAddressableAreaLocationSequenceComponent( + addressableAreaName="1" + ), + ], ), notes=[], ), @@ -526,7 +536,7 @@ def test_map_module_labware_load(minimal_labware_def: LabwareDefinition2) -> Non labware_id="labware-0", definition=matchers.Anything(), offset_id="labware-offset-id-123", - new_location=ModuleLocation(moduleId="module-123"), + new_location=pe_types.ModuleLocation(moduleId="module-123"), display_name="My very special module labware", ) ),