fix(api): OT2 fixed trash load fix and API 2,15 support for new trash container structure

api/src/opentrons/protocol_api/core/engine/protocol.py

@@ -134,13 +134,14 @@ def _load_fixed_trash(self) -> None:
                 )
 
     def append_disposal_location(
-        self, disposal_location: Union[TrashBin, WasteChute]
+        self, disposal_location: Union[Labware, TrashBin, WasteChute]
     ) -> None:
         """Append a disposal location object to the core"""
         self._disposal_locations.append(disposal_location)
 
     def get_disposal_locations(self) -> List[Union[Labware, TrashBin, WasteChute]]:
         """Get disposal locations."""
+
         return self._disposal_locations
 
     def get_max_speeds(self) -> AxisMaxSpeeds:

api/src/opentrons/protocol_api/core/legacy/legacy_protocol_core.py

@@ -88,6 +88,7 @@ def __init__(
         self._loaded_modules: Set["AbstractModule"] = set()
         self._module_cores: List[legacy_module_core.LegacyModuleCore] = []
         self._labware_cores: List[LegacyLabwareCore] = [self.fixed_trash]
+        self._disposal_locations: List[Union[Labware, TrashBin, WasteChute]] = []
 
     @property
     def api_version(self) -> APIVersion:
@@ -133,11 +134,13 @@ def is_simulating(self) -> bool:
         return self._sync_hardware.is_simulator  # type: ignore[no-any-return]
 
     def append_disposal_location(
-        self, disposal_location: Union[TrashBin, WasteChute]
+        self, disposal_location: Union[Labware, TrashBin, WasteChute]
     ) -> None:
-        raise APIVersionError(
-            "Disposal locations are not supported in this API Version."
-        )
+        if isinstance(disposal_location, (TrashBin, WasteChute)):
+            raise APIVersionError(
+                "Trash Bin and Waste Chute Disposal locations are not supported in this API Version."
+            )
+        self._disposal_locations.append(disposal_location)
 
     def add_labware_definition(
         self,
@@ -383,10 +386,7 @@ def get_loaded_instruments(
 
     def get_disposal_locations(self) -> List[Union[Labware, TrashBin, WasteChute]]:
         """Get valid disposal locations."""
-        trash = self._deck_layout["12"]
-        if isinstance(trash, Labware):
-            return [trash]
-        raise APIVersionError("No dynamically loadable disposal locations.")
+        return self._disposal_locations
 
     def pause(self, msg: Optional[str]) -> None:
         """Pause the protocol."""

api/src/opentrons/protocol_api/core/protocol.py

@@ -63,7 +63,7 @@ def add_labware_definition(
 
     @abstractmethod
     def append_disposal_location(
-        self, disposal_location: Union[TrashBin, WasteChute]
+        self, disposal_location: Union[Labware, TrashBin, WasteChute]
     ) -> None:
         """Append a disposal location object to the core"""
         ...

api/src/opentrons/protocol_api/protocol_context.py

@@ -23,7 +23,10 @@
 from opentrons.commands import protocol_commands as cmds, types as cmd_types
 from opentrons.commands.publisher import CommandPublisher, publish
 from opentrons.protocols.api_support import instrument as instrument_support
-from opentrons.protocols.api_support.deck_type import NoTrashDefinedError
+from opentrons.protocols.api_support.deck_type import (
+    NoTrashDefinedError,
+    should_load_fixed_trash_for_python_protocol,
+)
 from opentrons.protocols.api_support.types import APIVersion
 from opentrons.protocols.api_support.util import (
     AxisMaxSpeeds,
@@ -138,7 +141,26 @@ def __init__(
             mount: None for mount in Mount
         }
         self._bundled_data: Dict[str, bytes] = bundled_data or {}
+
+        # With the addition of Moveable Trashes and Waste Chute support, it is not necessary
+        # to ensure that the list of "disposal locations", essentially the list of trashes,
+        # is initialized correctly on protocols utilizing former API versions prior to 2.16
+        # and also to ensure that any protocols after 2.16 intialize a Fixed Trash for OT-2
+        # protocols so that no load trash bin behavior is required within the protocol itself.
+        # Protocols prior to 2.16 expect the Fixed Trash to exist as a Labware object, while
+        # protocols after 2.16 expect trash to exist as either a TrashBin or WasteChute object.
+
         self._load_fixed_trash()
+        if should_load_fixed_trash_for_python_protocol(self._api_version):
+            self._core.append_disposal_location(self.fixed_trash)
+        elif (
+            self._api_version >= APIVersion(2, 16)
+            and self._core.robot_type == "OT-2 Standard"
+        ):
+            _fixed_trash_trashbin = TrashBin(
+                location=DeckSlotName.FIXED_TRASH, addressable_area_name="fixedTrash"
+            )
+            self._core.append_disposal_location(_fixed_trash_trashbin)
 
         self._commands: List[str] = []
         self._unsubscribe_commands: Optional[Callable[[], None]] = None
@@ -861,10 +883,10 @@ def load_instrument(
                 log=logger,
             )
 
-        trash: Optional[Labware]
+        trash: Optional[Union[Labware, TrashBin]]
         try:
             trash = self.fixed_trash
-        except NoTrashDefinedError:
+        except (NoTrashDefinedError, APIVersionError):
             trash = None
 
         instrument = InstrumentContext(
@@ -1024,17 +1046,33 @@ def deck(self) -> Deck:
 
     @property  # type: ignore
     @requires_version(2, 0)
-    def fixed_trash(self) -> Labware:
+    def fixed_trash(self) -> Union[Labware, TrashBin]:
         """The trash fixed to slot 12 of the robot deck.
 
-        It has one well and should be accessed like labware in your protocol.
+        In API Versions prior to 2.16 it has one well and should be accessed like labware in your protocol.
         e.g. ``protocol.fixed_trash['A1']``
+
+        In API Version 2.16 and above it returns a Trash fixture for OT-2 Protocols.
         """
+        if self._api_version >= APIVersion(2, 16):
+            if self._core.robot_type == "OT-3 Standard":
+                raise APIVersionError(
+                    "Fixed Trash is not supported on Flex protocols in API Version 2.16 and above."
+                )
+            disposal_locations = self._core.get_disposal_locations()
+            if len(disposal_locations) == 0:
+                raise NoTrashDefinedError(
+                    "No trash container has been defined in this protocol."
+                )
+            if isinstance(disposal_locations[0], TrashBin):
+                return disposal_locations[0]
+
         fixed_trash = self._core_map.get(self._core.fixed_trash)
         if fixed_trash is None:
             raise NoTrashDefinedError(
                 "No trash container has been defined in this protocol."
             )
+
         return fixed_trash
 
     def _load_fixed_trash(self) -> None:

api/src/opentrons/protocol_engine/state/labware.py

@@ -655,7 +655,6 @@ def get_fixed_trash_id(self) -> Optional[str]:
                 DeckSlotName.SLOT_A3,
             }:
                 return labware.id
-
         return None
 
     def is_fixed_trash(self, labware_id: str) -> bool:

api/tests/opentrons/protocol_api/test_protocol_context.py

@@ -38,6 +38,9 @@
     MagneticModuleCore,
     MagneticBlockCore,
 )
+from opentrons.protocols.api_support.deck_type import (
+    NoTrashDefinedError,
+)
 
 
 @pytest.fixture(autouse=True)
@@ -78,6 +81,12 @@ def mock_deck(decoy: Decoy) -> Deck:
     return decoy.mock(cls=Deck)
 
 
+@pytest.fixture
+def mock_fixed_trash(decoy: Decoy) -> Labware:
+    """Get a mock Fixed Trash."""
+    return decoy.mock(cls=Labware)
+
+
 @pytest.fixture
 def api_version() -> APIVersion:
     """The API version under test."""
@@ -90,8 +99,11 @@ def subject(
     mock_core_map: LoadedCoreMap,
     mock_deck: Deck,
     api_version: APIVersion,
+    mock_fixed_trash: Labware,
+    decoy: Decoy,
 ) -> ProtocolContext:
     """Get a ProtocolContext test subject with its dependencies mocked out."""
+    decoy.when(mock_core_map.get(mock_core.fixed_trash)).then_return(mock_fixed_trash)
     return ProtocolContext(
         api_version=api_version,
         core=mock_core,
@@ -115,7 +127,7 @@ def test_fixed_trash(
     trash = trash_captor.value
 
     decoy.when(mock_core_map.get(mock_core.fixed_trash)).then_return(trash)
-
+    decoy.when(mock_core.get_disposal_locations()).then_return([trash])
     result = subject.fixed_trash
 
     assert result is trash
@@ -152,6 +164,9 @@ def test_load_instrument(
     ).then_return(mock_instrument_core)
 
     decoy.when(mock_instrument_core.get_pipette_name()).then_return("Gandalf the Grey")
+    decoy.when(mock_core.get_disposal_locations()).then_raise(
+        NoTrashDefinedError("No trash!")
+    )
 
     result = subject.load_instrument(
         instrument_name="Gandalf", mount="shadowfax", tip_racks=mock_tip_racks
@@ -196,6 +211,9 @@ def test_load_instrument_replace(
         )
     ).then_return(mock_instrument_core)
     decoy.when(mock_instrument_core.get_pipette_name()).then_return("Ada Lovelace")
+    decoy.when(mock_core.get_disposal_locations()).then_raise(
+        NoTrashDefinedError("No trash!")
+    )
 
     pipette_1 = subject.load_instrument(instrument_name="ada", mount=Mount.RIGHT)
     assert subject.loaded_instruments["right"] is pipette_1
@@ -229,6 +247,9 @@ def test_96_channel_pipette_always_loads_on_the_left_mount(
             mount=Mount.LEFT,
         )
     ).then_return(mock_instrument_core)
+    decoy.when(mock_core.get_disposal_locations()).then_raise(
+        NoTrashDefinedError("No trash!")
+    )
 
     result = subject.load_instrument(
         instrument_name="A 96 Channel Name", mount="shadowfax"
@@ -261,6 +282,10 @@ def test_96_channel_pipette_raises_if_another_pipette_attached(
 
     decoy.when(mock_instrument_core.get_pipette_name()).then_return("ada")
 
+    decoy.when(mock_core.get_disposal_locations()).then_raise(
+        NoTrashDefinedError("No trash!")
+    )
+
     pipette_1 = subject.load_instrument(instrument_name="ada", mount=Mount.RIGHT)
     assert subject.loaded_instruments["right"] is pipette_1
 

api/tests/opentrons/protocol_api_integration/test_trashes.py

@@ -25,12 +25,6 @@
             "2.16",
             "OT-2",
             protocol_api.TrashBin,
-            marks=[
-                pytest.mark.ot3_only,  # Simulating a Flex protocol requires a Flex hardware API.
-                pytest.mark.xfail(
-                    strict=True, reason="https://opentrons.atlassian.net/browse/RSS-417"
-                ),
-            ],
         ),
         pytest.param(
             "2.16",
@@ -58,7 +52,10 @@ def test_fixed_trash_presence(
     )
 
     if expected_trash_class is None:
-        with pytest.raises(Exception, match="No trash container has been defined"):
+        with pytest.raises(
+            Exception,
+            match="Fixed Trash is not supported on Flex protocols in API Version 2.16 and above.",
+        ):
             protocol.fixed_trash
         with pytest.raises(Exception, match="No trash container has been defined"):
             instrument.trash_container
@@ -75,7 +72,10 @@ def test_trash_search() -> None:
     instrument = protocol.load_instrument("flex_1channel_50", mount="left")
 
     # By default, there should be no trash.
-    with pytest.raises(Exception, match="No trash container has been defined"):
+    with pytest.raises(
+        Exception,
+        match="Fixed Trash is not supported on Flex protocols in API Version 2.16 and above.",
+    ):
         protocol.fixed_trash
     with pytest.raises(Exception, match="No trash container has been defined"):
         instrument.trash_container
@@ -84,7 +84,10 @@ def test_trash_search() -> None:
     loaded_second = protocol.load_trash_bin("B1")
 
     # After loading some trashes, there should still be no protocol.fixed_trash...
-    with pytest.raises(Exception, match="No trash container has been defined"):
+    with pytest.raises(
+        Exception,
+        match="Fixed Trash is not supported on Flex protocols in API Version 2.16 and above.",
+    ):
         protocol.fixed_trash
     # ...but instrument.trash_container should automatically update to point to
     # the first trash that we loaded.