opentrons 8.2.0a0__py2.py3-none-any.whl → 8.2.0a1__py2.py3-none-any.whl

opentrons/protocol_engine/commands/load_module.py

@@ -5,7 +5,6 @@ from typing_extensions import Literal
 from pydantic import BaseModel, Field
 
 from .command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
-from ..errors import ModuleNotLoadedError
 from ..errors.error_occurrence import ErrorOccurrence
 from ..types import (
     DeckSlotLocation,
@@ -17,7 +16,6 @@ from opentrons.types import DeckSlotName
 
 from opentrons.protocol_engine.resources import deck_configuration_provider
 
-from opentrons.drivers.types import AbsorbanceReaderLidStatus
 
 if TYPE_CHECKING:
     from ..state.state import StateView
@@ -152,43 +150,6 @@ class LoadModuleImplementation(
                 module_id=params.moduleId,
             )
 
-        # Handle lid position update for loaded Plate Reader module on deck
-        if (
-            not self._state_view.config.use_virtual_modules
-            and params.model == ModuleModel.ABSORBANCE_READER_V1
-            and params.moduleId is not None
-        ):
-            try:
-                abs_reader = self._equipment.get_module_hardware_api(
-                    self._state_view.modules.get_absorbance_reader_substate(
-                        params.moduleId
-                    ).module_id
-                )
-            except ModuleNotLoadedError:
-                abs_reader = None
-
-            if abs_reader is not None:
-                result = await abs_reader.get_current_lid_status()
-                if (
-                    isinstance(result, AbsorbanceReaderLidStatus)
-                    and result is not AbsorbanceReaderLidStatus.ON
-                ):
-                    reader_area = self._state_view.modules.ensure_and_convert_module_fixture_location(
-                        params.location.slotName,
-                        self._state_view.config.deck_type,
-                        params.model,
-                    )
-                    lid_labware = self._state_view.labware.get_by_addressable_area(
-                        reader_area
-                    )
-
-                    if lid_labware is not None:
-                        self._state_view.labware._state.labware_by_id[
-                            lid_labware.id
-                        ].location = self._state_view.modules.absorbance_reader_dock_location(
-                            params.moduleId
-                        )
-
         return SuccessData(
             public=LoadModuleResult(
                 moduleId=loaded_module.module_id,

opentrons/protocol_engine/commands/move_labware.py

@@ -13,16 +13,22 @@ from typing_extensions import Literal
 from opentrons.protocol_engine.resources.model_utils import ModelUtils
 from opentrons.types import Point
 from ..types import (
+    ModuleModel,
     CurrentWell,
     LabwareLocation,
     DeckSlotLocation,
+    ModuleLocation,
     OnLabwareLocation,
     AddressableAreaLocation,
     LabwareMovementStrategy,
     LabwareOffsetVector,
     LabwareMovementOffsetData,
 )
-from ..errors import LabwareMovementNotAllowedError, NotSupportedOnRobotType
+from ..errors import (
+    LabwareMovementNotAllowedError,
+    NotSupportedOnRobotType,
+    LabwareOffsetDoesNotExistError,
+)
 from ..resources import labware_validation, fixture_validation
 from .command import (
     AbstractCommandImpl,
@@ -130,6 +136,7 @@ class MoveLabwareImplementation(AbstractCommandImpl[MoveLabwareParams, _ExecuteR
         )
         definition_uri = current_labware.definitionUri
         post_drop_slide_offset: Optional[Point] = None
+        trash_lid_drop_offset: Optional[LabwareOffsetVector] = None
 
         if self._state_view.labware.is_fixed_trash(params.labwareId):
             raise LabwareMovementNotAllowedError(
@@ -138,9 +145,11 @@ class MoveLabwareImplementation(AbstractCommandImpl[MoveLabwareParams, _ExecuteR
 
         if isinstance(params.newLocation, AddressableAreaLocation):
             area_name = params.newLocation.addressableAreaName
-            if not fixture_validation.is_gripper_waste_chute(
-                area_name
-            ) and not fixture_validation.is_deck_slot(area_name):
+            if (
+                not fixture_validation.is_gripper_waste_chute(area_name)
+                and not fixture_validation.is_deck_slot(area_name)
+                and not fixture_validation.is_trash(area_name)
+            ):
                 raise LabwareMovementNotAllowedError(
                     f"Cannot move {current_labware.loadName} to addressable area {area_name}"
                 )
@@ -162,6 +171,32 @@ class MoveLabwareImplementation(AbstractCommandImpl[MoveLabwareParams, _ExecuteR
                     y=0,
                     z=0,
                 )
+            elif fixture_validation.is_trash(area_name):
+                # When dropping labware in the trash bins we want to ensure they are lids
+                # and enforce a y-axis drop offset to ensure they fall within the trash bin
+                if labware_validation.validate_definition_is_lid(
+                    self._state_view.labware.get_definition(params.labwareId)
+                ):
+                    lid_disposable_offfets = (
+                        current_labware_definition.gripperOffsets.get(
+                            "lidDisposalOffsets"
+                        )
+                    )
+                    if lid_disposable_offfets is not None:
+                        trash_lid_drop_offset = LabwareOffsetVector(
+                            x=lid_disposable_offfets.dropOffset.x,
+                            y=lid_disposable_offfets.dropOffset.y,
+                            z=lid_disposable_offfets.dropOffset.z,
+                        )
+                    else:
+                        raise LabwareOffsetDoesNotExistError(
+                            f"Labware Definition {current_labware.loadName} does not contain required field 'lidDisposalOffsets' of 'gripperOffsets'."
+                        )
+                else:
+                    raise LabwareMovementNotAllowedError(
+                        "Can only move labware with allowed role 'Lid' to a Trash Bin."
+                    )
+
         elif isinstance(params.newLocation, DeckSlotLocation):
             self._state_view.addressable_areas.raise_if_area_not_in_deck_configuration(
                 params.newLocation.slotName.id
@@ -188,6 +223,13 @@ class MoveLabwareImplementation(AbstractCommandImpl[MoveLabwareParams, _ExecuteR
                 raise LabwareMovementNotAllowedError(
                     "Cannot move a labware onto itself."
                 )
+        # Validate labware for the absorbance reader
+        elif isinstance(available_new_location, ModuleLocation):
+            module = self._state_view.modules.get(available_new_location.moduleId)
+            if module is not None and module.model == ModuleModel.ABSORBANCE_READER_V1:
+                self._state_view.labware.raise_if_labware_incompatible_with_plate_reader(
+                    current_labware_definition
+                )
 
         # Allow propagation of ModuleNotLoadedError.
         new_offset_id = self._equipment.find_applicable_labware_offset_id(
@@ -232,6 +274,9 @@ class MoveLabwareImplementation(AbstractCommandImpl[MoveLabwareParams, _ExecuteR
                 dropOffset=params.dropOffset or LabwareOffsetVector(x=0, y=0, z=0),
             )
 
+            if trash_lid_drop_offset:
+                user_offset_data.dropOffset += trash_lid_drop_offset
+
             try:
                 # Skips gripper moves when using virtual gripper
                 await self._labware_movement.move_labware_with_gripper(

opentrons/protocol_engine/commands/unsafe/unsafe_place_labware.py

@@ -1,10 +1,13 @@
 """Place labware payload, result, and implementaiton."""
 
 from __future__ import annotations
-from pydantic import BaseModel, Field
-from typing import TYPE_CHECKING, Optional, Type, cast
+from typing import TYPE_CHECKING, Optional, Type
 from typing_extensions import Literal
 
+from opentrons_shared_data.labware.types import LabwareUri
+from opentrons_shared_data.labware.labware_definition import LabwareDefinition
+from pydantic import BaseModel, Field
+
 from opentrons.hardware_control.types import Axis, OT3Mount
 from opentrons.motion_planning.waypoints import get_gripper_labware_placement_waypoints
 from opentrons.protocol_engine.errors.exceptions import (
@@ -13,11 +16,14 @@ from opentrons.protocol_engine.errors.exceptions import (
 )
 from opentrons.types import Point
 
-from ...types import DeckSlotLocation, ModuleModel, OnDeckLabwareLocation
+from ...types import (
+    DeckSlotLocation,
+    ModuleModel,
+    OnDeckLabwareLocation,
+)
 from ..command import AbstractCommandImpl, BaseCommand, BaseCommandCreate, SuccessData
 from ...errors.error_occurrence import ErrorOccurrence
 from ...resources import ensure_ot3_hardware
-from ...state.update_types import StateUpdate
 
 from opentrons.hardware_control import HardwareControlAPI, OT3HardwareControlAPI
 
@@ -32,7 +38,7 @@ UnsafePlaceLabwareCommandType = Literal["unsafe/placeLabware"]
 class UnsafePlaceLabwareParams(BaseModel):
     """Payload required for an UnsafePlaceLabware command."""
 
-    labwareId: str = Field(..., description="The id of the labware to place.")
+    labwareURI: str = Field(..., description="Labware URI for labware.")
     location: OnDeckLabwareLocation = Field(
         ..., description="Where to place the labware."
     )
@@ -71,8 +77,8 @@ class UnsafePlaceLabwareImplementation(
         is pressed, get into error recovery, etc).
 
         Unlike the `moveLabware` command, where you pick a source and destination
-        location, this command takes the labwareId to be moved and location to
-        move it to.
+        location, this command takes the labwareURI of the labware to be moved
+        and location to move it to.
 
         """
         ot3api = ensure_ot3_hardware(self._hardware_api)
@@ -84,23 +90,37 @@ class UnsafePlaceLabwareImplementation(
                 "Cannot place labware when gripper is not gripping."
             )
 
-        # Allow propagation of LabwareNotLoadedError.
-        labware_id = params.labwareId
-        definition_uri = self._state_view.labware.get(labware_id).definitionUri
-        final_offsets = self._state_view.labware.get_labware_gripper_offsets(
-            labware_id, None
+        location = self._state_view.geometry.ensure_valid_gripper_location(
+            params.location,
+        )
+
+        definition = self._state_view.labware.get_definition_by_uri(
+            # todo(mm, 2024-11-07): This is an unsafe cast from untrusted input.
+            # We need a str -> LabwareUri parse/validate function.
+            LabwareUri(params.labwareURI)
+        )
+
+        # todo(mm, 2024-11-06): This is only correct in the special case of an
+        # absorbance reader lid. Its definition currently puts the offsets for *itself*
+        # in the property that's normally meant for offsets for its *children.*
+        final_offsets = self._state_view.labware.get_child_gripper_offsets(
+            labware_definition=definition, slot_name=None
+        )
+        drop_offset = (
+            Point(
+                final_offsets.dropOffset.x,
+                final_offsets.dropOffset.y,
+                final_offsets.dropOffset.z,
+            )
+            if final_offsets
+            else None
         )
-        drop_offset = cast(Point, final_offsets.dropOffset) if final_offsets else None
 
         if isinstance(params.location, DeckSlotLocation):
             self._state_view.addressable_areas.raise_if_area_not_in_deck_configuration(
                 params.location.slotName.id
             )
 
-        location = self._state_view.geometry.ensure_valid_gripper_location(
-            params.location,
-        )
-
         # This is an absorbance reader, move the lid to its dock (staging area).
         if isinstance(location, DeckSlotLocation):
             module = self._state_view.modules.get_by_slot(location.slotName)
@@ -109,30 +129,19 @@ class UnsafePlaceLabwareImplementation(
                     module.id
                 )
 
-        new_offset_id = self._equipment.find_applicable_labware_offset_id(
-            labware_definition_uri=definition_uri,
-            labware_location=location,
-        )
-
         # NOTE: When the estop is pressed, the gantry loses position,
         # so the robot needs to home x, y to sync.
         await ot3api.home(axes=[Axis.Z_L, Axis.Z_R, Axis.Z_G, Axis.X, Axis.Y])
-        state_update = StateUpdate()
 
         # Place the labware down
-        await self._start_movement(ot3api, labware_id, location, drop_offset)
+        await self._start_movement(ot3api, definition, location, drop_offset)
 
-        state_update.set_labware_location(
-            labware_id=labware_id,
-            new_location=location,
-            new_offset_id=new_offset_id,
-        )
-        return SuccessData(public=UnsafePlaceLabwareResult(), state_update=state_update)
+        return SuccessData(public=UnsafePlaceLabwareResult())
 
     async def _start_movement(
         self,
         ot3api: OT3HardwareControlAPI,
-        labware_id: str,
+        labware_definition: LabwareDefinition,
         location: OnDeckLabwareLocation,
         drop_offset: Optional[Point],
     ) -> None:
@@ -142,7 +151,7 @@ class UnsafePlaceLabwareImplementation(
         )
 
         to_labware_center = self._state_view.geometry.get_labware_grip_point(
-            labware_id=labware_id, location=location
+            labware_definition=labware_definition, location=location
         )
 
         movement_waypoints = get_gripper_labware_placement_waypoints(

opentrons/protocol_engine/create_protocol_engine.py

@@ -8,6 +8,9 @@ from opentrons.hardware_control.types import DoorState
 from opentrons.protocol_engine.execution.error_recovery_hardware_state_synchronizer import (
     ErrorRecoveryHardwareStateSynchronizer,
 )
+from opentrons.protocol_engine.resources.labware_data_provider import (
+    LabwareDataProvider,
+)
 from opentrons.util.async_helpers import async_context_manager_in_thread
 
 from opentrons_shared_data.robot import load as load_robot
@@ -81,7 +84,7 @@ async def create_protocol_engine(
     module_data_provider = ModuleDataProvider()
     file_provider = file_provider or FileProvider()
 
-    return ProtocolEngine(
+    pe = ProtocolEngine(
         hardware_api=hardware_api,
         state_store=state_store,
         action_dispatcher=action_dispatcher,
@@ -93,6 +96,20 @@ async def create_protocol_engine(
         file_provider=file_provider,
     )
 
+    # todo(mm, 2024-11-08): This is a quick hack to support the absorbance reader, which
+    # expects the engine to have this special labware definition available. It would be
+    # cleaner for the `loadModule` command to do this I/O and insert the definition
+    # into state. That gets easier after https://opentrons.atlassian.net/browse/EXEC-756.
+    #
+    # NOTE: This needs to stay in sync with LabwareView.get_absorbance_reader_lid_definition().
+    pe.add_labware_definition(
+        await LabwareDataProvider().get_labware_definition(
+            "opentrons_flex_lid_absorbance_plate_reader_module", "opentrons", 1
+        )
+    )
+
+    return pe
+
 
 @contextlib.contextmanager
 def create_protocol_engine_in_thread(

opentrons/protocol_engine/execution/labware_movement.py

@@ -1,7 +1,9 @@
 """Labware movement command handling."""
 from __future__ import annotations
 
-from typing import Optional, TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING, overload
+
+from opentrons_shared_data.labware.labware_definition import LabwareDefinition
 
 from opentrons.types import Point
 
@@ -79,24 +81,64 @@ class LabwareMovementHandler:
             )
         )
 
+    @overload
     async def move_labware_with_gripper(
         self,
+        *,
         labware_id: str,
         current_location: OnDeckLabwareLocation,
         new_location: OnDeckLabwareLocation,
         user_offset_data: LabwareMovementOffsetData,
         post_drop_slide_offset: Optional[Point],
     ) -> None:
-        """Move a loaded labware from one location to another using gripper."""
+        ...
+
+    @overload
+    async def move_labware_with_gripper(
+        self,
+        *,
+        labware_definition: LabwareDefinition,
+        current_location: OnDeckLabwareLocation,
+        new_location: OnDeckLabwareLocation,
+        user_offset_data: LabwareMovementOffsetData,
+        post_drop_slide_offset: Optional[Point],
+    ) -> None:
+        ...
+
+    async def move_labware_with_gripper(  # noqa: C901
+        self,
+        *,
+        labware_id: str | None = None,
+        labware_definition: LabwareDefinition | None = None,
+        current_location: OnDeckLabwareLocation,
+        new_location: OnDeckLabwareLocation,
+        user_offset_data: LabwareMovementOffsetData,
+        post_drop_slide_offset: Optional[Point],
+    ) -> None:
+        """Physically move a labware from one location to another using the gripper.
+
+        Generally, provide the `labware_id` of a loaded labware, and this method will
+        automatically look up its labware definition. If you're physically moving
+        something that has not been loaded as a labware (this is not common),
+        provide the `labware_definition` yourself instead.
+        """
         use_virtual_gripper = self._state_store.config.use_virtual_gripper
 
+        if labware_definition is None:
+            assert labware_id is not None  # From this method's @typing.overloads.
+            labware_definition = self._state_store.labware.get_definition(labware_id)
+
         if use_virtual_gripper:
-            # During Analysis we will pass in hard coded estimates for certain positions only accessible during execution
-            self._state_store.geometry.check_gripper_labware_tip_collision(
-                gripper_homed_position_z=_GRIPPER_HOMED_POSITION_Z,
-                labware_id=labware_id,
-                current_location=current_location,
-            )
+            # todo(mm, 2024-11-07): We should do this collision checking even when we
+            # only have a `labware_definition`, not a `labware_id`. Resolve when
+            # `check_gripper_labware_tip_collision()` can be made independent of `labware_id`.
+            if labware_id is not None:
+                self._state_store.geometry.check_gripper_labware_tip_collision(
+                    # During Analysis we will pass in hard coded estimates for certain positions only accessible during execution
+                    gripper_homed_position_z=_GRIPPER_HOMED_POSITION_Z,
+                    labware_id=labware_id,
+                    current_location=current_location,
+                )
             return
 
         ot3api = ensure_ot3_hardware(
@@ -119,14 +161,16 @@ class LabwareMovementHandler:
         await ot3api.home(axes=[Axis.Z_L, Axis.Z_R, Axis.Z_G])
         gripper_homed_position = await ot3api.gantry_position(mount=gripper_mount)
 
-        # Verify that no tip collisions will occur during the move
-        self._state_store.geometry.check_gripper_labware_tip_collision(
-            gripper_homed_position_z=gripper_homed_position.z,
-            labware_id=labware_id,
-            current_location=current_location,
-        )
+        # todo(mm, 2024-11-07): We should do this collision checking even when we
+        # only have a `labware_definition`, not a `labware_id`. Resolve when
+        # `check_gripper_labware_tip_collision()` can be made independent of `labware_id`.
+        if labware_id is not None:
+            self._state_store.geometry.check_gripper_labware_tip_collision(
+                gripper_homed_position_z=gripper_homed_position.z,
+                labware_id=labware_id,
+                current_location=current_location,
+            )
 
-        current_labware = self._state_store.labware.get_definition(labware_id)
         async with self._thermocycler_plate_lifter.lift_plate_for_labware_movement(
             labware_location=current_location
         ):
@@ -135,14 +179,14 @@ class LabwareMovementHandler:
                     from_location=current_location,
                     to_location=new_location,
                     additional_offset_vector=user_offset_data,
-                    current_labware=current_labware,
+                    current_labware=labware_definition,
                 )
             )
             from_labware_center = self._state_store.geometry.get_labware_grip_point(
-                labware_id=labware_id, location=current_location
+                labware_definition=labware_definition, location=current_location
             )
             to_labware_center = self._state_store.geometry.get_labware_grip_point(
-                labware_id=labware_id, location=new_location
+                labware_definition=labware_definition, location=new_location
             )
             movement_waypoints = get_gripper_labware_movement_waypoints(
                 from_labware_center=from_labware_center,
@@ -151,7 +195,9 @@ class LabwareMovementHandler:
                 offset_data=final_offsets,
                 post_drop_slide_offset=post_drop_slide_offset,
             )
-            labware_grip_force = self._state_store.labware.get_grip_force(labware_id)
+            labware_grip_force = self._state_store.labware.get_grip_force(
+                labware_definition
+            )
             holding_labware = False
             for waypoint_data in movement_waypoints:
                 if waypoint_data.jaw_open:
@@ -174,9 +220,11 @@ class LabwareMovementHandler:
                     # should be holding labware
                     if holding_labware:
                         labware_bbox = self._state_store.labware.get_dimensions(
-                            labware_id
+                            labware_definition=labware_definition
+                        )
+                        well_bbox = self._state_store.labware.get_well_bbox(
+                            labware_definition=labware_definition
                         )
-                        well_bbox = self._state_store.labware.get_well_bbox(labware_id)
                         # todo(mm, 2024-09-26): This currently raises a lower-level 2015 FailedGripperPickupError.
                         # Convert this to a higher-level 3001 LabwareDroppedError or 3002 LabwareNotPickedUpError,
                         # depending on what waypoint we're at, to propagate a more specific error code to users.

opentrons/protocol_engine/execution/movement.py

@@ -4,9 +4,10 @@ from __future__ import annotations
 import logging
 from typing import Optional, List, Union
 
-from opentrons.types import Point, MountType
+from opentrons.types import Point, MountType, StagingSlotName
 from opentrons.hardware_control import HardwareControlAPI
 from opentrons_shared_data.errors.exceptions import PositionUnknownError
+from opentrons.protocol_engine.errors import LocationIsStagingSlotError
 
 from ..types import (
     WellLocation,
@@ -93,9 +94,13 @@ class MovementHandler:
             self._state_store.modules.get_heater_shaker_movement_restrictors()
         )
 
-        dest_slot_int = self._state_store.geometry.get_ancestor_slot_name(
-            labware_id
-        ).as_int()
+        ancestor = self._state_store.geometry.get_ancestor_slot_name(labware_id)
+        if isinstance(ancestor, StagingSlotName):
+            raise LocationIsStagingSlotError(
+                "Cannot move to well on labware in Staging Area Slot."
+            )
+
+        dest_slot_int = ancestor.as_int()
 
         self._hs_movement_flagger.raise_if_movement_restricted(
             hs_movement_restrictors=hs_movement_restrictors,

opentrons/protocol_engine/protocol_engine.py

@@ -59,7 +59,6 @@ from .actions import (
     HardwareStoppedAction,
     ResetTipsAction,
     SetPipetteMovementSpeedAction,
-    AddAbsorbanceReaderLidAction,
 )
 
 
@@ -577,12 +576,6 @@ class ProtocolEngine:
             AddAddressableAreaAction(addressable_area=area)
         )
 
-    def add_absorbance_reader_lid(self, module_id: str, lid_id: str) -> None:
-        """Add an absorbance reader lid to the module state."""
-        self._action_dispatcher.dispatch(
-            AddAbsorbanceReaderLidAction(module_id=module_id, lid_id=lid_id)
-        )
-
     def reset_tips(self, labware_id: str) -> None:
         """Reset the tip state of a given labware."""
         # TODO(mm, 2023-03-10): Safely raise an error if the given labware isn't a

opentrons/protocol_engine/resources/deck_data_provider.py

@@ -17,11 +17,9 @@ from ..types import (
     DeckSlotLocation,
     DeckType,
     LabwareLocation,
-    AddressableAreaLocation,
     DeckConfigurationType,
 )
 from .labware_data_provider import LabwareDataProvider
-from ..resources import deck_configuration_provider
 
 
 @final
@@ -71,43 +69,6 @@ class DeckDataProvider:
             slot = cast(Optional[str], fixture.get("slot"))
 
             if (
-                deck_configuration is not None
-                and load_name is not None
-                and slot is not None
-                and slot not in DeckSlotName._value2member_map_
-            ):
-                # The provided slot is likely to be an addressable area for Module-required labware Eg: Plate Reader Lid
-                for (
-                    cutout_id,
-                    cutout_fixture_id,
-                    opentrons_module_serial_number,
-                ) in deck_configuration:
-                    provided_addressable_areas = (
-                        deck_configuration_provider.get_provided_addressable_area_names(
-                            cutout_fixture_id=cutout_fixture_id,
-                            cutout_id=cutout_id,
-                            deck_definition=deck_definition,
-                        )
-                    )
-                    if slot in provided_addressable_areas:
-                        addressable_area_location = AddressableAreaLocation(
-                            addressableAreaName=slot
-                        )
-                        definition = await self._labware_data.get_labware_definition(
-                            load_name=load_name,
-                            namespace="opentrons",
-                            version=1,
-                        )
-
-                        labware.append(
-                            DeckFixedLabware(
-                                labware_id=labware_id,
-                                definition=definition,
-                                location=addressable_area_location,
-                            )
-                        )
-
-            elif (
                 load_fixed_trash
                 and load_name is not None
                 and slot is not None

opentrons/protocol_engine/resources/file_provider.py

@@ -66,7 +66,7 @@ class PlateReaderData(BaseModel):
                 row.append(str(measurement.data[f"{plate_alpharows[i]}{j+1}"]))
             rows.append(row)
         for i in range(3):
-            rows.append([""])
+            rows.append([])
         rows.append(["", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"])
         for i in range(8):
             row = [plate_alpharows[i]]
@@ -74,7 +74,7 @@ class PlateReaderData(BaseModel):
                 row.append("")
             rows.append(row)
         for i in range(3):
-            rows.append([""])
+            rows.append([])
         rows.append(
             [
                 "",
@@ -86,7 +86,7 @@ class PlateReaderData(BaseModel):
             ]
         )
         for i in range(3):
-            rows.append([""])
+            rows.append([])
         rows.append(
             [
                 "",
@@ -100,7 +100,7 @@ class PlateReaderData(BaseModel):
         )
         rows.append(["1", "Sample 1", "", "", "", "1", "", "", "", "", "", ""])
         for i in range(3):
-            rows.append([""])
+            rows.append([])
 
         # end of file metadata
         rows.append(["Protocol"])
@@ -109,13 +109,17 @@ class PlateReaderData(BaseModel):
         if self.reference_wavelength is not None:
             rows.append(["Reference Wavelength (nm)", str(self.reference_wavelength)])
         rows.append(["Serial No.", self.serial_number])
-        rows.append(["Measurement started at", str(self.start_time)])
-        rows.append(["Measurement finished at", str(self.finish_time)])
+        rows.append(
+            ["Measurement started at", self.start_time.strftime("%m %d %H:%M:%S %Y")]
+        )
+        rows.append(
+            ["Measurement finished at", self.finish_time.strftime("%m %d %H:%M:%S %Y")]
+        )
 
         # Ensure the filename adheres to ruleset contains the wavelength for a given measurement
         if filename.endswith(".csv"):
             filename = filename[:-4]
-        filename = filename + "_" + str(measurement.wavelength) + ".csv"
+        filename = filename + str(measurement.wavelength) + "nm.csv"
 
         return GenericCsvTransform.build(
             filename=filename,

opentrons/protocol_engine/resources/fixture_validation.py

@@ -29,7 +29,12 @@ def is_drop_tip_waste_chute(addressable_area_name: str) -> bool:
 
 def is_trash(addressable_area_name: str) -> bool:
     """Check if an addressable area is a trash bin."""
-    return addressable_area_name in {"movableTrash", "fixedTrash", "shortFixedTrash"}
+    return any(
+        [
+            s in addressable_area_name
+            for s in {"movableTrash", "fixedTrash", "shortFixedTrash"}
+        ]
+    )
 
 
 def is_staging_slot(addressable_area_name: str) -> bool: