Merge branch 'edge' into opentrons-ai-client-instruments

Opentrons · Oct 30, 2024 · fa88a39 · fa88a39
2 parents a797963 + d270ccd
commit fa88a39
Show file tree

Hide file tree

Showing 427 changed files with 7,563 additions and 2,652 deletions.
diff --git a/abr-testing/abr_testing/data_collection/abr_calibration_logs.py b/abr-testing/abr_testing/data_collection/abr_calibration_logs.py
@@ -82,7 +82,7 @@ def module_helper(
                 y = one_module["moduleOffset"]["offset"].get("y", "")
                 z = one_module["moduleOffset"]["offset"].get("z", "")
             except KeyError:
-                pass
+                continue
             if mod_serial in module_sheet_serials and modified in module_modify_dates:
                 continue
             module_row = (

diff --git a/analyses-snapshot-testing/citools/generate_analyses.py b/analyses-snapshot-testing/citools/generate_analyses.py
@@ -186,6 +186,7 @@ def analyze(protocol: TargetProtocol, container: docker.models.containers.Contai
     start_time = time.time()
     result = None
     exit_code = None
+    console.print(f"Beginning analysis of {protocol.host_protocol_file.name}")
     try:
         command_result = container.exec_run(cmd=command)
         exit_code = command_result.exit_code

diff --git a/...test/test_analysis_snapshot[057de2035d][OT2_S_v2_19_P300M_P20S_HS_TC_TM_SmokeTestV3].json b/...test/test_analysis_snapshot[057de2035d][OT2_S_v2_19_P300M_P20S_HS_TC_TM_SmokeTestV3].json
@@ -9383,7 +9383,14 @@
       },
       "id": "UUID",
       "key": "08e16a2cac011d4bef561f8b0854d19e",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "displayName": "4 custom tubes",
         "loadName": "cpx_4_tuberack_100ul",

diff --git a/...test/test_analysis_snapshot[0cbde10c37][OT2_S_v2_18_P300M_P20S_HS_TC_TM_SmokeTestV3].json b/...test/test_analysis_snapshot[0cbde10c37][OT2_S_v2_18_P300M_P20S_HS_TC_TM_SmokeTestV3].json
@@ -9383,7 +9383,14 @@
       },
       "id": "UUID",
       "key": "08e16a2cac011d4bef561f8b0854d19e",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "displayName": "4 custom tubes",
         "loadName": "cpx_4_tuberack_100ul",

diff --git a/...hot_test/test_analysis_snapshot[134037b2aa][OT2_X_v6_P300M_P20S_HS_MM_TM_TC_AllMods].json b/...hot_test/test_analysis_snapshot[134037b2aa][OT2_X_v6_P300M_P20S_HS_MM_TM_TC_AllMods].json
@@ -7895,7 +7895,14 @@
       },
       "id": "UUID",
       "key": "675eb8be-6c85-4204-9c87-d7fdd522f580",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "moduleId": "UUID"
       },

diff --git a/...st_analysis_snapshot[13ec753045][Flex_S_v2_18_Illumina_Stranded_total_RNA_Ribo_Zero].json b/...st_analysis_snapshot[13ec753045][Flex_S_v2_18_Illumina_Stranded_total_RNA_Ribo_Zero].json
@@ -4341,7 +4341,14 @@
       },
       "id": "UUID",
       "key": "bccdb28e967f574dfbe472004101d7f9",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "displayName": "Index Anchors",
         "loadName": "eppendorf_96_wellplate_150ul",

diff --git a/...ysis_snapshot[19c783e363][Flex_X_v8_P1000_96_HS_GRIP_TC_TM_GripperCollisionWithTips].json b/...ysis_snapshot[19c783e363][Flex_X_v8_P1000_96_HS_GRIP_TC_TM_GripperCollisionWithTips].json
@@ -12587,7 +12587,14 @@
       },
       "id": "UUID",
       "key": "702caca4-12c8-4f26-a68e-138134723f09",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "labwareId": "UUID",
         "newLocation": {

diff --git a/..._snapshot_test/test_analysis_snapshot[4389e3ab18][OT2_X_v6_P20S_None_SimpleTransfer].json b/..._snapshot_test/test_analysis_snapshot[4389e3ab18][OT2_X_v6_P20S_None_SimpleTransfer].json
@@ -1772,7 +1772,14 @@
       },
       "id": "UUID",
       "key": "c2e4fa67-3c04-4d22-b3fa-5d61e956c488",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "flowRate": 3.78,
         "labwareId": "UUID",

