remove deprecated parameters from move_resource (#550)

Author: rickwierenga

docs/resources/carrier/plate-carrier/plate_carrier.ipynb

@@ -20,7 +20,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -98,7 +98,7 @@
     {
      "data": {
       "text/plain": [
-       "PlateHolder(name=carrier-my_plate_carrier-spot-0, location=(004.000, 008.500, 086.150), size_x=127.0, size_y=86.0, size_z=0, category=plate_holder)"
+       "PlateHolder(name=my_plate_carrier-0, location=Coordinate(004.000, 008.500, 086.150), size_x=127.0, size_y=86.0, size_z=0, category=plate_holder)"
       ]
      },
      "execution_count": 5,
@@ -118,7 +118,7 @@
     {
      "data": {
       "text/plain": [
-       "PlateHolder(name=carrier-my_plate_carrier-spot-0, location=(004.000, 008.500, 086.150), size_x=127.0, size_y=86.0, size_z=0, category=plate_holder)"
+       "PlateHolder(name=my_plate_carrier-0, location=Coordinate(004.000, 008.500, 086.150), size_x=127.0, size_y=86.0, size_z=0, category=plate_holder)"
       ]
      },
      "execution_count": 6,
@@ -145,7 +145,7 @@
     {
      "data": {
       "text/plain": [
-       "Plate(name=my_plate, size_x=127.76, size_y=85.48, size_z=14.2, location=(000.000, 000.000, -03.030))"
+       "Plate(name=my_plate, size_x=127.76, size_y=85.48, size_z=14.2, location=Coordinate(000.000, 000.000, -03.030))"
       ]
      },
      "execution_count": 7,
@@ -202,6 +202,7 @@
       "Resource deck was assigned to the liquid handler.\n",
       "Resource trash was assigned to the liquid handler.\n",
       "Resource trash_core96 was assigned to the liquid handler.\n",
+      "Resource teaching_carrier was assigned to the liquid handler.\n",
       "Resource my_plate_carrier was assigned to the liquid handler.\n"
      ]
     }
@@ -223,7 +224,10 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Moving Move(resource=Plate(name=my_plate, size_x=127.76, size_y=85.48, size_z=14.2, location=(000.000, 000.000, -03.030)), destination=PlateHolder(name=carrier-my_plate_carrier-spot-2, location=(004.000, 200.500, 086.150), size_x=127.0, size_y=86.0, size_z=0, category=plate_holder), intermediate_locations=[], resource_offset=Coordinate(x=0, y=0, z=0), destination_offset=Coordinate(x=0, y=0, z=0), pickup_distance_from_top=0, get_direction=<GripDirection.FRONT: 1>, put_direction=<GripDirection.FRONT: 1>).\n"
+      "Picking up resource: ResourcePickup(resource=Plate(name=my_plate, size_x=127.76, size_y=85.48, size_z=14.2, location=Coordinate(000.000, 000.000, -03.030)), offset=Coordinate(x=0, y=0, z=0), pickup_distance_from_top=0, direction=<GripDirection.FRONT: 1>)\n",
+      "Dropping resource: ResourceDrop(resource=Plate(name=my_plate, size_x=127.76, size_y=85.48, size_z=14.2, location=Coordinate(000.000, 000.000, -03.030)), destination=Coordinate(x=104.0, y=263.5, z=183.12), destination_absolute_rotation=Rotation(x=0, y=0, z=0), offset=Coordinate(x=0, y=0, z=0), pickup_distance_from_top=0, pickup_direction=<GripDirection.FRONT: 1>, drop_direction=<GripDirection.FRONT: 1>, rotation=0)\n",
+      "Resource my_plate was unassigned from the liquid handler.\n",
+      "Resource my_plate was assigned to the liquid handler.\n"
      ]
     }
    ],
@@ -269,7 +273,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.0"
+   "version": "3.10.15"
   }
  },
  "nbformat": 4,

pylabrobot/liquid_handling/liquid_handler.py

