update definitions and fix typing issue

Opentrons · Dec 9, 2024 · 0fe4cc1 · 0fe4cc1
1 parent 70d7802
commit 0fe4cc1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/api/src/opentrons/protocol_api/validation.py b/api/src/opentrons/protocol_api/validation.py
@@ -17,7 +17,12 @@
 from opentrons_shared_data.labware.labware_definition import LabwareRole
 from opentrons_shared_data.pipette.types import PipetteNameType
 from opentrons_shared_data.robot.types import RobotType
-from opentrons.protocol_engine.types import LabwareLocation, NonStackedLocation
+from opentrons.protocol_engine.types import (
+    LabwareLocation,
+    DeckSlotLocation,
+    AddressableAreaLocation,
+    ModuleLocation,
+)
 from opentrons.protocols.api_support.types import APIVersion, ThermocyclerStep
 from opentrons.protocols.api_support.util import APIVersionError
 from opentrons.protocols.models import LabwareDefinition
@@ -374,7 +379,14 @@ def ensure_labware_is_loadable(
     if (
         definition.allowedRoles
         and LabwareRole.stackableOnly in definition.allowedRoles
-        and isinstance(location, NonStackedLocation)
+        and isinstance(
+            location,
+            (
+                DeckSlotLocation,
+                AddressableAreaLocation,
+                ModuleLocation,
+            ),
+        )
     ):
         raise LabwareDefinitionIsNotLoadableOnPosition(
             f"Labware {definition.parameters.loadName} cannot be loaded on {location}."

diff --git a/...2/opentrons_evo_96_wellplate_300ul/1.json → ...ons/2/evotips_opentrons_96_labware/1.json b/...2/opentrons_evo_96_wellplate_300ul/1.json → ...ons/2/evotips_opentrons_96_labware/1.json
@@ -14,19 +14,19 @@
     ["A12", "B12", "C12", "D12", "E12", "F12", "G12", "H12"]
   ],
   "brand": {
-    "brand": "opentrons_evo",
+    "brand": "opentrons",
     "brandId": []
   },
   "metadata": {
-    "displayName": "Opentrons_evo 96 Well Plate 300 µL",
+    "displayName": "Evotips",
     "displayCategory": "wellPlate",
     "displayVolumeUnits": "µL",
     "tags": []
   },
   "dimensions": {
     "xDimension": 127.75,
     "yDimension": 86,
-    "zDimension": 34
+    "zDimension": 38.5
   },
   "wells": {
     "A1": {
@@ -1004,7 +1004,7 @@
     "quirks": [],
     "isTiprack": false,
     "isMagneticModuleCompatible": false,
-    "loadName": "opentrons_evo_96_wellplate_300ul"
+    "loadName": "evotips_opentrons_96_labware"
   },
   "namespace": "opentrons",
   "allowedRoles": ["stackableOnly"],
@@ -1019,7 +1019,7 @@
     "nest_96_wellplate_2ml_deep": {
       "x": 0,
       "y": 0,
-      "z": 20
+      "z": 2
     }
   }
 }
diff --git a/shared-data/labware/definitions/2/nest_96_wellplate_2ml_deep/2.json b/shared-data/labware/definitions/2/nest_96_wellplate_2ml_deep/2.json
@@ -1131,10 +1131,10 @@
       "y": 0,
       "z": 16.1
     },
-    "evo_flex_96_tiprack_adapter": {
+    "evotips_flex_96_tiprack_adapter": {
       "x": 0,
       "y": 0,
-      "z": 102
+      "z": 91
     }
   },
   "stackingOffsetWithModule": {