opentrons-shared-data 8.7.0a2__py3-none-any.whl → 8.7.0a4__py3-none-any.whl

opentrons_shared_data/data/liquid-class/definitions/1/water/2.json

@@ -3983,7 +3983,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 6.5]],
             "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
@@ -4034,10 +4034,10 @@
                 [50.0, 0.0]
               ],
               "blowout": {
-                "enable": false,
+                "enable": true,
                 "params": {
                   "location": "destination",
-                  "flowRate": 200.0
+                  "flowRate": 80.0
                 }
               },
               "touchTip": {
@@ -4063,7 +4063,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
@@ -4117,7 +4117,7 @@
                 "enable": true,
                 "params": {
                   "location": "trash",
-                  "flowRate": 200.0
+                  "flowRate": 80.0
                 }
               },
               "touchTip": {
@@ -4143,7 +4143,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
@@ -4194,8 +4194,8 @@
               },
               "speed": 35,
               "airGapByVolume": [
-                [1.0, 1.0],
-                [49.0, 1.0],
+                [1.0, 0.1],
+                [49.0, 0.1],
                 [50.0, 0.0]
               ],
               "touchTip": {
@@ -4221,7 +4221,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 6.5]],
             "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
@@ -4272,10 +4272,10 @@
                 [50.0, 0.0]
               ],
               "blowout": {
-                "enable": false,
+                "enable": true,
                 "params": {
                   "location": "destination",
-                  "flowRate": 200.0
+                  "flowRate": 80.0
                 }
               },
               "touchTip": {
@@ -4301,7 +4301,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
@@ -4310,7 +4310,12 @@
                 "volume": 50
               }
             },
-            "pushOutByVolume": [[1.0, 5.0]],
+            "pushOutByVolume": [
+              [1.0, 7.0],
+              [5.0, 2.0],
+              [10.0, 2.0],
+              [50.0, 5.0]
+            ],
             "delay": {
               "enable": false,
               "params": {
@@ -4355,7 +4360,7 @@
                 "enable": true,
                 "params": {
                   "location": "trash",
-                  "flowRate": 200.0
+                  "flowRate": 80.0
                 }
               },
               "touchTip": {
@@ -4381,7 +4386,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
@@ -4432,8 +4437,9 @@
               },
               "speed": 35,
               "airGapByVolume": [
-                [1.0, 5.0],
-                [195.0, 5.0],
+                [1.0, 2],
+                [50, 3.5],
+                [198.0, 2.0],
                 [200.0, 0.0]
               ],
               "touchTip": {
@@ -4459,7 +4465,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
@@ -4510,10 +4516,10 @@
                 [200.0, 0.0]
               ],
               "blowout": {
-                "enable": false,
+                "enable": true,
                 "params": {
                   "location": "destination",
-                  "flowRate": 200.0
+                  "flowRate": 80.0
                 }
               },
               "touchTip": {
@@ -4539,7 +4545,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
@@ -4548,7 +4554,12 @@
                 "volume": 50
               }
             },
-            "pushOutByVolume": [[1.0, 5.0]],
+            "pushOutByVolume": [
+              [1.0, 5.0],
+              [5.0, 5.0],
+              [50.0, 5.0],
+              [200.0, 5.0]
+            ],
             "delay": {
               "enable": false,
               "params": {
@@ -4593,7 +4604,7 @@
                 "enable": true,
                 "params": {
                   "location": "trash",
-                  "flowRate": 200.0
+                  "flowRate": 80.0
                 }
               },
               "touchTip": {
@@ -4697,7 +4708,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
@@ -4748,10 +4759,10 @@
                 [200.0, 0.0]
               ],
               "blowout": {
-                "enable": false,
+                "enable": true,
                 "params": {
                   "location": "destination",
-                  "flowRate": 200.0
+                  "flowRate": 80.0
                 }
               },
               "touchTip": {
@@ -4777,7 +4788,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
@@ -4786,7 +4797,12 @@
                 "volume": 50
               }
             },
