opentrons 8.4.0a2__tar.gz → 8.4.0a3__tar.gz

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentrons
-Version: 8.4.0a2
+Version: 8.4.0a3
 Summary: The Opentrons API is a simple framework designed to make writing automated biology lab protocols easy.
 Author: Opentrons
 Author-email: engineering@opentrons.com
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 License-File: ../LICENSE
-Requires-Dist: opentrons-shared-data==8.4.0a2
+Requires-Dist: opentrons-shared-data==8.4.0a3
 Requires-Dist: aionotify==0.3.1
 Requires-Dist: anyio<4.0.0,>=3.6.1
 Requires-Dist: jsonschema<4.18.0,>=3.0.1
@@ -35,9 +35,9 @@ Requires-Dist: pyusb==1.2.1
 Requires-Dist: importlib-metadata>=1.0; python_version < "3.8"
 Requires-Dist: packaging>=21.0
 Provides-Extra: ot2-hardware
-Requires-Dist: opentrons-hardware==8.4.0a2; extra == "ot2-hardware"
+Requires-Dist: opentrons-hardware==8.4.0a3; extra == "ot2-hardware"
 Provides-Extra: flex-hardware
-Requires-Dist: opentrons-hardware[FLEX]==8.4.0a2; extra == "flex-hardware"
+Requires-Dist: opentrons-hardware[FLEX]==8.4.0a3; extra == "flex-hardware"
 
 .. _Full API Documentation: http://docs.opentrons.com
 

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_api/core/engine/instrument.py

@@ -1141,7 +1141,7 @@ class InstrumentCore(AbstractInstrument[WellCore, LabwareCore]):
             result.nextTipInfo if isinstance(result.nextTipInfo, NextTipInfo) else None
         )
 
