Merge branch 'edge' into chore_update-pydantic-v2

Integrate with the new mmFromEdge param in TouchTipParams.

Author: SyntaxColoring

.github/workflows/api-test-lint-deploy.yaml

@@ -73,8 +73,6 @@ jobs:
     strategy:
       matrix:
         os: ['windows-2022', 'ubuntu-22.04', 'macos-latest']
-        # TODO(mc, 2022-02-24): expand this matrix to 3.8 and 3.9,
-        # preferably in a nightly cronjob on edge or something
         python: ['3.10']
         with-ot-hardware: ['true', 'false']
         exclude:
@@ -128,6 +126,60 @@ jobs:
           files: ./api/coverage.xml
           flags: api
 
+  test-package:
+    name: 'installed package tests on ${{ matrix.os }}'
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        os: ['ubuntu-22.04', 'macos-latest', 'windows-2022']
+    runs-on: '${{ matrix.os }}'
+    steps:
+      - uses: 'actions/checkout@v4'
+      - name: 'Fix actions/checkout odd handling of tags'
+        if: startsWith(github.ref, 'refs/tags')
+        run: |
+          git fetch -f origin ${{ github.ref }}:${{ github.ref }}
+          git checkout ${{ github.ref }}
+      - uses: 'actions/setup-python@v4'
+        with:
+          python-version: '3.10'
+      - name: Set up package-testing
+        id: setup
+        if: ${{ matrix.os != 'windows-2022' }}
+        working-directory: package-testing
+        shell: bash
+        run: make setup
+      - name: Set up package-testing (Windows)
+        id: setup-windows
+        if: ${{ matrix.os == 'windows-2022' }}
+        working-directory: package-testing
+        shell: pwsh
+        run: make setup-windows
+      - name: Run the tests
+        if: ${{ matrix.os != 'windows-2022' }}
+        shell: bash
+        id: test
+        working-directory: package-testing
+        run: make test
+      - name: Run the tests (Windows)
+        shell: pwsh
+        id: test-windows
+        working-directory: package-testing
+        run: make test-windows
+      - name: Save the test results
+        if: ${{ always() && steps.setup.outcome == 'success' || steps.setup-windows.outcome == 'success' }}
+        id: results
+        uses: actions/upload-artifact@v4
+        with:
+          name: package-test-results-${{ matrix.os }}
+          path: package-testing/results
+      - name: Set job summary
+        if: ${{ always() }}
+        run: |
+          echo "## Opentrons Package Test Results ${{matrix.os}}" >> $GITHUB_STEP_SUMMARY
+          echo "### Test Outcome: Unixy ${{ steps.test.outcome }} Windows: ${{ steps.test-windows.outcome }}" >> $GITHUB_STEP_SUMMARY
+          echo "[Download the test results artifact](${{steps.results.outputs.artifact-url}})" >> $GITHUB_STEP_SUMMARY
+
   deploy:
     name: 'deploy opentrons package'
     needs: [test]

.gitignore

@@ -163,3 +163,5 @@ opentrons-robot-app.tar.gz
 mock_dir
 .npm-cache/
 .eslintcache
+
+package-testing/results

api/release-notes-internal.md

@@ -2,6 +2,10 @@ For more details about this release, please see the full [technical change log][
 
 [technical change log]: https://github.com/Opentrons/opentrons/releases
 
+## Internal Release 2.3.0-alpha.2
+
+This internal release, pulled from the `edge` branch, contains features being developed for 8.3.0. It's for internal testing only.
+
 ## Internal Release 2.3.0-alpha.1
 
 This internal release, pulled from the `edge` branch, contains features being developed for 8.3.0. It's for internal testing only.

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

@@ -9,7 +9,11 @@
 
 from opentrons.types import Point
 
-from ..errors import TouchTipDisabledError, LabwareIsTipRackError
+from ..errors import (
+    TouchTipDisabledError,
+    TouchTipIncompatibleArgumentsError,
+    LabwareIsTipRackError,
+)
 from ..types import DeckPoint
 from .command import (
     AbstractCommandImpl,
@@ -51,6 +55,13 @@ class TouchTipParams(PipetteIdMixin, WellLocationMixin):
         ),
     )
 
