Merge branch 'chore_release-8.5.0' into 850-snapshot-testing

Author: y3rsh

api/src/opentrons/protocol_api/_liquid_properties.py

@@ -115,16 +115,28 @@ def position_reference(self) -> PositionReference:
         return self._position_reference
 
     @position_reference.setter
-    def position_reference(self, new_position: str) -> None:
-        self._position_reference = PositionReference(new_position)
+    def position_reference(self, new_position: Union[str, PositionReference]) -> None:
+        self._position_reference = (
+            new_position
+            if isinstance(new_position, PositionReference)
+            else PositionReference(new_position)
+        )
 
     @property
     def offset(self) -> Coordinate:
         return self._offset
 
     @offset.setter
-    def offset(self, new_offset: Sequence[float]) -> None:
-        x, y, z = validation.validate_coordinates(new_offset)
+    def offset(self, new_offset: Union[Sequence[float], Coordinate]) -> None:
+        if isinstance(new_offset, Coordinate):
+            new_coordinate: Sequence[Union[int, float]] = [
+                new_offset.x,
+                new_offset.y,
+                new_offset.z,
+            ]
+        else:
+            new_coordinate = new_offset
+        x, y, z = validation.validate_coordinates(new_coordinate)
         self._offset = Coordinate(x=x, y=y, z=z)
 
     def as_shared_data_model(self) -> SharedDataTipPosition:

app/src/organisms/ErrorRecoveryFlows/utils/__tests__/getErrorKind.test.ts

@@ -32,6 +32,16 @@ describe('getErrorKind', () => {
       errorType: DEFINED_ERROR_TYPES.OVERPRESSURE,
       expectedError: ERROR_KINDS.OVERPRESSURE_WHILE_DISPENSING,
     },
+    {
+      commandType: 'blowout',
+      errorType: DEFINED_ERROR_TYPES.OVERPRESSURE,
+      expectedError: ERROR_KINDS.OVERPRESSURE_WHILE_DISPENSING,
+    },
+    {
+      commandType: 'blowOutInPlace',
+      errorType: DEFINED_ERROR_TYPES.OVERPRESSURE,
+      expectedError: ERROR_KINDS.OVERPRESSURE_WHILE_DISPENSING,
+    },
     {
       commandType: 'dropTip',
       errorType: DEFINED_ERROR_TYPES.TIP_PHYSICALLY_ATTACHED,

app/src/organisms/ErrorRecoveryFlows/utils/getErrorKind.ts

@@ -1,7 +1,6 @@
-import { ERROR_KINDS, DEFINED_ERROR_TYPES } from '../constants'
-
-import type { ErrorKind } from '../types'
 import type { FailedCommandBySource } from '/app/organisms/ErrorRecoveryFlows/hooks'
+import { DEFINED_ERROR_TYPES, ERROR_KINDS } from '../constants'
+import type { ErrorKind } from '../types'
 
 /**
  * Given server-side information about a failed command,
@@ -19,45 +18,45 @@ export function getErrorKind(
   const errorType = failedCommandByRunRecord?.error?.errorType
 
   if (Boolean(errorIsDefined)) {
-    if (
-      commandType === 'prepareToAspirate' &&
-      errorType === DEFINED_ERROR_TYPES.OVERPRESSURE
-    ) {
-      return ERROR_KINDS.OVERPRESSURE_PREPARE_TO_ASPIRATE
-    } else if (
-      (commandType === 'aspirate' || commandType === 'aspirateInPlace') &&
-      errorType === DEFINED_ERROR_TYPES.OVERPRESSURE
-    ) {
-      return ERROR_KINDS.OVERPRESSURE_WHILE_ASPIRATING
-    } else if (
-      (commandType === 'dispense' || commandType === 'dispenseInPlace') &&
-      errorType === DEFINED_ERROR_TYPES.OVERPRESSURE
-    ) {
-      return ERROR_KINDS.OVERPRESSURE_WHILE_DISPENSING
-    } else if (
-      commandType === 'liquidProbe' &&
-      errorType === DEFINED_ERROR_TYPES.LIQUID_NOT_FOUND
-    ) {
-      return ERROR_KINDS.NO_LIQUID_DETECTED
-    } else if (
-      commandType === 'pickUpTip' &&
-      errorType === DEFINED_ERROR_TYPES.TIP_PHYSICALLY_MISSING
-    ) {
-      return ERROR_KINDS.TIP_NOT_DETECTED
-    } else if (
-      (commandType === 'dropTip' || commandType === 'dropTipInPlace') &&
-      errorType === DEFINED_ERROR_TYPES.TIP_PHYSICALLY_ATTACHED
-    ) {
-      return ERROR_KINDS.TIP_DROP_FAILED
-    } else if (
-      commandType === 'moveLabware' &&
-      errorType === DEFINED_ERROR_TYPES.GRIPPER_MOVEMENT
-    ) {
-      return ERROR_KINDS.GRIPPER_ERROR
-    } else if (errorType === DEFINED_ERROR_TYPES.STALL_OR_COLLISION) {
-      return ERROR_KINDS.STALL_OR_COLLISION
+    switch (errorType) {
+      case DEFINED_ERROR_TYPES.OVERPRESSURE:
+        // The recovery flow varies dependent on the exact failed command.
+        switch (commandType) {
+          case 'prepareToAspirate':
+            return ERROR_KINDS.OVERPRESSURE_PREPARE_TO_ASPIRATE
+          case 'aspirate':
+          case 'aspirateInPlace': {
+            return ERROR_KINDS.OVERPRESSURE_WHILE_ASPIRATING
+          }
+          case 'dispense':
+          case 'dispenseInPlace':
+          case 'blowout':
+          case 'blowOutInPlace':
+            return ERROR_KINDS.OVERPRESSURE_WHILE_DISPENSING
+          default: {
+            console.error(`Unhandled overpressure command ${commandType}`)
+            return ERROR_KINDS.GENERAL_ERROR
+          }
+        }
+      case DEFINED_ERROR_TYPES.LIQUID_NOT_FOUND:
+        return ERROR_KINDS.NO_LIQUID_DETECTED
+      case DEFINED_ERROR_TYPES.TIP_PHYSICALLY_MISSING:
+        return ERROR_KINDS.TIP_NOT_DETECTED
+      case DEFINED_ERROR_TYPES.TIP_PHYSICALLY_ATTACHED:
+        return ERROR_KINDS.TIP_DROP_FAILED
+      case DEFINED_ERROR_TYPES.GRIPPER_MOVEMENT:
+        return ERROR_KINDS.GRIPPER_ERROR
+      case DEFINED_ERROR_TYPES.STALL_OR_COLLISION:
+        return ERROR_KINDS.STALL_OR_COLLISION
+      default: {
+        console.error(`Unhandled error type ${errorType}`)
+        return ERROR_KINDS.GENERAL_ERROR
+      }
     }
+  } else {
+    console.warn(
+      `Run status is "awaiting for recovery", but error is not defined: ${failedCommandByRunRecord}`
+    )
+    return ERROR_KINDS.GENERAL_ERROR
   }
-
-  return ERROR_KINDS.GENERAL_ERROR
 }

hardware-testing/Makefile

@@ -216,7 +216,7 @@ push-ot3:
 	$(MAKE) push-plot-webpage-ot3
 	$(MAKE) push-description-ot3
 	$(MAKE) push-labware-ot3
-	cd ../ && $(MAKE) -C shared-data push-ot3
+	#cd ../ && $(MAKE) -C shared-data push-ot3
 
 .PHONE: open-dev-app
 open-dev-app:

hardware-testing/hardware_testing/data/ui.py

@@ -1,13 +1,36 @@
 """Production QC User Interface."""
 from opentrons.hardware_control import SyncHardwareAPI
 from opentrons.hardware_control.types import StatusBarState
+from typing import Optional
 
 PRINT_HEADER_NUM_SPACES = 4
 PRINT_HEADER_DASHES = "-" * PRINT_HEADER_NUM_SPACES
 PRINT_TITLE_POUNDS = "#" * PRINT_HEADER_NUM_SPACES
 PRINT_HEADER_SPACES = " " * (PRINT_HEADER_NUM_SPACES - 1)
 PRINT_HEADER_ASTERISK = "*"
 
+outfile: Optional[str] = None
+
+
+def set_output_file(new_outfile: Optional[str]) -> None:
+    """Change the output location of the UI output.
+
+    If it is a string it will output to that as a file.
+    if it is None it will default back to stdout
+    """
+    global outfile
+    outfile = new_outfile
+    _output(f"Setting UI output to file {outfile}")
+
+
+def _output(msg: str) -> None:
+    global outfile
+    if outfile:
+        with open(outfile, "a") as f:
+            f.write(f"{msg}\n")
+    else:
+        print(msg)
+
 
 def get_user_answer(question: str) -> bool:
     """Get user answer."""
@@ -23,7 +46,9 @@ def get_user_answer(question: str) -> bool:
 
 def get_user_ready(message: str) -> None:
     """Get user ready."""
-    input(f"WAIT: {message}, press ENTER when ready: ")
+    global outfile
+    if not outfile:
+        input(f"WAIT: {message}, press ENTER when ready: ")
 
 
 def alert_user_ready(message: str, hw: SyncHardwareAPI) -> None:
@@ -43,7 +68,7 @@ def print_title(title: str) -> None:
     length = len(title)
     pounds = PRINT_TITLE_POUNDS + ("#" * length) + PRINT_TITLE_POUNDS
     middle = f"#{PRINT_HEADER_SPACES}" f"{title}" f"{PRINT_HEADER_SPACES}#"
-    print(f"\n{pounds}\n{middle}\n{pounds}\n")
+    _output(f"\n{pounds}\n{middle}\n{pounds}\n")
 
 
 def print_header(header: str) -> None:
@@ -56,19 +81,19 @@ def print_header(header: str) -> None:
     length = len(header)
     dashes = PRINT_HEADER_DASHES + ("-" * length) + PRINT_HEADER_DASHES
     middle = f"|{PRINT_HEADER_SPACES}{header}{PRINT_HEADER_SPACES}|"
-    print(f"\n{dashes}\n{middle}\n{dashes}\n")
+    _output(f"\n{dashes}\n{middle}\n{dashes}\n")
 
 
 def print_error(message: str) -> None:
     """Print error."""
-    print(f"ERROR: {message}")
+    _output(f"ERROR: {message}")
 
 
 def print_warning(message: str) -> None:
     """Print warning."""
-    print(f"WARNING: {message}")
+    _output(f"WARNING: {message}")
 
 
 def print_info(message: str) -> None:
     """Print information."""
-    print(message)
+    _output(message)

hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000.csv

@@ -12,7 +12,7 @@ tipracks_50ul,D2
 tipracks_200ul,,,,,,,,,
 tipracks_1000ul,,,,,,,,,
 labware_on_scale,nest_1_reservoir_195ml,A1,,,,,,,
-slot_scale,B1,,,,,,,,
+slot_scale,C1,,,,,,,,
 volumes_to_test_20ul,,,,,,,,,
 volumes_to_test_50ul,50,,,,,,,,
 volumes_to_test_200ul,,,,,,,,,

hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch200.csv

@@ -12,7 +12,7 @@ tipracks_50ul,D2,D3,C2,C3,B1,B2,B3,A1,A2
 tipracks_200ul,,,,,,,,,
 tipracks_1000ul,,,,,,,,,
 labware_on_scale,nest_1_reservoir_195ml,A1,,,,,,,
-slot_scale,B1,,,,,,,,
+slot_scale,C1,,,,,,,,
 volumes_to_test_20ul,,,,,,,,,
 volumes_to_test_50ul,50,,,,,,,,
 volumes_to_test_200ul,,,,,,,,,