-    def transfer_liquid(  # noqa: C901
+    def transfer_with_liquid_class(  # noqa: C901
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -1335,7 +1335,7 @@ class InstrumentCore(AbstractInstrument[WellCore, LabwareCore]):
             _drop_tip()
 
     # TODO(spp, 2025-02-25): wire up return tip
-    def distribute_liquid(  # noqa: C901
+    def distribute_with_liquid_class(  # noqa: C901
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -1417,7 +1417,7 @@ class InstrumentCore(AbstractInstrument[WellCore, LabwareCore]):
                 tip_working_volume=working_volume,
             )
         ):
-            self.transfer_liquid(
+            self.transfer_with_liquid_class(
                 liquid_class=liquid_class,
                 volume=volume,
                 source=[source for _ in range(len(dest))],
@@ -1657,7 +1657,7 @@ class InstrumentCore(AbstractInstrument[WellCore, LabwareCore]):
             <= tip_working_volume
         )
 
-    def consolidate_liquid(  # noqa: C901
+    def consolidate_with_liquid_class(  # noqa: C901
         self,
         liquid_class: LiquidClass,
         volume: float,

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_api/core/instrument.py

@@ -359,7 +359,7 @@ class AbstractInstrument(ABC, Generic[WellCoreType, LabwareCoreType]):
         ...
 
     @abstractmethod
-    def transfer_liquid(
+    def transfer_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -374,7 +374,7 @@ class AbstractInstrument(ABC, Generic[WellCoreType, LabwareCoreType]):
         ...
 
     @abstractmethod
-    def distribute_liquid(
+    def distribute_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -392,7 +392,7 @@ class AbstractInstrument(ABC, Generic[WellCoreType, LabwareCoreType]):
         ...
 
     @abstractmethod
-    def consolidate_liquid(
+    def consolidate_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_api/core/legacy/legacy_instrument_core.py

@@ -624,7 +624,7 @@ class LegacyInstrumentCore(AbstractInstrument[LegacyWellCore, LegacyLabwareCore]
         """This will never be called because it was added in API 2.16."""
         pass
 
-    def transfer_liquid(
+    def transfer_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -638,7 +638,7 @@ class LegacyInstrumentCore(AbstractInstrument[LegacyWellCore, LegacyLabwareCore]
         """This will never be called because it was added in API 2.23"""
         assert False, "transfer_liquid is not supported in legacy context"
 
-    def distribute_liquid(
+    def distribute_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -652,7 +652,7 @@ class LegacyInstrumentCore(AbstractInstrument[LegacyWellCore, LegacyLabwareCore]
         """This will never be called because it was added in API 2.23"""
         assert False, "distribute_liquid is not supported in legacy context"
 
-    def consolidate_liquid(
+    def consolidate_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_api/core/legacy_simulator/legacy_instrument_core.py

@@ -513,7 +513,7 @@ class LegacyInstrumentCoreSimulator(
         """This will never be called because it was added in API 2.15."""
         pass
 
-    def transfer_liquid(
+    def transfer_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -527,7 +527,7 @@ class LegacyInstrumentCoreSimulator(
         """This will never be called because it was added in API 2.23."""
         assert False, "transfer_liquid is not supported in legacy context"
 
-    def distribute_liquid(
+    def distribute_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -541,7 +541,7 @@ class LegacyInstrumentCoreSimulator(
         """This will never be called because it was added in API 2.23."""
         assert False, "distribute_liquid is not supported in legacy context"
 
-    def consolidate_liquid(
+    def consolidate_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_api/instrument_context.py

@@ -1509,7 +1509,7 @@ class InstrumentContext(publisher.CommandPublisher):
             getattr(self, cmd["method"])(*cmd["args"], **cmd["kwargs"])
 
     @requires_version(2, 23)
-    def transfer_liquid(
+    def transfer_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -1526,11 +1526,32 @@ class InstrumentContext(publisher.CommandPublisher):
         return_tip: bool = False,
         visit_every_well: bool = False,
     ) -> InstrumentContext:
-        """Transfer liquid from source to dest using the specified liquid class properties.
+        """Move a particular type of liquid from one well or group of wells to another.
 
-        TODO: Add args description.
+        :param liquid_class: The type of liquid to move. You must specify the liquid class,
+            even if you have used :py:meth:`.load_liquid` to indicate what liquid the
+            source contains.
+        :type liquid_class: :py:class:`.LiquidClass`
 
-        :meta private:
+        :param volume: The amount, in µL, to aspirate from each source and dispense to
+                       each destination.
+        :param source: A single well or a list of wells to aspirate liquid from.
+        :param dest: A single well or a list of wells to dispense liquid into.
+        :param new_tip: When to pick up and drop tips during the command.
+            Defaults to ``"once"``.
+
+              - ``"once"``: Use one tip for the entire command.
+              - ``"always"``: Use a new tip for each set of aspirate and dispense steps.
+              - ``"per source"``: Use one tip for each source well, even if
+                :ref:`tip refilling <complex-tip-refilling>` is required.
+              - ``"never"``: Do not pick up or drop tips at all.
+
+            See :ref:`param-tip-handling` for details.
+
+        :param trash_location: A trash container, well, or other location to dispose of
+            tips. Depending on the liquid class, the pipette may also blow out liquid here.
+        :param return_tip: Whether to drop used tips in their original locations
+            in the tip rack, instead of the trash.
         """
         transfer_args = verify_and_normalize_transfer_args(
             source=source,
@@ -1552,7 +1573,7 @@ class InstrumentContext(publisher.CommandPublisher):
                 " to transfer liquid onto one destinations from many sources, use 'consolidate_liquid'."
             )
 
-        self._core.transfer_liquid(
+        self._core.transfer_with_liquid_class(
             liquid_class=liquid_class,
             volume=volume,
             source=[
@@ -1574,7 +1595,7 @@ class InstrumentContext(publisher.CommandPublisher):
         return self
 
     @requires_version(2, 23)
-    def distribute_liquid(
+    def distribute_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -1590,12 +1611,30 @@ class InstrumentContext(publisher.CommandPublisher):
         visit_every_well: bool = False,
     ) -> InstrumentContext:
         """
-        Distribute liquid from a single source to multiple destinations
-        using the specified liquid class properties.
+        Distribute a particular type of liquid from one well to a group of wells.
 
-        TODO: Add args description.
+        :param liquid_class: The type of liquid to move. You must specify the liquid class,
+            even if you have used :py:meth:`.load_liquid` to indicate what liquid the
+            source contains.
+        :type liquid_class: :py:class:`.LiquidClass`
 
-        :meta private:
+        :param volume: The amount, in µL, to aspirate from the source and dispense to
+                       each destination.
+        :param source: A single well to aspirate liquid from.
+        :param dest: A list of wells to dispense liquid into.
+        :param new_tip: When to pick up and drop tips during the command.
+            Defaults to ``"once"``.
+
+              - ``"once"`` or ``"per source"``: Use one tip for the entire command.
+              - ``"always"``: Use a new tip for each set of aspirate and dispense steps.
+              - ``"never"``: Do not pick up or drop tips at all.
+
+            See :ref:`param-tip-handling` for details.
+
+        :param trash_location: A trash container, well, or other location to dispose of
+            tips. Depending on the liquid class, the pipette may also blow out liquid here.
+        :param return_tip: Whether to drop used tips in their original locations
+            in the tip rack, instead of the trash.
         """
         transfer_args = verify_and_normalize_transfer_args(
             source=source,
@@ -1621,7 +1660,7 @@ class InstrumentContext(publisher.CommandPublisher):
             )
 
         verified_source = transfer_args.sources_list[0]
-        self._core.distribute_liquid(
+        self._core.distribute_with_liquid_class(
             liquid_class=liquid_class,
             volume=volume,
             source=(
@@ -1643,7 +1682,7 @@ class InstrumentContext(publisher.CommandPublisher):
         return self
 
     @requires_version(2, 23)
-    def consolidate_liquid(
+    def consolidate_with_liquid_class(
         self,
         liquid_class: LiquidClass,
         volume: float,
@@ -1659,12 +1698,31 @@ class InstrumentContext(publisher.CommandPublisher):
         visit_every_well: bool = False,
     ) -> InstrumentContext:
         """
-        Consolidate liquid from multiple sources to a single destination
-        using the specified liquid class properties.
+        Consolidate a particular type of liquid from a group of wells to one well.
 
-        TODO: Add args description.
+        :param liquid_class: The type of liquid to move. You must specify the liquid class,
+            even if you have used :py:meth:`.load_liquid` to indicate what liquid the
+            source contains.
+        :type liquid_class: :py:class:`.LiquidClass`
 
-        :meta private:
+        :param volume: The amount, in µL, to aspirate from the source and dispense to
+                       each destination.
+        :param source: A list of wells to aspirate liquid from.
+        :param dest: A single well to dispense liquid into.
+        :param new_tip: When to pick up and drop tips during the command.
+            Defaults to ``"once"``.
+
+              - ``"once"``: Use one tip for the entire command.
+              - ``"always"``: Use a new tip for each set of aspirate and dispense steps.
+              - ``"per source"``: Not available when consolidating.
+              - ``"never"``: Do not pick up or drop tips at all.
+
+            See :ref:`param-tip-handling` for details.
+
+        :param trash_location: A trash container, well, or other location to dispose of
+            tips. Depending on the liquid class, the pipette may also blow out liquid here.
+        :param return_tip: Whether to drop used tips in their original locations
+            in the tip rack, instead of the trash.
         """
         transfer_args = verify_and_normalize_transfer_args(
             source=source,
@@ -1690,7 +1748,7 @@ class InstrumentContext(publisher.CommandPublisher):
             )
 
         verified_dest = transfer_args.destinations_list[0]
-        self._core.consolidate_liquid(
+        self._core.consolidate_with_liquid_class(
             liquid_class=liquid_class,
             volume=volume,
             source=[

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_engine/commands/flex_stacker/empty.py

@@ -3,10 +3,11 @@
 from __future__ import annotations
 
 from __future__ import annotations
-from typing import Optional, Literal, TYPE_CHECKING
+from typing import Optional, Literal, TYPE_CHECKING, Annotated
 from typing_extensions import Type
 
 from pydantic import BaseModel, Field
+from pydantic.json_schema import SkipJsonSchema
 
 from ..command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
 from ...errors import (
@@ -39,12 +40,12 @@ class EmptyParams(BaseModel):
         ),
     )
 
-    message: str | None = Field(
+    message: str | SkipJsonSchema[None] = Field(
         None,
         description="The message to display on connected clients during a manualWithPause strategy empty.",
     )
 
-    count: int | None = Field(
+    count: Optional[Annotated[int, Field(ge=0)]] = Field(
         None,
         description=(
             "The new count of labware in the pool. If None, default to an empty pool. If this number is "
@@ -52,7 +53,6 @@ class EmptyParams(BaseModel):
             "Do not use the value in the parameters as an outside observer; instead, use the count value "
             "from the results."
         ),
-        ge=0,
     )
 
 
@@ -66,11 +66,11 @@ class EmptyResult(BaseModel):
         ...,
         description="The labware definition URI of the primary labware.",
     )
-    adapterLabwareURI: str | None = Field(
+    adapterLabwareURI: str | SkipJsonSchema[None] = Field(
         None,
         description="The labware definition URI of the adapter labware.",
     )
-    lidLabwareURI: str | None = Field(
+    lidLabwareURI: str | SkipJsonSchema[None] = Field(
         None,
         description="The labware definition URI of the lid labware.",
     )

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_engine/commands/flex_stacker/fill.py

@@ -1,10 +1,11 @@
 """Command models to engage a user to empty a Flex Stacker."""
 
 from __future__ import annotations
-from typing import Optional, Literal, TYPE_CHECKING
+from typing import Optional, Literal, TYPE_CHECKING, Annotated
 from typing_extensions import Type
 
 from pydantic import BaseModel, Field
+from pydantic.json_schema import SkipJsonSchema
 
 from ..command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
 from ...errors import (
@@ -37,12 +38,12 @@ class FillParams(BaseModel):
         ),
     )
 
-    message: str | None = Field(
+    message: str | SkipJsonSchema[None] = Field(
         None,
         description="The message to display on connected clients during a manualWithPause strategy fill.",
     )
 
-    count: int | None = Field(
+    count: Optional[Annotated[int, Field(ge=1)]] = Field(
         None,
         description=(
             "How full the labware pool should now be. If None, default to the maximum amount "
@@ -52,7 +53,6 @@ class FillParams(BaseModel):
             "holds, it will be clamped to that minimum. Do not use the value in the parameters as "
             "an outside observer; instead, use the count value from the results."
         ),
-        ge=1,
     )
 
 
@@ -66,11 +66,11 @@ class FillResult(BaseModel):
         ...,
         description="The labware definition URI of the primary labware.",
     )
-    adapterLabwareURI: str | None = Field(
+    adapterLabwareURI: str | SkipJsonSchema[None] = Field(
         None,
         description="The labware definition URI of the adapter labware.",
     )
-    lidLabwareURI: str | None = Field(
+    lidLabwareURI: str | SkipJsonSchema[None] = Field(
         None,
         description="The labware definition URI of the lid labware.",
     )

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_engine/commands/flex_stacker/retrieve.py

@@ -86,33 +86,33 @@ class RetrieveResult(BaseModel):
         ...,
         description="The labware ID of the primary retrieved labware.",
     )
-    adapterId: str | None = Field(
+    adapterId: str | SkipJsonSchema[None] = Field(
         None,
         description="The optional Adapter Labware ID of the adapter under a primary labware.",
     )
-    lidId: str | None = Field(
+    lidId: str | SkipJsonSchema[None] = Field(
         None,
         description="The optional Lid Labware ID of the lid on a primary labware.",
     )
     primaryLocationSequence: LabwareLocationSequence = Field(
         ..., description="The origin location of the primary labware."
     )
-    lidLocationSequence: LabwareLocationSequence | None = Field(
+    lidLocationSequence: LabwareLocationSequence | SkipJsonSchema[None] = Field(
         None,
         description="The origin location of the adapter labware under a primary labware.",
     )
-    adapterLocationSequence: LabwareLocationSequence | None = Field(
+    adapterLocationSequence: LabwareLocationSequence | SkipJsonSchema[None] = Field(
         None, description="The origin location of the lid labware on a primary labware."
     )
     primaryLabwareURI: str = Field(
         ...,
         description="The labware definition URI of the primary labware.",
     )
-    adapterLabwareURI: str | None = Field(
+    adapterLabwareURI: str | SkipJsonSchema[None] = Field(
         None,
         description="The labware definition URI of the adapter labware.",
     )
-    lidLabwareURI: str | None = Field(
+    lidLabwareURI: str | SkipJsonSchema[None] = Field(
         None,
         description="The labware definition URI of the lid labware.",
     )

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_engine/commands/flex_stacker/set_stored_labware.py

@@ -1,10 +1,11 @@
 """Command models to configure the stored labware pool of a Flex Stacker.."""
 
 from __future__ import annotations
-from typing import Optional, Literal, TYPE_CHECKING
+from typing import Optional, Literal, TYPE_CHECKING, Annotated
 from typing_extensions import Type
 
 from pydantic import BaseModel, Field
+from pydantic.json_schema import SkipJsonSchema
 
 from opentrons_shared_data.labware.labware_definition import LabwareDefinition
 
@@ -45,21 +46,20 @@ class SetStoredLabwareParams(BaseModel):
         ...,
         description="The details of the primary labware (i.e. not the lid or adapter, if any) stored in the stacker.",
     )
-    lidLabware: StackerStoredLabwareDetails | None = Field(
+    lidLabware: StackerStoredLabwareDetails | SkipJsonSchema[None] = Field(
         default=None,
         description="The details of the lid on the primary labware, if any.",
     )
-    adapterLabware: StackerStoredLabwareDetails | None = Field(
+    adapterLabware: StackerStoredLabwareDetails | SkipJsonSchema[None] = Field(
         default=None,
         description="The details of the adapter under the primary labware, if any.",
     )
-    initialCount: int | None = Field(
+    initialCount: Optional[Annotated[int, Field(ge=0)]] = Field(
         None,
         description=(
             "The number of labware that should be initially stored in the stacker. This number will be silently clamped to "
             "the maximum number of labware that will fit; do not rely on the parameter to know how many labware are in the stacker."
         ),
-        ge=0,
     )
 
 
@@ -69,11 +69,11 @@ class SetStoredLabwareResult(BaseModel):
     primaryLabwareDefinition: LabwareDefinition = Field(
         ..., description="The definition of the primary labware."
     )
-    lidLabwareDefinition: LabwareDefinition | None = Field(
-        ..., description="The definition of the lid on the primary labware, if any."
+    lidLabwareDefinition: LabwareDefinition | SkipJsonSchema[None] = Field(
+        None, description="The definition of the lid on the primary labware, if any."
     )
-    adapterLabwareDefinition: LabwareDefinition | None = Field(
-        ...,
+    adapterLabwareDefinition: LabwareDefinition | SkipJsonSchema[None] = Field(
+        None,
         description="The definition of the adapter under the primary labware, if any.",
     )
     count: int = Field(

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_engine/commands/flex_stacker/store.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 from typing import Optional, Literal, TYPE_CHECKING, Type, Union
 
 from pydantic import BaseModel, Field
+from pydantic.json_schema import SkipJsonSchema
 
 from ..command import (
     AbstractCommandImpl,
@@ -51,39 +52,41 @@ class StoreParams(BaseModel):
 class StoreResult(BaseModel):
     """Result data from a labware storage command."""
 
-    eventualDestinationLocationSequence: LabwareLocationSequence | None = Field(
+    eventualDestinationLocationSequence: LabwareLocationSequence | SkipJsonSchema[
+        None
+    ] = Field(
         None,
         description=(
             "The full location in which all labware moved by this command will eventually reside."
         ),
     )
-    primaryOriginLocationSequence: LabwareLocationSequence | None = Field(
-        None, description=("The origin location of the primary labware.")
-    )
-    primaryLabwareId: str | None = Field(
+    primaryOriginLocationSequence: LabwareLocationSequence | SkipJsonSchema[
+        None
+    ] = Field(None, description=("The origin location of the primary labware."))
+    primaryLabwareId: str | SkipJsonSchema[None] = Field(
         None, description="The primary labware in the stack that was stored."
     )
-    adapterOriginLocationSequence: LabwareLocationSequence | None = Field(
-        None, description=("The origin location of the adapter labware, if any.")
-    )
-    adapterLabwareId: str | None = Field(
+    adapterOriginLocationSequence: LabwareLocationSequence | SkipJsonSchema[
+        None
+    ] = Field(None, description=("The origin location of the adapter labware, if any."))
+    adapterLabwareId: str | SkipJsonSchema[None] = Field(
         None, description="The adapter in the stack that was stored, if any."
     )
-    lidOriginLocationSequence: LabwareLocationSequence | None = Field(
+    lidOriginLocationSequence: LabwareLocationSequence | SkipJsonSchema[None] = Field(
         None, description=("The origin location of the lid labware, if any.")
     )
-    lidLabwareId: str | None = Field(
+    lidLabwareId: str | SkipJsonSchema[None] = Field(
         None, description="The lid in the stack that was stored, if any."
     )
     primaryLabwareURI: str = Field(
         ...,
         description="The labware definition URI of the primary labware.",
     )
-    adapterLabwareURI: str | None = Field(
+    adapterLabwareURI: str | SkipJsonSchema[None] = Field(
         None,
         description="The labware definition URI of the adapter labware.",
     )
-    lidLabwareURI: str | None = Field(
+    lidLabwareURI: str | SkipJsonSchema[None] = Field(
         None,
         description="The labware definition URI of the lid labware.",
     )

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_engine/state/geometry.py

@@ -484,20 +484,20 @@ class GeometryView:
             if z_offset < lld_min_height:
                 if isinstance(well_location, PickUpTipWellLocation):
                     raise OperationLocationNotInWellError(
-                        f"Specifying {well_location.origin} with an offset of {well_location.offset} results in an operation location that could be below the bottom of the well"
+                        f"Specifying {well_location.origin} with a height offset of {well_location.offset.z} results in a height of {z_offset} mm; the minimum allowed height for liquid tracking is {lld_min_height} mm"
                     )
                 else:
                     raise OperationLocationNotInWellError(
-                        f"Specifying {well_location.origin} with an offset of {well_location.offset} and a volume offset of {well_location.volumeOffset} results in an operation location that could be below the bottom of the well"
+                        f"Specifying {well_location.origin} with a height offset of {well_location.offset.z} results in a height of {z_offset} mm; the minimum allowed height for liquid tracking is {lld_min_height} mm"
                     )
         elif z_offset < 0:
             if isinstance(well_location, PickUpTipWellLocation):
                 raise OperationLocationNotInWellError(
-                    f"Specifying {well_location.origin} with an offset of {well_location.offset} results in an operation location below the bottom of the well"
+                    f"Specifying {well_location.origin} with an offset of {well_location.offset.z} results in a location below the bottom of the well"
                 )
             else:
                 raise OperationLocationNotInWellError(
-                    f"Specifying {well_location.origin} with an offset of {well_location.offset} and a volume offset of {well_location.volumeOffset} results in an operation location below the bottom of the well"
+                    f"Specifying {well_location.origin} with an offset of {well_location.offset.z} and a volume offset of {well_location.volumeOffset} results in a location below the bottom of the well"
                 )
 
     def get_well_position(

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons/protocol_engine/types/location.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 from typing import Literal, Union, TypeGuard
 
 from pydantic import BaseModel, Field
+from pydantic.json_schema import SkipJsonSchema
 
 from opentrons.types import DeckSlotName, StagingSlotName
 
@@ -107,7 +108,7 @@ class OnLabwareLocationSequenceComponent(BaseModel):
 
     kind: Literal["onLabware"] = "onLabware"
     labwareId: str
-    lidId: str | None
+    lidId: str | SkipJsonSchema[None] = Field(None)
 
 
 class OnModuleLocationSequenceComponent(BaseModel):

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentrons
-Version: 8.4.0a2
+Version: 8.4.0a3
 Summary: The Opentrons API is a simple framework designed to make writing automated biology lab protocols easy.
 Author: Opentrons
 Author-email: engineering@opentrons.com
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 License-File: ../LICENSE
-Requires-Dist: opentrons-shared-data==8.4.0a2
+Requires-Dist: opentrons-shared-data==8.4.0a3
 Requires-Dist: aionotify==0.3.1
 Requires-Dist: anyio<4.0.0,>=3.6.1
 Requires-Dist: jsonschema<4.18.0,>=3.0.1
@@ -35,9 +35,9 @@ Requires-Dist: pyusb==1.2.1
 Requires-Dist: importlib-metadata>=1.0; python_version < "3.8"
 Requires-Dist: packaging>=21.0
 Provides-Extra: ot2-hardware
-Requires-Dist: opentrons-hardware==8.4.0a2; extra == "ot2-hardware"
+Requires-Dist: opentrons-hardware==8.4.0a3; extra == "ot2-hardware"
 Provides-Extra: flex-hardware
-Requires-Dist: opentrons-hardware[FLEX]==8.4.0a2; extra == "flex-hardware"
+Requires-Dist: opentrons-hardware[FLEX]==8.4.0a3; extra == "flex-hardware"
 
 .. _Full API Documentation: http://docs.opentrons.com
 

{opentrons-8.4.0a2 → opentrons-8.4.0a3}/src/opentrons.egg-info/requires.txt

@@ -1,4 +1,4 @@
-opentrons-shared-data==8.4.0a2
+opentrons-shared-data==8.4.0a3
 aionotify==0.3.1
 anyio<4.0.0,>=3.6.1
 jsonschema<4.18.0,>=3.0.1
@@ -15,7 +15,7 @@ packaging>=21.0
 importlib-metadata>=1.0
 
 [flex-hardware]
-opentrons-hardware[FLEX]==8.4.0a2
+opentrons-hardware[FLEX]==8.4.0a3
 
 [ot2-hardware]
-opentrons-hardware==8.4.0a2
+opentrons-hardware==8.4.0a3