-            "pushOutByVolume": [[1.0, 5.0]],
+            "pushOutByVolume": [
+              [1.0, 5.0],
+              [5.0, 5.0],
+              [50.0, 2.0],
+              [200.0, 5.0]
+            ],
             "delay": {
               "enable": false,
               "params": {
@@ -4831,7 +4847,7 @@
                 "enable": true,
                 "params": {
                   "location": "trash",
-                  "flowRate": 200.0
+                  "flowRate": 80.0
                 }
               },
               "touchTip": {
@@ -4857,7 +4873,7 @@
                 "z": 2
               }
             },
-            "flowRateByVolume": [[1.0, 200.0]],
+            "flowRateByVolume": [[1.0, 80.0]],
             "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],

opentrons_shared_data/data/module/definitions/3/absorbanceReaderV1.json

@@ -48,12 +48,6 @@
     "ot2_short_trash": {},
     "ot3_standard": {}
   },
-  "orientation": {
-    "A3": "right",
-    "B3": "right",
-    "C3": "right",
-    "D3": "right"
-  },
   "compatibleWith": [],
   "incompatibleWithDecks": ["ot2_standard", "ot2_short_trash"],
   "uniqueModuleData": {}

opentrons_shared_data/data/module/definitions/3/flexStackerModuleV1.json

@@ -154,16 +154,6 @@
       }
     }
   },
-  "orientation": {
-    "A3": "right",
-    "A4": "right",
-    "B3": "right",
-    "B4": "right",
-    "C3": "right",
-    "C4": "right",
-    "D3": "right",
-    "D4": "right"
-  },
   "compatibleWith": [],
   "incompatibleWithDecks": ["ot2_standard", "ot2_short_trash"],
   "uniqueModuleData": {

opentrons_shared_data/data/module/definitions/3/heaterShakerModuleV1.json

@@ -7,15 +7,7 @@
     "y": 1.125,
     "z": 68.275
   },
-  "features": {
-    "screwAnchoredAsParent": {
-      "screwCenter": {
-        "x": 64,
-        "y": 43,
-        "z": 0
-      }
-    }
-  },
+  "features": {},
   "dimensions": {
     "bareOverallHeight": 82,
     "overLabwareHeight": 0,
@@ -192,27 +184,6 @@
       }
     }
   },
-  "orientation": {
-    "1": "left",
-    "2": "center",
-    "3": "right",
-    "4": "left",
-    "5": "center",
-    "6": "right",
-    "7": "left",
-    "8": "center",
-    "9": "right",
-    "10": "left",
-    "11": "center",
-    "A1": "left",
-    "A3": "right",
-    "B1": "left",
-    "B3": "right",
-    "C1": "left",
-    "C3": "right",
-    "D1": "left",
-    "D3": "right"
-  },
   "compatibleWith": [],
   "incompatibleWithDecks": []
 }

opentrons_shared_data/data/module/definitions/3/magneticBlockV1.json

@@ -64,20 +64,6 @@
     "ot2_short_trash": {},
     "ot3_standard": {}
   },
-  "orientation": {
-    "A1": "center",
-    "A2": "center",
-    "A3": "center",
-    "B1": "center",
-    "B2": "center",
-    "B3": "center",
-    "C1": "center",
-    "C2": "center",
-    "C3": "center",
-    "D1": "center",
-    "D2": "center",
-    "D3": "center"
-  },
   "compatibleWith": [],
   "incompatibleWithDecks": [],
   "uniqueModuleData": {}

opentrons_shared_data/data/module/definitions/3/magneticModuleV1.json

@@ -48,19 +48,6 @@
   "displayName": "Magnetic Module GEN1",
   "quirks": [],
   "slotTransforms": {},
