handle some typing more clearly

Opentrons · Oct 21, 2024 · 0e80c8a · 0e80c8a
1 parent 9df2de1
commit 0e80c8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/shared-data/python/opentrons_shared_data/labware/constants.py b/shared-data/python/opentrons_shared_data/labware/constants.py
@@ -8,8 +8,10 @@
 WELL_NAME_PATTERN: Final["re.Pattern[str]"] = re.compile(r"^([A-Z]+)([0-9]+)$", re.X)
 
 # These shapes are for wellshape definitions and describe the top of the well
-Circular: Literal["circular"] = "circular"
-Rectangular: Literal["rectangular"] = "rectangular"
+CircularType = Literal["circular"]
+Circular: CircularType = "circular"
+RectangularType = Literal["rectangular"]
+Rectangular: RectangularType = "rectangular"
 WellShape = Union[Literal["circular"], Literal["rectangular"]]
 
 # These shapes are used to describe the 3D primatives used to build wells

diff --git a/shared-data/python/opentrons_shared_data/labware/types.py b/shared-data/python/opentrons_shared_data/labware/types.py
@@ -7,8 +7,8 @@
 from typing_extensions import Literal, TypedDict, NotRequired
 from .labware_definition import InnerWellGeometry
 from .constants import (
-    Circular,
-    Rectangular,
+    CircularType,
+    RectangularType,
 )
 
 LabwareUri = NewType("LabwareUri", str)
@@ -83,7 +83,7 @@ class LabwareDimensions(TypedDict):
 
 
 class CircularWellDefinition(TypedDict):
-    shape: Circular
+    shape: CircularType
     depth: float
     totalLiquidVolume: float
     x: float
@@ -94,7 +94,7 @@ class CircularWellDefinition(TypedDict):
 
 
 class RectangularWellDefinition(TypedDict):
-    shape: Rectangular
+    shape: RectangularType
     depth: float
     totalLiquidVolume: float
     x: float