@@ -1906,14 +1906,11 @@ async def move_resource(
     resource: Resource,
     to: Union[ResourceStack, ResourceHolder, Resource, Coordinate],
     intermediate_locations: Optional[List[Coordinate]] = None,
-    resource_offset: Optional[Coordinate] = None,
     pickup_offset: Coordinate = Coordinate.zero(),
     destination_offset: Coordinate = Coordinate.zero(),
     pickup_distance_from_top: float = 0,
     pickup_direction: GripDirection = GripDirection.FRONT,
     drop_direction: GripDirection = GripDirection.FRONT,
-    get_direction: Optional[GripDirection] = None,
-    put_direction: Optional[GripDirection] = None,
     **backend_kwargs,
   ):
     """Move a resource to a new location.
@@ -1936,17 +1933,6 @@ async def move_resource(
       drop_direction: The direction from which to put down the resource.
     """
 
-    # TODO: move conditional statements from move_plate into move_resource to enable
-    # movement to other types besides Coordinate
-
-    # https://github.com/PyLabRobot/pylabrobot/issues/329
-    if resource_offset is not None:
-      raise NotImplementedError("resource_offset is deprecated, use pickup_offset instead")
-    if get_direction is not None:
-      raise NotImplementedError("get_direction is deprecated, use pickup_direction instead")
-    if put_direction is not None:
-      raise NotImplementedError("put_direction is deprecated, use drop_direction instead")
-
     extra = self._check_args(
       self.backend.pick_up_resource,
       backend_kwargs,
@@ -1986,13 +1972,10 @@ async def move_lid(
     lid: Lid,
     to: Union[Plate, ResourceStack, Coordinate],
     intermediate_locations: Optional[List[Coordinate]] = None,
-    resource_offset: Optional[Coordinate] = None,
     pickup_offset: Coordinate = Coordinate.zero(),
     destination_offset: Coordinate = Coordinate.zero(),
     pickup_direction: GripDirection = GripDirection.FRONT,
     drop_direction: GripDirection = GripDirection.FRONT,
-    get_direction: Optional[GripDirection] = None,
-    put_direction: Optional[GripDirection] = None,
     pickup_distance_from_top: float = 5.7 - 3.33,
     **backend_kwargs,
   ):
@@ -2020,14 +2003,6 @@ async def move_lid(
       ValueError: If the lid is not assigned to a resource.
     """
 
-    # https://github.com/PyLabRobot/pylabrobot/issues/329
-    if resource_offset is not None:
-      raise NotImplementedError("resource_offset is deprecated, use pickup_offset instead")
-    if get_direction is not None:
-      raise NotImplementedError("get_direction is deprecated, use pickup_direction instead")
-    if put_direction is not None:
-      raise NotImplementedError("put_direction is deprecated, use drop_direction instead")
-
     await self.move_resource(
       lid,
       to=to,
@@ -2045,13 +2020,10 @@ async def move_plate(
     plate: Plate,
     to: Union[ResourceStack, ResourceHolder, Resource, Coordinate],
     intermediate_locations: Optional[List[Coordinate]] = None,
-    resource_offset: Optional[Coordinate] = None,
     pickup_offset: Coordinate = Coordinate.zero(),
     destination_offset: Coordinate = Coordinate.zero(),
     drop_direction: GripDirection = GripDirection.FRONT,
     pickup_direction: GripDirection = GripDirection.FRONT,
-    get_direction: Optional[GripDirection] = None,
-    put_direction: Optional[GripDirection] = None,
     pickup_distance_from_top: float = 13.2 - 3.33,
     **backend_kwargs,
   ):
@@ -2087,14 +2059,6 @@ async def move_plate(
       destination_offset: The offset from the location's origin, optional (rarely necessary).
     """
 
-    # https://github.com/PyLabRobot/pylabrobot/issues/329
-    if resource_offset is not None:
-      raise NotImplementedError("resource_offset is deprecated, use pickup_offset instead")
-    if get_direction is not None:
-      raise NotImplementedError("get_direction is deprecated, use pickup_direction instead")
-    if put_direction is not None:
-      raise NotImplementedError("put_direction is deprecated, use drop_direction instead")
-
     await self.move_resource(
       plate,
       to=to,