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

feat(shared-data): Add support for PEEK pipettes (#17036) #17160

Merged
merged 3 commits into from
Dec 20, 2024
Merged

feat(shared-data): Add support for PEEK pipettes (#17036) #17160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe0fc7d
feat(shared-data): Add support for PEEK pipettes (#17036)
ryanthecoder Dec 5, 2024
27b24e2
fixup cherry-pick
ryanthecoder Dec 20, 2024
b9a698c
update command schema
ryanthecoder Dec 20, 2024
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
1 change: 1 addition & 0 deletions api/src/opentrons/hardware_control/backends/ot3controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,7 @@ def _build_attached_pip(
converted_name.pipette_type,
converted_name.pipette_channels,
converted_name.pipette_version,
converted_name.oem_type,
),
"id": OT3Controller._combine_serial_number(attached),
}
Expand Down
3 changes: 3 additions & 0 deletions api/src/opentrons/hardware_control/backends/ot3simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ def _attached_pipette_to_mount(
converted_name.pipette_type,
converted_name.pipette_channels,
converted_name.pipette_version,
converted_name.oem_type,
),
"id": None,
}
Expand All @@ -533,6 +534,7 @@ def _attached_pipette_to_mount(
converted_name.pipette_type,
converted_name.pipette_channels,
converted_name.pipette_version,
converted_name.oem_type,
),
"id": init_instr["id"],
}
Expand All @@ -544,6 +546,7 @@ def _attached_pipette_to_mount(
converted_name.pipette_type,
converted_name.pipette_channels,
converted_name.pipette_version,
converted_name.oem_type,
),
"id": None,
}
Expand Down
7 changes: 6 additions & 1 deletion api/src/opentrons/hardware_control/instruments/ot2/pipette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
UlPerMmAction,
PipetteName,
PipetteModel,
PipetteOEMType,
)
from opentrons.hardware_control.dev_types import InstrumentHardwareConfigs

Expand Down Expand Up @@ -112,17 +113,20 @@ def __init__(
pipette_type=config.pipette_type,
pipette_channels=config.channels,
pipette_generation=config.display_category,
oem_type=PipetteOEMType.OT,
)
self._acting_as = self._pipette_name
self._pipette_model = PipetteModelVersionType(
pipette_type=config.pipette_type,
pipette_channels=config.channels,
pipette_version=config.version,
oem_type=PipetteOEMType.OT,
)
self._valid_nozzle_maps = load_pipette_data.load_valid_nozzle_maps(
self._pipette_model.pipette_type,
self._pipette_model.pipette_channels,
self._pipette_model.pipette_version,
PipetteOEMType.OT,
)
self._nozzle_offset = self._config.nozzle_offset
self._nozzle_manager = (
Expand Down Expand Up @@ -189,7 +193,7 @@ def act_as(self, name: PipetteNameType) -> None:
], f"{self.name} is not back-compatible with {name}"

liquid_model = load_pipette_data.load_liquid_model(
name.pipette_type, name.pipette_channels, name.get_version()
name.pipette_type, name.pipette_channels, name.get_version(), name.oem_type
)
# TODO need to grab name config here to deal with act as test
self._liquid_class.max_volume = liquid_model["default"].max_volume
Expand Down Expand Up @@ -280,6 +284,7 @@ def reload_configurations(self) -> None:
self._pipette_model.pipette_type,
self._pipette_model.pipette_channels,
self._pipette_model.pipette_version,
self._pipette_model.oem_type,
)
self._config_as_dict = self._config.model_dump()

