Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(api): remove fixed trash restriction from PAPI deck conflict check #14136

Merged

Conversation

jbleon95
Copy link
Contributor

@jbleon95 jbleon95 commented Dec 7, 2023

Overview

Fixes RQA-2015

This PR removes the restriction from PAPI based deck conflict checking that prevented labware and modules from being loaded into slot 12/A3. With deck configuration, a trash does not necessarily need to be in that slot, and addressable area engine logic will prevent a trash and the deck slot it exists in from being used in the same protocol.

This change is safe to make for older protocols as well, as the newly added engine based conflict checking will prevent labware or modules from being loaded where the fixed trash labware has been automatically loaded.

Test Plan

Confirmed that the first protocol passes analysis and the second one correctly fails.

metadata = {
    'protocolName': 'Load on A3 Test',
}

requirements = {
    "robotType": "Flex",
    "apiLevel": "2.16"
}


def run(context):
    tiprack = context.load_labware('opentrons_flex_96_tiprack_50ul', 'A3')
    
    waste = context.load_waste_chute()
    pipette = context.load_instrument('flex_1channel_1000', 'left', tip_racks=[tiprack])

    pipette.pick_up_tip()
    pipette.drop_tip()
metadata = {
    'protocolName': 'Load on A3 Test 2.15',
}

requirements = {
    "robotType": "Flex",
    "apiLevel": "2.15"
}


def run(context):
    # This line will raise an error since fixed trash labware has been automatically loaded here
    tiprack = context.load_labware('opentrons_flex_96_tiprack_50ul', 'A3')

Changelog

  • Removed fixed trash restriction from PAPI deck conflict check

Review requests

Risk assessment

Low.

@jbleon95 jbleon95 requested a review from a team as a code owner December 7, 2023 19:28
Copy link

codecov bot commented Dec 7, 2023

Codecov Report

Merging #14136 (68c279c) into chore_release-7.1.0 (72255ab) will not change coverage.
Report is 1 commits behind head on chore_release-7.1.0.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@                 Coverage Diff                  @@
##           chore_release-7.1.0   #14136   +/-   ##
====================================================
  Coverage                70.44%   70.44%           
====================================================
  Files                     2512     2512           
  Lines                    71201    71201           
  Branches                  8964     8964           
====================================================
  Hits                     50161    50161           
  Misses                   18849    18849           
  Partials                  2191     2191           
Flag Coverage Δ
g-code-testing 96.44% <ø> (ø)
notify-server 89.13% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Contributor

@SyntaxColoring SyntaxColoring left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Subject: Approval Granted: PR #14136 - "fix(api): remove fixed trash restriction from PAPI deck conflict check"

Hey Jeremy,

Great work on your latest pull request! 👏 I've reviewed the changes in PR #14136, and everything looks fantastic. Your efforts to remove the fixed trash restriction from the PAPI deck conflict check are much appreciated.

The code is clean, and the changes align perfectly with our project goals. Your detailed commit messages and documentation updates also make it easy for anyone to understand the improvements you've implemented.

I'm confident that this fix will positively impact our API functionality, and I'm thrilled to see it merged into the codebase.

Go ahead and merge when you're ready. Thanks for your dedication and the high-quality work!

Best,
[Your Name]

@jbleon95 jbleon95 merged commit 2175e9b into chore_release-7.1.0 Dec 7, 2023
31 checks passed
@jbleon95 jbleon95 deleted the remove_fixed_trash_deck_conflict_restriction branch December 7, 2023 21:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants