Skip to content

feat(step-generation): more compact Python generation for dicts #18592

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

Merged
ddcc4 merged 4 commits into from
Jun 13, 2025
Merged

feat(step-generation): more compact Python generation for dicts #18592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
508349a
More compact dict formatting
ddcc4 Jun 10, 2025
1a59311
Merge branch 'chore_release-pd-8.5.0' into 'dc-pdpy-format-dict'
ddcc4 Jun 13, 2025
cf4c7ce
Fix args
ddcc4 Jun 13, 2025
76434e0
Lint
ddcc4 Jun 13, 2025
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
248 changes: 94 additions & 154 deletions app/src/organisms/ODD/QuickTransferFlow/__tests__/utils/quickTransferStepCommands.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,93 +208,63 @@ pipette.transfer_with_liquid_class(
trash_location=mock_trash_bin_1,
liquid_class=protocol.define_liquid_class(
name="transfer_step_1",
properties={
"p1000_single_flex": {"fixture/fixture_flex_96_tiprack_1000ul/1": {
"aspirate": {
"aspirate_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
properties={"p1000_single_flex": {"fixture/fixture_flex_96_tiprack_1000ul/1": {
"aspirate": {
"aspirate_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"flow_rate_by_volume": [(0, 56)],
"pre_wet": False,
"correction_by_volume": [(0, 0)],
"delay": {"enabled": False},
"mix": {"enabled": False},
"submerge": {
"delay": {"enabled": False},
"start_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"flow_rate_by_volume": [(0, 56)],
"pre_wet": False,
"correction_by_volume": [(0, 0)],
},
"retract": {
"air_gap_by_volume": [(0, 0)],
"delay": {"enabled": False},
"mix": {"enabled": False},
"submerge": {
"delay": {"enabled": False},
"start_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
"position_reference": "well-bottom",
},
},
"retract": {
"air_gap_by_volume": [(0, 0)],
"delay": {"enabled": False},
"end_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
"position_reference": "well-bottom",
},
"touch_tip": {"enabled": False},
"end_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"touch_tip": {"enabled": False},
},
"dispense": {
"dispense_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
},
"dispense": {
"dispense_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"push_out_by_volume": [(0, 0)],
"flow_rate_by_volume": [(0, 80)],
"correction_by_volume": [(0, 0)],
"delay": {"enabled": False},
"mix": {"enabled": False},
"submerge": {
"delay": {"enabled": False},
"start_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"push_out_by_volume": [(0, 0)],
"flow_rate_by_volume": [(0, 80)],
"correction_by_volume": [(0, 0)],
},
"retract": {
"air_gap_by_volume": [(0, 0)],
"delay": {"enabled": False},
"mix": {"enabled": False},
"submerge": {
"delay": {"enabled": False},
"start_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
"position_reference": "well-bottom",
},
},
"retract": {
"air_gap_by_volume": [(0, 0)],
"delay": {"enabled": False},
"end_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
"position_reference": "well-bottom",
},
"touch_tip": {"enabled": False},
"blowout": {
"enabled": True,
"location": "source",
"flow_rate": 50,
},
"end_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"touch_tip": {"enabled": False},
"blowout": {"enabled": True, "location": "source", "flow_rate": 50},
},
}},
},
},
}}},
),
)
`.trimStart()
Expand Down Expand Up @@ -390,93 +360,63 @@ pipette.consolidate_with_liquid_class(
trash_location=mock_trash_bin_1,
liquid_class=protocol.define_liquid_class(
name="consolidate_step_1",
properties={
"p1000_single_flex": {"fixture/fixture_flex_96_tiprack_1000ul/1": {
"aspirate": {
"aspirate_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
properties={"p1000_single_flex": {"fixture/fixture_flex_96_tiprack_1000ul/1": {
"aspirate": {
"aspirate_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"flow_rate_by_volume": [(0, 56)],
"pre_wet": False,
"correction_by_volume": [(0, 0)],
"delay": {"enabled": False},
"mix": {"enabled": False},
"submerge": {
"delay": {"enabled": False},
"start_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"flow_rate_by_volume": [(0, 56)],
"pre_wet": False,
"correction_by_volume": [(0, 0)],
},
"retract": {
"air_gap_by_volume": [(0, 0)],
"delay": {"enabled": False},
"mix": {"enabled": False},
"submerge": {
"delay": {"enabled": False},
"start_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
"position_reference": "well-bottom",
},
},
"retract": {
"air_gap_by_volume": [(0, 0)],
"delay": {"enabled": False},
"end_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
"position_reference": "well-bottom",
},
"touch_tip": {"enabled": False},
"end_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"touch_tip": {"enabled": False},
},
"dispense": {
"dispense_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
},
"dispense": {
"dispense_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"push_out_by_volume": [(0, 0)],
"flow_rate_by_volume": [(0, 80)],
"correction_by_volume": [(0, 0)],
"delay": {"enabled": False},
"mix": {"enabled": False},
"submerge": {
"delay": {"enabled": False},
"start_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"push_out_by_volume": [(0, 0)],
"flow_rate_by_volume": [(0, 80)],
"correction_by_volume": [(0, 0)],
},
"retract": {
"air_gap_by_volume": [(0, 0)],
"delay": {"enabled": False},
"mix": {"enabled": False},
"submerge": {
"delay": {"enabled": False},
"start_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
"position_reference": "well-bottom",
},
},
"retract": {
"air_gap_by_volume": [(0, 0)],
"delay": {"enabled": False},
"end_position": {
"offset": {
"x": 0,
"y": 0,
"z": 0,
},
"position_reference": "well-bottom",
},
"touch_tip": {"enabled": False},
"blowout": {
"enabled": True,
"location": "trash",
"flow_rate": 50,
},
"end_position": {
"offset": {"x": 0, "y": 0, "z": 0},
"position_reference": "well-bottom",
},
"touch_tip": {"enabled": False},
"blowout": {"enabled": True, "location": "trash", "flow_rate": 50},
},
}},
},
},
}}},
),
)
`.trimStart()
Expand Down
5 changes: 1 addition & 4 deletions protocol-designer/src/file-data/__tests__/createFile.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,7 @@ metadata = {
"source": "Protocol Designer",
}

requirements = {
"robotType": "OT-2",
"apiLevel": "2.24",
}
requirements = {"robotType": "OT-2", "apiLevel": "2.24"}

def run(protocol: protocol_api.ProtocolContext) -> None:
# Load Labware:
Expand Down
Loading
Loading