diff --git a/...test_analysis_snapshot[4b17883f74][OT2_S_v2_17_P300M_P20S_HS_TC_TM_dispense_changes].json b/...test_analysis_snapshot[4b17883f74][OT2_S_v2_17_P300M_P20S_HS_TC_TM_dispense_changes].json
@@ -3035,7 +3035,14 @@
       },
       "id": "UUID",
       "key": "0bd3f36a944ee534e422ee69360a9501",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "flowRate": 7.56,
         "labwareId": "UUID",

diff --git a/...lysis_snapshot[4cb705bdbf][Flex_X_v2_16_NO_PIPETTES_MM_MagneticModuleInFlexProtocol].json b/...lysis_snapshot[4cb705bdbf][Flex_X_v2_16_NO_PIPETTES_MM_MagneticModuleInFlexProtocol].json
@@ -32,7 +32,14 @@
       },
       "id": "UUID",
       "key": "8511b05ba5565bf0e6dcccd800e2ee23",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "location": {
           "slotName": "C1"

diff --git a/...X_v2_20_96_and_8_Overrides_InvalidConfigs_Override_eight_partial_column_bottom_left].json b/...X_v2_20_96_and_8_Overrides_InvalidConfigs_Override_eight_partial_column_bottom_left].json
@@ -1205,7 +1205,14 @@
       },
       "id": "UUID",
       "key": "2c37ad797da7df791b57a7843a203e88",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "configurationParams": {
           "backLeftNozzle": "A1",

diff --git a/..._analysis_snapshot[5e958b7c98][Flex_X_v2_16_P300MGen2_None_OT2PipetteInFlexProtocol].json b/..._analysis_snapshot[5e958b7c98][Flex_X_v2_16_P300MGen2_None_OT2PipetteInFlexProtocol].json
@@ -1181,7 +1181,14 @@
       },
       "id": "UUID",
       "key": "bd403a1c851a75b4b68ce34796d713fa",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "liquidPresenceDetection": false,
         "mount": "left",

diff --git a/...t_analysis_snapshot[604023f7f1][Flex_X_v2_16_NO_PIPETTES_TM_ModuleInStagingAreaCol3].json b/...t_analysis_snapshot[604023f7f1][Flex_X_v2_16_NO_PIPETTES_TM_ModuleInStagingAreaCol3].json
@@ -121,7 +121,14 @@
       },
       "id": "UUID",
       "key": "a3a7eed460d8d94a91747f23820a180d",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "location": {
           "slotName": "C3"

diff --git a/...][OT2_X_v2_20_8_Overrides_InvalidConfigs_Override_eight_partial_column_bottom_right].json b/...][OT2_X_v2_20_8_Overrides_InvalidConfigs_Override_eight_partial_column_bottom_right].json
@@ -2366,7 +2366,14 @@
       },
       "id": "UUID",
       "key": "4b1d27a6f17f312dd76668f0c48ed406",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "configurationParams": {
           "backLeftNozzle": "G12",

diff --git a/...st_analysis_snapshot[9e56ee92f6][Flex_X_v2_16_P1000_96_GRIP_DropLabwareIntoTrashBin].json b/...st_analysis_snapshot[9e56ee92f6][Flex_X_v2_16_P1000_96_GRIP_DropLabwareIntoTrashBin].json
@@ -1350,7 +1350,14 @@
       },
       "id": "UUID",
       "key": "4cca9753dc59d176eee1522349363a75",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "labwareId": "UUID",
         "newLocation": {

diff --git a/...lysis_snapshot[ac886d7768][Flex_S_v2_15_P1000_96_GRIP_HS_MB_TC_TM_IDTXgen96Part1to3].json b/...lysis_snapshot[ac886d7768][Flex_S_v2_15_P1000_96_GRIP_HS_MB_TC_TM_IDTXgen96Part1to3].json
@@ -15103,7 +15103,14 @@
       },
       "id": "UUID",
       "key": "c3eacf39e9a35058cac9f69100549344",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "forceDirect": false,
         "labwareId": "UUID",