-  "orientation": {
-    "1": "left",
-    "2": "center",
-    "3": "right",
-    "4": "left",
-    "5": "center",
-    "6": "right",
-    "7": "left",
-    "8": "center",
-    "9": "right",
-    "10": "left",
-    "11": "center"
-  },
   "compatibleWith": [],
   "incompatibleWithDecks": ["ot3_standard"],
   "uniqueModuleData": {}

opentrons_shared_data/data/module/definitions/3/magneticModuleV2.json

@@ -101,19 +101,6 @@
       }
     }
   },
-  "orientation": {
-    "1": "left",
-    "2": "center",
-    "3": "right",
-    "4": "left",
-    "5": "center",
-    "6": "right",
-    "7": "left",
-    "8": "center",
-    "9": "right",
-    "10": "left",
-    "11": "center"
-  },
   "compatibleWith": [],
   "incompatibleWithDecks": ["ot3_standard"],
   "uniqueModuleData": {}

opentrons_shared_data/data/module/definitions/3/temperatureModuleV1.json

@@ -49,19 +49,6 @@
   "displayName": "Temperature Module GEN1",
   "quirks": [],
   "slotTransforms": {},
-  "orientation": {
-    "1": "left",
-    "2": "center",
-    "3": "right",
-    "4": "left",
-    "5": "center",
-    "6": "right",
-    "7": "left",
-    "8": "center",
-    "9": "right",
-    "10": "left",
-    "11": "center"
-  },
   "compatibleWith": ["temperatureModuleV2"],
   "incompatibleWithDecks": ["ot3_standard"],
   "uniqueModuleData": {}

opentrons_shared_data/data/module/definitions/3/temperatureModuleV2.json

@@ -182,27 +182,6 @@
       }
     }
   },
-  "orientation": {
-    "1": "left",
-    "2": "center",
-    "3": "right",
-    "4": "left",
-    "5": "center",
-    "6": "right",
-    "7": "left",
-    "8": "center",
-    "9": "right",
-    "10": "left",
-    "11": "center",
-    "A1": "left",
-    "A3": "right",
-    "B1": "left",
-    "B3": "right",
-    "C1": "left",
-    "C3": "right",
-    "D1": "left",
-    "D3": "right"
-  },
   "compatibleWith": ["temperatureModuleV1"],
   "incompatibleWithDecks": [],
   "uniqueModuleData": {}

opentrons_shared_data/data/module/definitions/3/thermocyclerModuleV1.json

@@ -52,9 +52,6 @@
   "displayName": "Thermocycler Module GEN1",
   "quirks": [],
   "slotTransforms": {},
-  "orientation": {
-    "7": "left"
-  },
   "compatibleWith": ["thermocyclerModuleV1"],
   "incompatibleWithDecks": ["ot3_standard"],
   "uniqueModuleData": {}

opentrons_shared_data/data/module/definitions/3/thermocyclerModuleV2.json

@@ -83,10 +83,6 @@
       }
     }
   },
-  "orientation": {
-    "7": "left",
-    "B1": "left"
-  },
   "compatibleWith": [],
   "incompatibleWithDecks": [],
   "uniqueModuleData": {}

opentrons_shared_data/data/module/schemas/3.json

@@ -111,7 +111,6 @@
     "displayName",
     "quirks",
     "slotTransforms",
-    "orientation",
     "compatibleWith",
     "incompatibleWithDecks"
   ],
@@ -181,17 +180,6 @@
               "enum": ["backLeftBottom"]
             }
           }
-        },
-        "screwAnchoredAsParent": {
-          "description": "The module provides a threaded hole into which a child deck item may be screwed securely.",
-          "type": "object",
-          "required": ["screwCenter"],
-          "properties": {
-            "screwCenter": {
-              "description": "The +x,+y,+z coordinate offset measured from the module's X/Y labware interface dimension origin to the center of the threaded hole. The +z is 0 by convention. When the threaded hole is located in a spring-loaded plate, the z represents the top of the threaded hole when the plate is compressed.",
-              "$ref": "#/definitions/vector3D"
-            }
-          }
         }
       }
     },
@@ -309,18 +297,6 @@
         }
       }
     },
-    "orientation": {
-      "type": "object",
-      "description": "The orientation of the module when placed in a particular cutout id.",
-      "patternProperties": {
-        "^([1-9]|10|11|[A-D][1-4])$": {
-          "description": "The keys are the id of cutouts.",
-          "type": "string",
-          "enum": ["left", "right", "center"]
-        }
-      },
-      "additionalProperties": false
-    },
     "compatibleWith": {
       "type": "array",
       "items": {

opentrons_shared_data/deck/types.py

@@ -7,7 +7,7 @@ This should only be imported if typing.TYPE_CHECKING is True
 from typing import Any, Dict, List, NewType, Union
 from typing_extensions import Literal, TypedDict
 
-from ..module.types import ModuleType, ModuleOrientation
+from ..module.types import ModuleType
 from opentrons_shared_data.labware.types import LocatingFeatures
 
 
@@ -46,7 +46,6 @@ class SlotDefV3(TypedDict, total=False):
     compatibleModuleTypes: List[ModuleType]
     matingSurfaceUnitVector: List[Union[Literal[1], Literal[-1]]]
     features: LocatingFeatures
-    orientation: ModuleOrientation
 
 
 class CalibrationPoint(TypedDict):
@@ -113,7 +112,6 @@ class AddressableAreaV5(_RequiredAddressableArea, total=False):
     ableToDropTips: bool
     ableToDropLabware: bool
     features: LocatingFeatures
-    orientation: Union[ModuleOrientation, None]
 
 
 class Cutout(TypedDict):

opentrons_shared_data/errors/codes.py

@@ -98,7 +98,6 @@ class ErrorCodes(Enum):
     MISSING_CONFIGURATION_DATA = _code_from_dict_entry("4009")
     RUNTIME_PARAMETER_VALUE_REQUIRED = _code_from_dict_entry("4010")
     INCORRECT_API_VERSION = _code_from_dict_entry("4011")
-    LABWARE_LOCATING_FEATURE_ERROR = _code_from_dict_entry("4012")
 
     @classmethod
     @lru_cache(25)

opentrons_shared_data/errors/exceptions.py

@@ -1,18 +1,6 @@
 """Exception hierarchy for error codes."""
 
-from __future__ import annotations
-from typing import (
-    Dict,
-    Any,
-    Optional,
-    List,
-    Iterator,
-    Union,
-    Sequence,
-    overload,
-    Type,
-    TypeVar,
-)
+from typing import Dict, Any, Optional, List, Iterator, Union, Sequence, overload
 from logging import getLogger
 from traceback import format_exception_only, format_tb
 import inspect
@@ -28,18 +16,6 @@ log = getLogger(__name__)
 class EnumeratedError(Exception):
     """The root class of error-code-bearing exceptions."""
 
-    @classmethod
-    def ensure(cls: Type[_ET], exception: Exception) -> _ET:
-        """Ensure that an exception is enumerated.
-
-        If the passed exception is an EnumeratedError, returns it; otherwise, wraps it in an appropriate
-        child class.
-        """
-        if isinstance(exception, cls):
-            return exception
-        else:
-            return PythonException(exception)  # type: ignore[return-value]
-
     def __init__(
         self,
         code: ErrorCodes,
@@ -74,9 +50,6 @@ class EnumeratedError(Exception):
         )
 
 
-_ET = TypeVar("_ET", bound=EnumeratedError, covariant=True)
-
-
 class CommunicationError(EnumeratedError):
     """An exception indicating an unknown communications error.
 

opentrons_shared_data/labware/labware_definition.py

@@ -604,7 +604,6 @@ class LabwareDefinition3(BaseModel):
     wells: dict[str, WellDefinition3]
     groups: list[Group]
     stackingOffsetWithLabware: dict[str, Vector3D] = Field(default_factory=dict)
-    legacyStackingOffsetWithLabware: dict[str, Vector3D] = Field(default_factory=dict)
     stackingOffsetWithModule: dict[str, Vector3D] = Field(default_factory=dict)
     allowedRoles: list[LabwareRole] = Field(default_factory=list)
     gripperOffsets: dict[str, GripperOffsets] = Field(default_factory=dict)

opentrons_shared_data/labware/types.py

@@ -180,29 +180,6 @@ class OpentronsFlexTipRackLidAsChildFeature(TypedDict):
     matingZ: float
 
 
-class HeaterShakerUniversalFlatAdapterDeckSide(TypedDict):
-    wallX: float
-    screwCenter: Vector3D
-
-
-class HeaterShakerUniversalFlatAdapterFeature(TypedDict):
-    flatSupportThermalCouplingZ: float
-    deckLeft: HeaterShakerUniversalFlatAdapterDeckSide
-    deckRight: HeaterShakerUniversalFlatAdapterDeckSide
-
-
-class FlatSupportThermalCouplingAsChildFeature(TypedDict):
-    wellExteriorBottomZ: float
-
-
-class ScrewAnchoredAsParentFeature(TypedDict):
-    screwCenter: Vector3D
-
-
-class ScrewAnchoredAsChildFeature(TypedDict):
-    screwCenter: Vector3D
-
-
 class LocatingFeatures(TypedDict):
     """A dictionary of locating features."""
 
@@ -211,14 +188,6 @@ class LocatingFeatures(TypedDict):
     springDirectionalForceAsParent: NotRequired[SpringDirectionalForce]
     opentronsFlexTipRackLidAsParent: NotRequired[OpentronsFlexTipRackLidAsParentFeature]
     opentronsFlexTipRackLidAsChild: NotRequired[OpentronsFlexTipRackLidAsChildFeature]
-    heaterShakerUniversalFlatAdapter: NotRequired[
-        HeaterShakerUniversalFlatAdapterFeature
-    ]
-    flatSupportThermalCouplingAsChild: NotRequired[
-        FlatSupportThermalCouplingAsChildFeature
-    ]
-    screwAnchoredAsParent: NotRequired[ScrewAnchoredAsParentFeature]
-    screwAnchoredAsChild: NotRequired[ScrewAnchoredAsChildFeature]
 
 
 class LabwareDefinition2(TypedDict):
@@ -268,7 +237,6 @@ class LabwareDefinition3(_OTSharedSchemaMixin, TypedDict):
     wells: dict[str, WellDefinition3]
     groups: list[WellGroup]
     stackingOffsetWithLabware: NotRequired[dict[str, Vector3D]]
-    legacyStackingOffsetWithLabware: NotRequired[dict[str, Vector3D]]
     stackingOffsetWithModule: NotRequired[dict[str, Vector3D]]
     allowedRoles: NotRequired[list[LabwareRoles]]
     gripperOffsets: NotRequired[dict[str, GripperOffsets]]

opentrons_shared_data/module/types.py

@@ -2,7 +2,7 @@
 opentrons_shared_data.module.types: types requiring typing_extensions
 for modules
 """
-import enum
+
 from typing import Any, Dict, List, Union
 from typing_extensions import Literal, TypedDict
 
@@ -112,13 +112,6 @@ class TOFSensorBaseline(TypedDict):
     Z: TOFBaseline
 
 
-class ModuleOrientation(enum.Enum):
-    LEFT = "left"
-    RIGHT = "right"
-    CENTER = "center"
-    NOT_APPLICABLE = None
-
-
 # TODO(mc, 2022-03-18): potentially move from typed-dict to Pydantic
 ModuleDefinitionV3 = TypedDict(
     "ModuleDefinitionV3",
@@ -140,7 +133,6 @@ ModuleDefinitionV3 = TypedDict(
         "uniqueModuleData": Dict[str, Any],
         "incompatibleWithDecks": List[str],
         "gripperOffsets": Dict[str, GripperOffsets],
-        "orientation": Dict[str, str],
     },
     total=False,
 )