Expand Down
6 changes: 6 additions & 0 deletions api/src/opentrons/hardware_control/instruments/ot3/pipette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
PipetteName,
PipetteModel,
Quirks,
PipetteOEMType,
)
from opentrons_shared_data.pipette import (
load_data as load_pipette_data,
Expand Down Expand Up @@ -93,22 +94,26 @@ def __init__(
self._liquid_class_name = pip_types.LiquidClasses.default
self._liquid_class = self._config.liquid_properties[self._liquid_class_name]

oem = PipetteOEMType.get_oem_from_quirks(config.quirks)
# TODO (lc 12-05-2022) figure out how we can safely deprecate "name" and "model"
self._pipette_name = PipetteNameType(
pipette_type=config.pipette_type,
pipette_channels=config.channels,
pipette_generation=config.display_category,
oem_type=oem,
)
self._acting_as = self._pipette_name
self._pipette_model = PipetteModelVersionType(
pipette_type=config.pipette_type,
pipette_channels=config.channels,
pipette_version=config.version,
oem_type=oem,
)
self._valid_nozzle_maps = load_pipette_data.load_valid_nozzle_maps(
self._pipette_model.pipette_type,
self._pipette_model.pipette_channels,
self._pipette_model.pipette_version,
self._pipette_model.oem_type,
)
self._nozzle_offset = self._config.nozzle_offset
self._nozzle_manager = (
Expand Down Expand Up @@ -250,6 +255,7 @@ def reload_configurations(self) -> None:
self._pipette_model.pipette_type,
self._pipette_model.pipette_channels,
self._pipette_model.pipette_version,
self._pipette_model.oem_type,
)
self._config_as_dict = self._config.model_dump()

Expand Down
1 change: 1 addition & 0 deletions api/src/opentrons/protocol_api/validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"flex_8channel_50": PipetteNameType.P50_MULTI_FLEX,
"flex_1channel_1000": PipetteNameType.P1000_SINGLE_FLEX,
"flex_8channel_1000": PipetteNameType.P1000_MULTI_FLEX,
"flex_8channel_1000_em": PipetteNameType.P1000_MULTI_EM,
"flex_96channel_1000": PipetteNameType.P1000_96,
"flex_96channel_200": PipetteNameType.P200_96,
}
Expand Down
5 changes: 5 additions & 0 deletions api/src/opentrons/protocol_engine/resources/pipette_data_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ def configure_virtual_pipette_nozzle_layout(
config.pipette_type,
config.channels,
config.version,
pip_types.PipetteOEMType.OT,
)
new_nozzle_manager = NozzleConfigurationManager.build_from_config(
config, valid_nozzle_maps
Expand Down Expand Up @@ -130,6 +131,7 @@ def configure_virtual_pipette_for_volume(
pipette_model.pipette_type,
pipette_model.pipette_channels,
pipette_model.pipette_version,
pipette_model.oem_type,
)

liquid_class = pipette_definition.liquid_class_for_volume_between_default_and_defaultlowvolume(
Expand Down Expand Up @@ -163,6 +165,7 @@ def _get_virtual_pipette_full_config_by_model_string(
pipette_model.pipette_type,
pipette_model.pipette_channels,
pipette_model.pipette_version,
pipette_model.oem_type,
)

def _get_virtual_pipette_static_config_by_model( # noqa: C901
Expand All @@ -179,6 +182,7 @@ def _get_virtual_pipette_static_config_by_model( # noqa: C901
pipette_model.pipette_type,
pipette_model.pipette_channels,
pipette_model.pipette_version,
pipette_model.oem_type,
)
try:
tip_type = pip_types.PipetteTipType(
Expand All @@ -195,6 +199,7 @@ def _get_virtual_pipette_static_config_by_model( # noqa: C901
pipette_model.pipette_type,
pipette_model.pipette_channels,
pipette_model.pipette_version,
pipette_model.oem_type,
)
if pipette_id not in self._nozzle_manager_layout_by_id:
nozzle_manager = NozzleConfigurationManager.build_from_config(
Expand Down
46 changes: 37 additions & 9 deletions api/tests/opentrons/hardware_control/instruments/test_nozzle_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
PipetteModelType,
PipetteChannelType,
PipetteVersionType,
PipetteOEMType,
)
from opentrons_shared_data.pipette.pipette_definition import (
PipetteConfigurations,
Expand Down Expand Up @@ -261,7 +262,10 @@ def test_single_pipettes_always_full(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.SINGLE_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.SINGLE_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config, ValidNozzleMaps(maps=A1)
Expand Down Expand Up @@ -289,7 +293,10 @@ def test_single_pipette_map_entries(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.SINGLE_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.SINGLE_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config, ValidNozzleMaps(maps=A1)
Expand Down Expand Up @@ -326,7 +333,10 @@ def test_single_pipette_map_geometry(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.SINGLE_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.SINGLE_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config, ValidNozzleMaps(maps=A1)
Expand Down Expand Up @@ -359,7 +369,10 @@ def test_multi_config_identification(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.EIGHT_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.EIGHT_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config,
Expand Down Expand Up @@ -419,7 +432,10 @@ def test_multi_config_map_entries(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.EIGHT_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.EIGHT_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config,
Expand Down Expand Up @@ -485,7 +501,10 @@ def test_multi_config_geometry(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.EIGHT_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.EIGHT_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config,
Expand Down Expand Up @@ -536,7 +555,10 @@ def test_96_config_identification(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.NINETY_SIX_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.NINETY_SIX_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config,
Expand Down Expand Up @@ -651,7 +673,10 @@ def test_96_config_map_entries(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.NINETY_SIX_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.NINETY_SIX_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config,
Expand Down Expand Up @@ -988,7 +1013,10 @@ def test_96_config_geometry(
pipette_details: Tuple[PipetteModelType, PipetteVersionType],
) -> None:
config = load_definition(
pipette_details[0], PipetteChannelType.NINETY_SIX_CHANNEL, pipette_details[1]
pipette_details[0],
PipetteChannelType.NINETY_SIX_CHANNEL,
pipette_details[1],
PipetteOEMType.OT,
)
subject = nozzle_manager.NozzleConfigurationManager.build_from_config(
config,
Expand Down
Loading
Loading