diff --git a/...5][OT2_X_v2_20_8_Overrides_InvalidConfigs_Override_eight_partial_column_bottom_left].json b/...5][OT2_X_v2_20_8_Overrides_InvalidConfigs_Override_eight_partial_column_bottom_left].json
@@ -2351,7 +2351,14 @@
       },
       "id": "UUID",
       "key": "4b1d27a6f17f312dd76668f0c48ed406",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "configurationParams": {
           "backLeftNozzle": "A1",

diff --git a/...st_analysis_snapshot[b777168ac1][Flex_S_v2_19_Illumina_Stranded_total_RNA_Ribo_Zero].json b/...st_analysis_snapshot[b777168ac1][Flex_S_v2_19_Illumina_Stranded_total_RNA_Ribo_Zero].json
@@ -4341,7 +4341,14 @@
       },
       "id": "UUID",
       "key": "bccdb28e967f574dfbe472004101d7f9",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "displayName": "Index Anchors",
         "loadName": "eppendorf_96_wellplate_150ul",

diff --git a/..._v2_20_96_and_8_Overrides_InvalidConfigs_Override_eight_partial_column_bottom_right].json b/..._v2_20_96_and_8_Overrides_InvalidConfigs_Override_eight_partial_column_bottom_right].json
@@ -1220,7 +1220,14 @@
       },
       "id": "UUID",
       "key": "2c37ad797da7df791b57a7843a203e88",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "configurationParams": {
           "backLeftNozzle": "G12",

diff --git a/...est_analysis_snapshot[e0b0133ffb][pl_Illumina_Stranded_total_RNA_Ribo_Zero_protocol].json b/...est_analysis_snapshot[e0b0133ffb][pl_Illumina_Stranded_total_RNA_Ribo_Zero_protocol].json
@@ -39047,7 +39047,14 @@
       },
       "id": "UUID",
       "key": "f524340032354f66bf69110d530e98ad",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "labwareId": "UUID",
         "newLocation": {

diff --git a/...ot_test/test_analysis_snapshot[ed1e64c539][Flex_X_v2_16_NO_PIPETTES_TM_ModuleInCol2].json b/...ot_test/test_analysis_snapshot[ed1e64c539][Flex_X_v2_16_NO_PIPETTES_TM_ModuleInCol2].json
@@ -32,7 +32,14 @@
       },
       "id": "UUID",
       "key": "8511b05ba5565bf0e6dcccd800e2ee23",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "location": {
           "slotName": "C2"

diff --git a/..._snapshot[f24bb0b4d9][Flex_S_v2_15_P1000_96_GRIP_HS_MB_TC_TM_IlluminaDNAPrep96PART3].json b/..._snapshot[f24bb0b4d9][Flex_S_v2_15_P1000_96_GRIP_HS_MB_TC_TM_IlluminaDNAPrep96PART3].json
@@ -17824,7 +17824,14 @@
       },
       "id": "UUID",
       "key": "7e96139ed2163fa7f870805d0b3d14b6",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "forceDirect": false,
         "labwareId": "UUID",

diff --git a/..._analysis_snapshot[f5f3b9c5bb][Flex_X_v2_16_P1000_96_TM_ModuleAndWasteChuteConflict].json b/..._analysis_snapshot[f5f3b9c5bb][Flex_X_v2_16_P1000_96_TM_ModuleAndWasteChuteConflict].json
@@ -1255,7 +1255,14 @@
       },
       "id": "UUID",
       "key": "c55807b45b6b1d4ea04e12b0ee553f78",
-      "notes": [],
+      "notes": [
+        {
+          "longMessage": "Handling this command failure with FAIL_RUN.",
+          "noteKind": "debugErrorRecovery",
+          "shortMessage": "Handling this command failure with FAIL_RUN.",
+          "source": "execution"
+        }
+      ],
       "params": {
         "location": {
           "slotName": "D3"

diff --git a/api-client/src/runs/types.ts b/api-client/src/runs/types.ts
@@ -8,6 +8,7 @@ import type {
   RunTimeCommand,
   RunTimeParameter,
   NozzleLayoutConfig,
+  OnDeckLabwareLocation,
 } from '@opentrons/shared-data'
 import type { ResourceLink, ErrorDetails } from '../types'
 export * from './commands/types'
@@ -117,7 +118,9 @@ export interface Runs {
 }
 
 export interface RunCurrentStateData {
+  estopEngaged: boolean
   activeNozzleLayouts: Record<string, NozzleLayoutValues> // keyed by pipetteId
+  placeLabwareState?: PlaceLabwareState
 }
 
 export const RUN_ACTION_TYPE_PLAY: 'play' = 'play'
@@ -209,3 +212,9 @@ export interface NozzleLayoutValues {
   activeNozzles: string[]
   config: NozzleLayoutConfig
 }
+
+export interface PlaceLabwareState {
+  labwareId: string
+  location: OnDeckLabwareLocation
+  shouldPlaceDown: boolean
+}