chore(api,shared-data): update evotip definitions

api/src/opentrons/protocol_api/core/engine/load_labware_params.py

@@ -46,8 +46,6 @@
     "corning_48_wellplate_1.6ml_flat": 3,
     "corning_6_wellplate_16.8ml_flat": 3,
     "corning_96_wellplate_360ul_flat": 3,
-    "evotips_flex_96_tiprack_adapter": 2,
-    "evotips_opentrons_96_labware": 2,
     "nest_12_reservoir_15ml": 2,
     "nest_1_reservoir_195ml": 3,
     "nest_1_reservoir_290ml": 2,

api/src/opentrons/protocol_engine/commands/evotip_dispense.py

@@ -4,7 +4,6 @@
 from typing import TYPE_CHECKING, Optional, Type, Union
 from typing_extensions import Literal
 
-from opentrons.protocol_engine.errors import UnsupportedLabwareForActionError
 from .pipetting_common import (
     PipetteIdMixin,
     FlowRateMixin,
@@ -28,7 +27,6 @@
     DefinedErrorData,
 )
 from ..state.update_types import StateUpdate
-from ..resources import labware_validation
 from ..errors import ProtocolEngineError
 
 if TYPE_CHECKING:
@@ -86,11 +84,6 @@ async def execute(self, params: EvotipDispenseParams) -> _ExecuteReturn:
         labware_id = params.labwareId
         well_name = params.wellName
 
