move labware

Author: sfoster1

api/src/opentrons/protocol_engine/commands/labware_handling_common.py

@@ -22,21 +22,3 @@ class LabwarePositionResultMixin(LabwareHandlingResultMixin):
         None,
         description="An ID referencing the labware offset that will apply to this labware in this location.",
     )
-
-
-class LabwareMotionResultMixin(BaseModel):
-    """A result for commands that move a labware entity."""
-
-    labwareId: str = Field(..., description="The id of the labware.")
-    newLocationSequence: LabwareLocationSequence | None = Field(
-        None,
-        description="the full location down to the deck of the labware after this command.",
-    )
-    originalLocationSequence: LabwareLocationSequence | None = Field(
-        None,
-        description="The full location down to the deck of the labware before this command.",
-    )
-    offsetId: str | None = Field(
-        None,
-        description="An ID referencing the labware offset that will apply to this labware in the position this command leaves it in.",
-    )

api/src/opentrons/protocol_engine/commands/move_labware.py

@@ -26,6 +26,7 @@
     LabwareMovementStrategy,
     LabwareOffsetVector,
     LabwareMovementOffsetData,
+    LabwareLocationSequence,
 )
 from ..errors import (
     LabwareMovementNotAllowedError,
@@ -100,6 +101,14 @@ class MoveLabwareResult(BaseModel):
             " so the default of (0, 0, 0) will be used."
         ),
     )
+    newLocationSequence: LabwareLocationSequence | None = Field(
+        None,
+        description="the full location down to the deck of the labware after this command.",
+    )
+    originalLocationSequence: LabwareLocationSequence | None = Field(
+        None,
+        description="The full location down to the deck of the labware before this command.",
+    )
 
 
 class GripperMovementError(ErrorOccurrence):