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.

Sign up for GitHub

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

Jump to bottom

refactor(api): Allow aspirate, dispense and blow-out in place in PE and PAPI #12105

Merged
merged 89 commits into from
Feb 17, 2023
Merged

refactor(api): Allow aspirate, dispense and blow-out in place in PE and PAPI #12105

Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
0d7ee6a
raising error when using args that are deprecated and added to versio…
TamarZanzouri Jan 30, 2023
e4d70f4
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Jan 30, 2023
4c4fb2f
Update api/docs/v2/versioning.rst
TamarZanzouri Jan 30, 2023
6a2b20b
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Jan 30, 2023
4bc29d2
fixed docstrings and formatting
TamarZanzouri Jan 31, 2023
c5231a2
WIP started PE aspirate_in_place.py
TamarZanzouri Jan 31, 2023
964a5a9
added to pipetting aspirate_in_place
TamarZanzouri Feb 1, 2023
e963f9e
blow out in place pe command
TamarZanzouri Feb 1, 2023
a9f68c9
added sync client in-place
TamarZanzouri Feb 1, 2023
4fa3341
engine core asprirate in place
TamarZanzouri Feb 2, 2023
622b1f2
all engine core implementation. removed move_to_well arg
TamarZanzouri Feb 2, 2023
bb0736a
check if location is not the last location before move_to_coordinates
TamarZanzouri Feb 6, 2023
1501ca0
Merge branch 'edge' into RCORE-540-implement-in-place-commands
TamarZanzouri Feb 6, 2023
f7298ce
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 7, 2023
6879d11
Update api/src/opentrons/protocol_engine/commands/aspirate_in_place.py
TamarZanzouri Feb 7, 2023
70540d2
Update api/src/opentrons/protocol_engine/commands/blow_out_in_place.py
TamarZanzouri Feb 7, 2023
b2ffa4b
fixed move_to_well removal
TamarZanzouri Feb 7, 2023
e1c9c06
updated commands schema
TamarZanzouri Feb 7, 2023
1d2e505
linting js
TamarZanzouri Feb 7, 2023
80eecbd
fixed failing test in aspirate in place
TamarZanzouri Feb 7, 2023
ca8fcc9
fixed legacy simulator test failing
TamarZanzouri Feb 7, 2023
d252985
cnanged location to optional and added exception when not ready to as…
TamarZanzouri Feb 9, 2023
f4f7ea8
set last location
TamarZanzouri Feb 9, 2023
0f26c9d
Update api/src/opentrons/protocol_api/core/engine/instrument.py
TamarZanzouri Feb 9, 2023
7bc74cf
Update api/src/opentrons/protocol_api/core/engine/instrument.py
TamarZanzouri Feb 9, 2023
b98967d
Update api/src/opentrons/protocol_api/core/legacy_simulator/legacy_in…
TamarZanzouri Feb 9, 2023
949ca7e
Update api/src/opentrons/protocol_engine/execution/pipetting.py
TamarZanzouri Feb 9, 2023
c10ea27
Update api/tests/opentrons/protocol_engine/execution/test_pipetting_h…
TamarZanzouri Feb 9, 2023
94bbbe3
Update api/src/opentrons/protocol_engine/execution/pipetting.py
TamarZanzouri Feb 10, 2023
0c91bb7
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 10, 2023
c24f9f1
linting
TamarZanzouri Feb 9, 2023
502d464
Merge branch 'edge' into RCORE-540-implement-in-place-commands
TamarZanzouri Feb 10, 2023
e6d1c9e
moved aspirate_in_place logic into command impl, pr fixes
TamarZanzouri Feb 10, 2023
e3c5437
fixed failing tests
TamarZanzouri Feb 13, 2023
993469f
formatting
TamarZanzouri Feb 13, 2023
058c1ac
WIP refactor instrument_context.py
TamarZanzouri Feb 14, 2023
4221d68
reverted changs for the legacy core and added logic for PointTarget
TamarZanzouri Feb 14, 2023
bc0e584
fixed engine core
TamarZanzouri Feb 14, 2023
efc16cc
WIP dispense in public context. reverted optional location and revert…
TamarZanzouri Feb 14, 2023
dea7290
blow out and fixed validation method as_well
TamarZanzouri Feb 15, 2023
520b3a2
linting fixes
TamarZanzouri Feb 15, 2023
dedd7d8
merge conflicts
TamarZanzouri Feb 15, 2023
1fd6b66
Update api/src/opentrons/protocol_api/core/legacy/legacy_instrument_c…
TamarZanzouri Feb 15, 2023
ca44f97
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 15, 2023
f921902
Update api/src/opentrons/protocol_api/validation.py
TamarZanzouri Feb 15, 2023
f4f3dd1
Update api/src/opentrons/protocol_api/validation.py
TamarZanzouri Feb 15, 2023
c88e07d
merge conflicts and docstring
TamarZanzouri Feb 15, 2023
bd19514
Update api/src/opentrons/protocol_api/core/legacy_simulator/legacy_in…
TamarZanzouri Feb 16, 2023
ed3c8c0
Update api/src/opentrons/protocol_api/core/legacy_simulator/legacy_in…
TamarZanzouri Feb 16, 2023
d77b0ea
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 16, 2023
cc8c11f
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 16, 2023
479a859
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 16, 2023
accc27e
Update api/src/opentrons/protocol_api/validation.py
TamarZanzouri Feb 16, 2023
a6f3131
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 16, 2023
f4f234b
removed default arg for in_place. pr feedback
TamarZanzouri Feb 16, 2023
2c26a88
changed aspirate/dispense/blow_out to check against in_place. changed…
TamarZanzouri Feb 16, 2023
321d38b
added in_place to wellTarget
TamarZanzouri Feb 16, 2023
a59d08f
Update api/src/opentrons/protocol_api/core/engine/instrument.py
TamarZanzouri Feb 16, 2023
24ed944
Update api/src/opentrons/protocol_api/core/engine/instrument.py
TamarZanzouri Feb 16, 2023
6b518c4
Update api/src/opentrons/protocol_api/core/engine/instrument.py
TamarZanzouri Feb 16, 2023
1bfdaa0
Update api/src/opentrons/protocol_api/core/legacy_simulator/legacy_in…
TamarZanzouri Feb 16, 2023
aa57d8e
simulator dispense fix
TamarZanzouri Feb 16, 2023
2f877b9
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
c773f4b
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
a73c6c4
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
6cfd709
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
5ab87ce
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
5a692fd
Update api/tests/opentrons/protocol_api/test_validation.py
TamarZanzouri Feb 17, 2023
5443d9c
Update api/tests/opentrons/protocol_api/core/engine/test_instrument_c…
TamarZanzouri Feb 17, 2023
9020b30
Update api/tests/opentrons/protocol_api/core/engine/test_instrument_c…
TamarZanzouri Feb 17, 2023
bf33a18
Update api/tests/opentrons/protocol_api/test_validation.py
TamarZanzouri Feb 17, 2023
1d97ce3
Update api/tests/opentrons/protocol_api_old/core/simulator/test_instr…
TamarZanzouri Feb 17, 2023
4b5ac65
Update api/tests/opentrons/protocol_api/test_validation.py
TamarZanzouri Feb 17, 2023
4cafd32
Update api/tests/opentrons/protocol_api/core/engine/test_instrument_c…
TamarZanzouri Feb 17, 2023
dd97a14
Update api/tests/opentrons/protocol_api/core/engine/test_instrument_c…
TamarZanzouri Feb 17, 2023
e38b474
Update api/tests/opentrons/protocol_api/test_instrument_context.py
TamarZanzouri Feb 17, 2023
6c152fa
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
2601ded
Update api/src/opentrons/protocol_engine/commands/aspirate_in_place.py
TamarZanzouri Feb 17, 2023
51841b5
Update api/src/opentrons/protocol_engine/commands/blow_out_in_place.py
TamarZanzouri Feb 17, 2023
f720ee7
Update api/src/opentrons/protocol_api/validation.py
TamarZanzouri Feb 17, 2023
a7ad08a
Update api/src/opentrons/protocol_api/validation.py
TamarZanzouri Feb 17, 2023
2b7865b
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
51e0101
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
99f4bb1
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
a9a4ae1
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
6b42ec4
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
8a7d24b
Update api/src/opentrons/protocol_api/instrument_context.py
TamarZanzouri Feb 17, 2023
c2d62a0
pr fixes
TamarZanzouri Feb 17, 2023
16b6fba
pr fixes
TamarZanzouri Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update api/src/opentrons/protocol_api/core/engine/instrument.py
  • Loading branch information
@TamarZanzouri
TamarZanzouri committed Feb 9, 2023
commit 0f26c9dfd6910c17c63cc8f5dacd92a221456cca
2 changes: 1 addition & 1 deletion api/src/opentrons/protocol_api/core/engine/instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def aspirate(
pipette_id=self._pipette_id, volume=volume, flow_rate=flow_rate
)

elif location is not None:
elif location:
well_name = well_core.get_name()
labware_id = well_core.labware_id

Expand Down