-        labware_definition = self._state_view.labware.get_definition(params.labwareId)
-        if not labware_validation.is_evotips(labware_definition.parameters.loadName):
-            raise UnsupportedLabwareForActionError(
-                f"Cannot use command: `EvotipDispense` with labware: {labware_definition.parameters.loadName}"
-            )
         move_result = await move_to_well(
             movement=self._movement,
             model_utils=self._model_utils,

api/src/opentrons/protocol_engine/commands/evotip_seal_pipette.py

@@ -7,8 +7,7 @@
 from opentrons.protocol_engine.types import MotorAxis
 from typing_extensions import Literal
 
-from opentrons.protocol_engine.errors import UnsupportedLabwareForActionError
-from ..resources import ModelUtils, labware_validation
+from ..resources import ModelUtils
 from ..types import PickUpTipWellLocation, FluidKind, AspiratedFluid
 from .pipetting_common import (
     PipetteIdMixin,
@@ -217,12 +216,6 @@ async def execute(
         labware_id = params.labwareId
         well_name = params.wellName
 
-        labware_definition = self._state_view.labware.get_definition(params.labwareId)
-        if not labware_validation.is_evotips(labware_definition.parameters.loadName):
-            raise UnsupportedLabwareForActionError(
-                f"Cannot use command: `EvotipSealPipette` with labware: {labware_definition.parameters.loadName}"
-            )
-
         well_location = self._state_view.geometry.convert_pick_up_tip_well_location(
             well_location=params.wellLocation
         )

api/src/opentrons/protocol_engine/commands/evotip_unseal_pipette.py

@@ -7,7 +7,6 @@
 from typing_extensions import Literal
 
 from opentrons.protocol_engine.resources.model_utils import ModelUtils
-from opentrons.protocol_engine.errors import UnsupportedLabwareForActionError
 from opentrons.protocol_engine.types import MotorAxis
 from opentrons.types import MountType
 
@@ -27,7 +26,6 @@
     DefinedErrorData,
     SuccessData,
 )
-from ..resources import labware_validation
 
 if TYPE_CHECKING:
     from ..state.state import StateView
@@ -86,11 +84,7 @@ async def execute(self, params: EvotipUnsealPipetteParams) -> _ExecuteReturn:
         well_name = params.wellName
 
         well_location = params.wellLocation
-        labware_definition = self._state_view.labware.get_definition(params.labwareId)
-        if not labware_validation.is_evotips(labware_definition.parameters.loadName):
-            raise UnsupportedLabwareForActionError(
-                f"Cannot use command: `EvotipUnsealPipette` with labware: {labware_definition.parameters.loadName}"
-            )
+
         is_partially_configured = self._state_view.pipettes.get_is_partially_configured(
             pipette_id=pipette_id
         )

api/src/opentrons/protocol_engine/resources/labware_validation.py

@@ -21,11 +21,6 @@ def is_lid_stack(load_name: str) -> bool:
     return load_name == "protocol_engine_lid_stack_object"
 
 
-def is_evotips(load_name: str) -> bool:
-    """Check if a labware is an evotips tiprack."""
-    return load_name == "evotips_opentrons_96_labware"
-
-
 def validate_definition_is_labware(definition: LabwareDefinition) -> bool:
     """Validate that one of the definition's allowed roles is `labware`.
 

api/tests/opentrons/protocol_engine/commands/test_evotip_dispense.py

@@ -38,7 +38,7 @@ def evotips_definition() -> LabwareDefinition:
     """A fixturee of the evotips definition."""
     # TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
     return labware_definition_type_adapter.validate_python(
-        load_definition("evotips_opentrons_96_labware", 1)
+        load_definition("evotip_flex_96_labware", 1)
     )
 
 

api/tests/opentrons/protocol_engine/commands/test_evotip_seal_pipette.py

@@ -48,7 +48,7 @@ def evotips_definition() -> LabwareDefinition:
     """A fixturee of the evotips definition."""
     # TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
     return labware_definition_type_adapter.validate_python(
-        load_definition("evotips_opentrons_96_labware", 1)
+        load_definition("evotip_flex_96_labware", 1)
     )
 
 

api/tests/opentrons/protocol_engine/commands/test_evotip_unseal_pipette.py

@@ -92,7 +92,7 @@ def evotips_definition() -> LabwareDefinition:
     """A fixturee of the evotips definition."""
     # TODO (chb 2025-01-29): When we migrate all labware to v3 we can clean this up
     return labware_definition_type_adapter.validate_python(
-        load_definition("evotips_opentrons_96_labware", 1)
+        load_definition("evotip_flex_96_labware", 1)
     )
 
 

app/src/organisms/ODD/QuickTransferFlow/constants.ts

@@ -33,6 +33,11 @@ export const TRANSFER = 'transfer'
 export const DEFAULT_MM_TOUCH_TIP_OFFSET_FROM_TOP = -1
 export const DEFAULT_MM_BLOWOUT_OFFSET_FROM_TOP = 0
 
+// this list is manually maintained
+export const QUICK_TRANSFER_INCOMPATIBLE_LABWARE = [
+  'opentrons/evotip_flex_96_labware/1',
+]
+
 // these lists are generated by the util generateCompatibleLabwareForPipette in ./utils
 export const SINGLE_CHANNEL_COMPATIBLE_LABWARE = [
   'opentrons/agilent_1_reservoir_290ml/2',

app/src/organisms/ODD/QuickTransferFlow/utils/generateCompatibleLabwareForPipette.ts

@@ -1,5 +1,6 @@
 import { makeWellSetHelpers, getLabwareDefURI } from '@opentrons/shared-data'
 import { getAllDefinitions as getAllLatestDefValues } from '/app/local-resources/labware'
+import { QUICK_TRANSFER_INCOMPATIBLE_LABWARE } from '../constants'
 
 import type { PipetteV2Specs, WellSetHelpers } from '@opentrons/shared-data'
 
@@ -19,6 +20,12 @@ export function generateCompatibleLabwareForPipette(
           definition.allowedRoles.includes('system'))
       ) {
         return acc
+      } else if (
+        QUICK_TRANSFER_INCOMPATIBLE_LABWARE.includes(
+          getLabwareDefURI(definition)
+        )
+      ) {
+        return acc
       } else if (pipetteSpecs.channels === 1) {
         return [...acc, getLabwareDefURI(definition)]
       } else {

shared-data/js/__tests__/labwareDefSchemaV2.test.ts

@@ -130,7 +130,7 @@ const expectedWellsNotMatchingZDimension: Record<string, Set<string>> = {
   'opentrons_calibrationblock_short_side_right/1.json': new Set(['A2']),
 
   // this labware has a lip
-  'evotips_opentrons_96_labware/2.json': standard96WellNames,
+  'evotip_flex_96_labware/1.json': standard96WellNames,
 
   // Presumably a bug. Fixed in v3 of this labware.
   'nest_1_reservoir_195ml/1.json': new Set(['A1']),

shared-data/js/getLabware.ts

@@ -44,11 +44,6 @@ export const LABWAREV2_DO_NOT_LIST = [
   'opentrons_ot3_96_tiprack_1000ul',
   'opentrons_ot3_96_tiprack_50ul',
   'opentrons_flex_lid_absorbance_plate_reader_module',
-  // temporarily blocking evotips until it is out of beta
-  'evotips_flex_96_tiprack_adapter',
-  'evotips_opentrons_96_labware',
-  'evotips_tiprack_adapter',
-  'evotips_reservoir_adapter',
   // temporarily blocking tiprack lids until stacker launches
   'opentrons_flex_tiprack_lid',
   // temporarily blocking 20 uL Flex tip racks until they launch
@@ -75,11 +70,11 @@ export const PD_DO_NOT_LIST = [
   //  temporarily blocking TC lid adapter and deck riser until it is supported in PD
   'opentrons_tough_pcr_auto_sealing_lid',
   'opentrons_flex_deck_riser',
-  //  temporarily blocking evotips until it is supported in PD
-  'evotips_flex_96_tiprack_adapter',
-  'evotips_opentrons_96_labware',
-  'evotips_tiprack_adapter',
-  'evotips_reservoir_adapter',
+  // evotip is not supported in PD
+  'evotip_flex_96_tiprack_adapter',
+  'evotip_flex_96_labware',
+  'evotip_flex_tall_adapter',
+  'evotip_flex_short_adapter',
   // temporarily blocking tiprack lids until stacker launches
   'opentrons_flex_tiprack_lid',
   // temporarily blocking 20 uL Flex tip racks until they launch

shared-data/labware/definitions/2/evotips_opentrons_96_labware/2.json → shared-data/labware/definitions/2/evotip_flex_96_labware/1.json

@@ -15,10 +15,13 @@
   ],
   "brand": {
     "brand": "opentrons",
-    "brandId": []
+    "brandId": ["999-00254"],
+    "links": [
+      "https://opentrons.com/products/opentrons-flex-evotip-adapter-set/"
+    ]
   },
   "metadata": {
-    "displayName": "Evotips",
+    "displayName": "Evotip Labware in Opentrons Flex Top Adapter",
     "displayCategory": "wellPlate",
     "displayVolumeUnits": "µL",
     "tags": []
@@ -1006,11 +1009,11 @@
     "tipLength": 51.0,
     "tipOverlap": 10.0,
     "isMagneticModuleCompatible": false,
-    "loadName": "evotips_opentrons_96_labware"
+    "loadName": "evotip_flex_96_labware"
   },
   "namespace": "opentrons",
   "allowedRoles": ["labware"],
-  "version": 2,
+  "version": 1,
   "stackLimit": 5,
   "schemaVersion": 2,
   "cornerOffsetFromSlot": {
@@ -1045,17 +1048,17 @@
       "y": 0,
       "z": 22.5
     },
-    "evotips_reservoir_adapter": {
+    "evotip_flex_short_adapter": {
       "x": 0,
       "y": 0,
       "z": 18.5
     },
-    "evotips_flex_96_tiprack_adapter": {
+    "evotip_flex_96_tiprack_adapter": {
       "x": 0,
       "y": 0,
       "z": 71.78
     },
-    "evotips_tiprack_adapter": {
+    "evotip_flex_tall_adapter": {
       "x": 0,
       "y": 0,
       "z": 18.5

shared-data/labware/definitions/2/evotips_flex_96_tiprack_adapter/2.json → shared-data/labware/definitions/2/evotip_flex_96_tiprack_adapter/1.json

@@ -2,10 +2,13 @@
   "ordering": [],
   "brand": {
     "brand": "Opentrons",
-    "brandId": []
+    "brandId": ["999-00254"],
+    "links": [
+      "https://opentrons.com/products/opentrons-flex-evotip-adapter-set/"
+    ]
   },
   "metadata": {
-    "displayName": "Evotip Tiprack 96-Channel Adapter",
+    "displayName": "Opentrons Flex Evotip Tiprack 96-Channel Adapter",
     "displayCategory": "adapter",
     "displayVolumeUnits": "µL",
     "tags": []
@@ -27,10 +30,10 @@
     "quirks": ["tiprackAdapterFor96Channel", "stackingMaxFive"],
     "isTiprack": false,
     "isMagneticModuleCompatible": false,
-    "loadName": "evotips_flex_96_tiprack_adapter"
+    "loadName": "evotip_flex_96_tiprack_adapter"
   },
   "namespace": "opentrons",
-  "version": 2,
+  "version": 1,
   "schemaVersion": 2,
   "allowedRoles": ["adapter"],
   "cornerOffsetFromSlot": {

shared-data/labware/definitions/2/evotips_reservoir_adapter/1.json → shared-data/labware/definitions/2/evotip_flex_short_adapter/1.json

@@ -2,10 +2,13 @@
   "ordering": [],
   "brand": {
     "brand": "Opentrons",
-    "brandId": []
+    "brandId": ["999-00254"],
+    "links": [
+      "https://opentrons.com/products/opentrons-flex-evotip-adapter-set/"
+    ]
   },
   "metadata": {
-    "displayName": "Evotip Soaking Reservoir Adapter",
+    "displayName": "Opentrons Flex Evotip Short Adapter",
     "displayCategory": "adapter",
     "displayVolumeUnits": "µL",
     "tags": []
@@ -27,7 +30,7 @@
     "quirks": ["stackingMaxFive"],
     "isTiprack": false,
     "isMagneticModuleCompatible": false,
-    "loadName": "evotips_reservoir_adapter"
+    "loadName": "evotip_flex_short_adapter"
   },
   "namespace": "opentrons",
   "version": 1,

shared-data/labware/definitions/2/evotips_tiprack_adapter/1.json → shared-data/labware/definitions/2/evotip_flex_tall_adapter/1.json

@@ -2,10 +2,13 @@
   "ordering": [],
   "brand": {
     "brand": "Opentrons",
-    "brandId": []
+    "brandId": ["999-00254"],
+    "links": [
+      "https://opentrons.com/products/opentrons-flex-evotip-adapter-set/"
+    ]
   },
   "metadata": {
-    "displayName": "Evotip Tiprack Adapter",
+    "displayName": "Opentrons Flex Evotip Tall Adapter",
     "displayCategory": "adapter",
     "displayVolumeUnits": "µL",
     "tags": []
@@ -27,7 +30,7 @@
     "quirks": ["stackingMaxFive"],
     "isTiprack": false,
     "isMagneticModuleCompatible": false,
-    "loadName": "evotips_tiprack_adapter"
+    "loadName": "evotip_flex_tall_adapter"
   },
   "namespace": "opentrons",
   "version": 1,