+    mmFromEdge: float | SkipJsonSchema[None] = Field(
+        None,
+        description="Offset away from the the well edge, in millimeters."
+        "Incompatible when a radius is included as a non 1.0 value.",
+        json_schema_extra=_remove_default,
+    )
+
     speed: float | SkipJsonSchema[None] = Field(
         None,
         description=(
@@ -96,6 +107,11 @@ async def execute(
         labware_id = params.labwareId
         well_name = params.wellName
 
+        if params.radius != 1.0 and params.mmFromEdge is not None:
+            raise TouchTipIncompatibleArgumentsError(
+                "Cannot use mmFromEdge with a radius that is not 1.0"
+            )
+
         if self._state_view.labware.get_has_quirk(labware_id, "touchTipDisabled"):
             raise TouchTipDisabledError(
                 f"Touch tip not allowed on labware {labware_id}"
@@ -119,11 +135,13 @@ async def execute(
             pipette_id, params.speed
         )
 
+        mm_from_edge = params.mmFromEdge if params.mmFromEdge is not None else 0
         touch_waypoints = self._state_view.motion.get_touch_tip_waypoints(
             pipette_id=pipette_id,
             labware_id=labware_id,
             well_name=well_name,
             radius=params.radius,
+            mm_from_edge=mm_from_edge,
             center_point=Point(
                 center_result.public.position.x,
                 center_result.public.position.y,

api/src/opentrons/protocol_engine/errors/__init__.py

@@ -24,6 +24,7 @@
     LabwareIsTipRackError,
     LabwareIsAdapterError,
     TouchTipDisabledError,
+    TouchTipIncompatibleArgumentsError,
     WellDoesNotExistError,
     PipetteNotLoadedError,
     ModuleNotLoadedError,
@@ -110,6 +111,7 @@
     "LabwareIsTipRackError",
     "LabwareIsAdapterError",
     "TouchTipDisabledError",
+    "TouchTipIncompatibleArgumentsError",
     "WellDoesNotExistError",
     "PipetteNotLoadedError",
     "ModuleNotLoadedError",

api/src/opentrons/protocol_engine/errors/exceptions.py

@@ -361,6 +361,19 @@ def __init__(
         super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)
 
 
+class TouchTipIncompatibleArgumentsError(ProtocolEngineError):
+    """Raised when touch tip is used with both a custom radius and a mmFromEdge argument."""
+
+    def __init__(
+        self,
+        message: Optional[str] = None,
+        details: Optional[Dict[str, Any]] = None,
+        wrapping: Optional[Sequence[EnumeratedError]] = None,
+    ) -> None:
+        """Build a TouchTipIncompatibleArgumentsError."""
+        super().__init__(ErrorCodes.GENERAL_ERROR, message, details, wrapping)
+
+
 class WellDoesNotExistError(ProtocolEngineError):
     """Raised when referencing a well that does not exist."""
 

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

@@ -53,15 +53,19 @@ def get_move_type_to_well(
 
 
 def get_edge_point_list(
-    center: Point, x_radius: float, y_radius: float, edge_path_type: EdgePathType
+    center: Point,
+    x_radius: float,
+    y_radius: float,
+    mm_from_edge: float,
+    edge_path_type: EdgePathType,
 ) -> List[Point]:
     """Get list of edge points dependent on edge path type."""
     edges = EdgeList(
-        right=center + Point(x=x_radius, y=0, z=0),
-        left=center + Point(x=-x_radius, y=0, z=0),
+        right=center + Point(x=x_radius - mm_from_edge, y=0, z=0),
+        left=center + Point(x=-x_radius + mm_from_edge, y=0, z=0),
         center=center,
-        forward=center + Point(x=0, y=y_radius, z=0),
-        back=center + Point(x=0, y=-y_radius, z=0),
+        forward=center + Point(x=0, y=y_radius - mm_from_edge, z=0),
+        back=center + Point(x=0, y=-y_radius + mm_from_edge, z=0),
     )
 
     if edge_path_type == EdgePathType.LEFT:

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

@@ -327,6 +327,7 @@ def get_touch_tip_waypoints(
         labware_id: str,
         well_name: str,
         center_point: Point,
+        mm_from_edge: float = 0,
         radius: float = 1.0,
     ) -> List[motion_planning.Waypoint]:
         """Get a list of touch points for a touch tip operation."""
@@ -346,7 +347,11 @@ def get_touch_tip_waypoints(
         )
 
         positions = _move_types.get_edge_point_list(
-            center_point, x_offset, y_offset, edge_path_type
+            center=center_point,
+            x_radius=x_offset,
+            y_radius=y_offset,
+            mm_from_edge=mm_from_edge,
+            edge_path_type=edge_path_type,
         )
         critical_point: Optional[CriticalPoint] = None
 

api/tests/opentrons/protocol_engine/commands/test_touch_tip.py

@@ -102,8 +102,99 @@ async def test_touch_tip_implementation(
             pipette_id="abc",
             labware_id="123",
             well_name="A3",
-            center_point=Point(x=1, y=2, z=3),
             radius=0.456,
+            mm_from_edge=0,
+            center_point=Point(x=1, y=2, z=3),
+        )
+    ).then_return(
+        [
+            Waypoint(
+                position=Point(x=11, y=22, z=33),
+                critical_point=CriticalPoint.XY_CENTER,
+            ),
+            Waypoint(
+                position=Point(x=44, y=55, z=66),
+                critical_point=CriticalPoint.XY_CENTER,
+            ),
+        ]
+    )
+
+    decoy.when(
+        await mock_gantry_mover.move_to(
+            pipette_id="abc",
+            waypoints=[
+                Waypoint(
+                    position=Point(x=11, y=22, z=33),
+                    critical_point=CriticalPoint.XY_CENTER,
+                ),
+                Waypoint(
+                    position=Point(x=44, y=55, z=66),
+                    critical_point=CriticalPoint.XY_CENTER,
+                ),
+            ],
+            speed=9001,
+        )
+    ).then_return(Point(x=4, y=5, z=6))
+
+    result = await subject.execute(params)
+
+    assert result == SuccessData(
+        public=TouchTipResult(position=DeckPoint(x=4, y=5, z=6)),
+        state_update=update_types.StateUpdate(
+            pipette_location=update_types.PipetteLocationUpdate(
+                pipette_id="abc",
+                new_location=update_types.Well(labware_id="123", well_name="A3"),
+                new_deck_point=DeckPoint(x=4, y=5, z=6),
+            )
+        ),
+    )
+
+
+async def test_touch_tip_implementation_with_mm_to_edge(
+    decoy: Decoy,
+    mock_state_view: StateView,
+    mock_movement_handler: MovementHandler,
+    mock_gantry_mover: GantryMover,
+    subject: TouchTipImplementation,
+) -> None:
+    """A TouchTip command should use mmFromEdge if provided."""
+    params = TouchTipParams(
+        pipetteId="abc",
+        labwareId="123",
+        wellName="A3",
+        wellLocation=WellLocation(offset=WellOffset(x=1, y=2, z=3)),
+        mmFromEdge=0.789,
+        speed=42.0,
+    )
+
+    decoy.when(
+        await mock_movement_handler.move_to_well(
+            pipette_id="abc",
+            labware_id="123",
+            well_name="A3",
+            well_location=WellLocation(offset=WellOffset(x=1, y=2, z=3)),
+            current_well=None,
+            force_direct=False,
+            minimum_z_height=None,
+            speed=None,
+            operation_volume=None,
+        )
+    ).then_return(Point(x=1, y=2, z=3))
+
+    decoy.when(
+        mock_state_view.pipettes.get_movement_speed(
+            pipette_id="abc", requested_speed=42.0
+        )
+    ).then_return(9001)
+
+    decoy.when(
+        mock_state_view.motion.get_touch_tip_waypoints(
+            pipette_id="abc",
+            labware_id="123",
+            well_name="A3",
+            radius=1.0,
+            mm_from_edge=0.789,
+            center_point=Point(x=1, y=2, z=3),
         )
     ).then_return(
         [
@@ -183,3 +274,20 @@ async def test_touch_tip_no_tip_racks(
 
     with pytest.raises(errors.LabwareIsTipRackError):
         await subject.execute(params)
+
+
+async def test_touch_tip_incompatible_arguments(
+    decoy: Decoy, mock_state_view: StateView, subject: TouchTipImplementation
+) -> None:
+    """It should disallow touch tip if radius and mmFromEdge is provided."""
+    params = TouchTipParams(
+        pipetteId="abc",
+        labwareId="123",
+        wellName="A3",
+        wellLocation=WellLocation(),
+        radius=1.23,
+        mmFromEdge=4.56,
+    )
+
+    with pytest.raises(errors.TouchTipIncompatibleArgumentsError):
+        await subject.execute(params)

api/tests/opentrons/protocol_engine/state/test_motion_view.py

@@ -928,6 +928,7 @@ def test_get_touch_tip_waypoints(
             x_radius=1.2,
             y_radius=3.4,
             edge_path_type=_move_types.EdgePathType.RIGHT,
+            mm_from_edge=0.456,
         )
     ).then_return([Point(x=11, y=22, z=33), Point(x=44, y=55, z=66)])
 
@@ -937,6 +938,7 @@ def test_get_touch_tip_waypoints(
         well_name="B2",
         center_point=center_point,
         radius=0.123,
+        mm_from_edge=0.456,
     )
 
     assert result == [