removal of move lid engine command

Opentrons · Jan 16, 2025 · 3604e64 · 3604e64
1 parent 5f961f0
commit 3604e64
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 543 deletions.
diff --git a/api/src/opentrons/legacy_commands/protocol_commands.py b/api/src/opentrons/legacy_commands/protocol_commands.py
@@ -52,10 +52,3 @@ def move_labware(text: str) -> command_types.MoveLabwareCommand:
         "name": command_types.MOVE_LABWARE,
         "payload": {"text": text},
     }
-
-
-def move_lid(text: str) -> command_types.MoveLidCommand:
-    return {
-        "name": command_types.MOVE_LID,
-        "payload": {"text": text},
-    }
diff --git a/api/src/opentrons/legacy_commands/types.py b/api/src/opentrons/legacy_commands/types.py
@@ -23,7 +23,6 @@
 RESUME: Final = "command.RESUME"
 COMMENT: Final = "command.COMMENT"
 MOVE_LABWARE: Final = "command.MOVE_LABWARE"
-MOVE_LID: Final = "command.MOVE_LID"
 
 # Pipette #
 
@@ -541,15 +540,6 @@ class MoveLabwareCommand(TypedDict):
     payload: MoveLabwareCommandPayload
 
 
-class MoveLidCommandPayload(TextOnlyPayload):
-    pass
-
-
-class MoveLidCommand(TypedDict):
-    name: Literal["command.MOVE_LID"]
-    payload: MoveLidCommandPayload
-
-
 Command = Union[
     DropTipCommand,
     DropTipInDisposalLocationCommand,
@@ -598,7 +588,6 @@ class MoveLidCommand(TypedDict):
     MoveToCommand,
     MoveToDisposalLocationCommand,
     MoveLabwareCommand,
-    MoveLidCommand,
 ]
 
 
@@ -648,7 +637,6 @@ class MoveLidCommand(TypedDict):
     MoveToCommandPayload,
     MoveToDisposalLocationCommandPayload,
     MoveLabwareCommandPayload,
-    MoveLidCommandPayload,
 ]
 
 

diff --git a/api/src/opentrons/protocol_api/core/engine/protocol.py b/api/src/opentrons/protocol_api/core/engine/protocol.py
@@ -590,16 +590,6 @@ def move_lid(  # noqa: C901
         else:
             destination = to_location
 
-        # GET RID OF MOVE LID COMMANDS?
-        # self._engine_client.execute_command(
-        #     cmd.MoveLidParams(
-        #         labwareId=lid_id,
-        #         newLocation=destination,
-        #         strategy=strategy,
-        #         pickUpOffset=_pick_up_offset,
-        #         dropOffset=_drop_offset,
-        #     )
-        # )
         self._engine_client.execute_command(
             cmd.MoveLabwareParams(
                 labwareId=lid_id,

diff --git a/api/src/opentrons/protocol_api/protocol_context.py b/api/src/opentrons/protocol_api/protocol_context.py
@@ -1527,7 +1527,7 @@ def move_lid(
         )
         with publish_context(
             broker=self.broker,
-            command=cmds.move_lid(
+            command=cmds.move_labware(
                 # This needs to be called from protocol context and not the command for import loop reasons
                 text=stringify_lid_movement_command(
                     source_location, new_location, use_gripper

diff --git a/api/src/opentrons/protocol_engine/commands/__init__.py b/api/src/opentrons/protocol_engine/commands/__init__.py
@@ -198,14 +198,6 @@
     MoveLabwareCommandType,
 )
 
-from .move_lid import (
-    MoveLid,
-    MoveLidParams,
-    MoveLidCreate,
-    MoveLidResult,
-    MoveLidCommandType,
-)
-
 from .move_relative import (
     MoveRelative,
     MoveRelativeParams,
@@ -520,12 +512,6 @@
     "MoveLabwareParams",
     "MoveLabwareResult",
     "MoveLabwareCommandType",
-    # move lid command models
-    "MoveLid",
-    "MoveLidCreate",
-    "MoveLidParams",
-    "MoveLidResult",
-    "MoveLidCommandType",
     # move relative command models
     "MoveRelative",
     "MoveRelativeParams",

diff --git a/api/src/opentrons/protocol_engine/commands/absorbance_reader/__init__.py b/api/src/opentrons/protocol_engine/commands/absorbance_reader/__init__.py
@@ -33,7 +33,6 @@
 
 
 __all__ = [
-    "MoveLidResult",
     # absorbanace_reader/closeLid
     "CloseLidCommandType",
     "CloseLidParams",

diff --git a/api/src/opentrons/protocol_engine/commands/command_unions.py b/api/src/opentrons/protocol_engine/commands/command_unions.py
@@ -186,14 +186,6 @@
     MoveLabwareCommandType,
 )
 
-from .move_lid import (
-    MoveLid,
-    MoveLidParams,
-    MoveLidCreate,
-    MoveLidResult,
-    MoveLidCommandType,
-)
-
 from .move_relative import (
     MoveRelative,
     MoveRelativeParams,
@@ -394,7 +386,6 @@
         LoadLidStack,
         LoadLid,
         MoveLabware,
-        MoveLid,
         MoveRelative,
         MoveToCoordinates,
         MoveToWell,
@@ -483,7 +474,6 @@
     LoadModuleParams,
     LoadPipetteParams,
     MoveLabwareParams,
-    MoveLidParams,
     MoveRelativeParams,
     MoveToCoordinatesParams,
     MoveToWellParams,
@@ -570,7 +560,6 @@
     LoadLidStackCommandType,
     LoadLidCommandType,
     MoveLabwareCommandType,
-    MoveLidCommandType,
     MoveRelativeCommandType,
     MoveToCoordinatesCommandType,
     MoveToWellCommandType,
@@ -658,7 +647,6 @@
         LoadLidStackCreate,
         LoadLidCreate,
         MoveLabwareCreate,
-        MoveLidCreate,
         MoveRelativeCreate,
         MoveToCoordinatesCreate,
         MoveToWellCreate,
@@ -754,7 +742,6 @@
     LoadLidStackResult,
     LoadLidResult,
     MoveLabwareResult,
-    MoveLidResult,
     MoveRelativeResult,
     MoveToCoordinatesResult,
     MoveToWellResult,