From dd74001d0fa53e67a5cb13a3329e0ca1f48a6102 Mon Sep 17 00:00:00 2001 From: Ryan howard Date: Tue, 19 Nov 2024 14:39:54 -0500 Subject: [PATCH] rename peek to emulsify --- .../p1000/3_0.json | 2 +- .../p1000/3_0.json | 2 +- .../p1000/placeholder.gltf | 0 .../p1000/default/3_0.json | 0 .../python/opentrons_shared_data/pipette/load_data.py | 2 +- .../pipette/pipette_load_name_conversions.py | 2 -- .../pipette/scripts/update_configuration_files.py | 2 +- shared-data/python/opentrons_shared_data/pipette/types.py | 4 ++-- .../python/tests/pipette/test_max_flow_rates_per_volume.py | 2 +- shared-data/python/tests/pipette/test_validate_schema.py | 6 +++--- 10 files changed, 10 insertions(+), 12 deletions(-) rename shared-data/pipette/definitions/2/general/{eight_channel_peek => eight_channel_emulsify}/p1000/3_0.json (99%) rename shared-data/pipette/definitions/2/geometry/{eight_channel_peek => eight_channel_emulsify}/p1000/3_0.json (93%) rename shared-data/pipette/definitions/2/geometry/{eight_channel_peek => eight_channel_emulsify}/p1000/placeholder.gltf (100%) rename shared-data/pipette/definitions/2/liquid/{eight_channel_peek => eight_channel_emulsify}/p1000/default/3_0.json (100%) diff --git a/shared-data/pipette/definitions/2/general/eight_channel_peek/p1000/3_0.json b/shared-data/pipette/definitions/2/general/eight_channel_emulsify/p1000/3_0.json similarity index 99% rename from shared-data/pipette/definitions/2/general/eight_channel_peek/p1000/3_0.json rename to shared-data/pipette/definitions/2/general/eight_channel_emulsify/p1000/3_0.json index 18065c94675..30891455fcb 100644 --- a/shared-data/pipette/definitions/2/general/eight_channel_peek/p1000/3_0.json +++ b/shared-data/pipette/definitions/2/general/eight_channel_emulsify/p1000/3_0.json @@ -1,6 +1,6 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json", - "displayName": "FLEX 8-Channel PEEK 1000 μL", + "displayName": "FLEX 8-Channel Emulsifying 1000 μL", "model": "p1000", "displayCategory": "FLEX", "validNozzleMaps": { diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel_peek/p1000/3_0.json b/shared-data/pipette/definitions/2/geometry/eight_channel_emulsify/p1000/3_0.json similarity index 93% rename from shared-data/pipette/definitions/2/geometry/eight_channel_peek/p1000/3_0.json rename to shared-data/pipette/definitions/2/geometry/eight_channel_emulsify/p1000/3_0.json index 67a62d9e121..d464cd5b9fe 100644 --- a/shared-data/pipette/definitions/2/geometry/eight_channel_peek/p1000/3_0.json +++ b/shared-data/pipette/definitions/2/geometry/eight_channel_emulsify/p1000/3_0.json @@ -1,6 +1,6 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json", - "pathTo3D": "pipette/definitions/2/geometry/eight_channel_peek/p1000/placeholder.gltf", + "pathTo3D": "pipette/definitions/2/geometry/eight_channel_emulsify/p1000/placeholder.gltf", "nozzleOffset": [-8.0, -16.0, -259.15], "pipetteBoundingBoxOffsets": { "backLeftCorner": [-38.5, 0.0, -259.15], diff --git a/shared-data/pipette/definitions/2/geometry/eight_channel_peek/p1000/placeholder.gltf b/shared-data/pipette/definitions/2/geometry/eight_channel_emulsify/p1000/placeholder.gltf similarity index 100% rename from shared-data/pipette/definitions/2/geometry/eight_channel_peek/p1000/placeholder.gltf rename to shared-data/pipette/definitions/2/geometry/eight_channel_emulsify/p1000/placeholder.gltf diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel_peek/p1000/default/3_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel_emulsify/p1000/default/3_0.json similarity index 100% rename from shared-data/pipette/definitions/2/liquid/eight_channel_peek/p1000/default/3_0.json rename to shared-data/pipette/definitions/2/liquid/eight_channel_emulsify/p1000/default/3_0.json diff --git a/shared-data/python/opentrons_shared_data/pipette/load_data.py b/shared-data/python/opentrons_shared_data/pipette/load_data.py index d501f52c83a..41bb8924d37 100644 --- a/shared-data/python/opentrons_shared_data/pipette/load_data.py +++ b/shared-data/python/opentrons_shared_data/pipette/load_data.py @@ -120,7 +120,7 @@ def load_serial_lookup_table() -> Dict[str, str]: "single_channel": "single", "ninety_six_channel": "96", "eight_channel": "multi", - "eight_channel_peek": "multipeek", + "eight_channel_peek": "multiemulsify", } _model_shorthand = {"p1000": "p1k", "p300": "p3h"} for channel_dir in _dirs_in(config_path): diff --git a/shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py b/shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py index 8d05ce2b09c..bf585e782bf 100644 --- a/shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py +++ b/shared-data/python/opentrons_shared_data/pipette/pipette_load_name_conversions.py @@ -126,7 +126,6 @@ def get_major_version_from_pipette_name( "flex" in pipette_name_tuple or "gen3" in pipette_name_tuple or "96" in pipette_name_tuple - or "peek" in pipette_name_tuple ): return 3 elif "gen2" in pipette_name_tuple: @@ -200,7 +199,6 @@ def generation_from_string(pipette_name_list: List[str]) -> PipetteGenerationTyp or "3." in pipette_name_list[-1] or pipette_name_list == ["p1000", "96"] or pipette_name_list == ["p200", "96"] - or "peek" in pipette_name_list ): return PipetteGenerationType.FLEX elif "gen2" in pipette_name_list or "2." in pipette_name_list[-1]: diff --git a/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py b/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py index ffc2cedfc50..01942c3c103 100644 --- a/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py +++ b/shared-data/python/opentrons_shared_data/pipette/scripts/update_configuration_files.py @@ -355,7 +355,7 @@ def _update_all_models(configuration_to_update: List[str]) -> None: "single_channel": "single", "ninety_six_channel": "96", "eight_channel": "multi", - "eight_channel_peek": "multipeek", + "eight_channel_peek": "multiemulsify", } for channel_dir in os.listdir(paths_to_validate): diff --git a/shared-data/python/opentrons_shared_data/pipette/types.py b/shared-data/python/opentrons_shared_data/pipette/types.py index 55f126ff238..f3b8b867a0d 100644 --- a/shared-data/python/opentrons_shared_data/pipette/types.py +++ b/shared-data/python/opentrons_shared_data/pipette/types.py @@ -216,7 +216,7 @@ def dict_for_encode(self) -> bool: "p1000_single_gen2", "p1000_single_flex", "p1000_multi_flex", - "p1000_multipeek", + "p1000_multiemulsify", "p1000_96", "p200_96", ] @@ -243,7 +243,7 @@ class PipetteNameType(str, enum.Enum): P1000_SINGLE_GEN2 = "p1000_single_gen2" P1000_SINGLE_FLEX = "p1000_single_flex" P1000_MULTI_FLEX = "p1000_multi_flex" - P1000_MULTI_PEEK = "p1000_multipeek" + P1000_MULTI_EMULSIFY = "p1000_multiemulsify" P1000_96 = "p1000_96" P200_96 = "p200_96" diff --git a/shared-data/python/tests/pipette/test_max_flow_rates_per_volume.py b/shared-data/python/tests/pipette/test_max_flow_rates_per_volume.py index 16ac62747b0..5557236a9af 100644 --- a/shared-data/python/tests/pipette/test_max_flow_rates_per_volume.py +++ b/shared-data/python/tests/pipette/test_max_flow_rates_per_volume.py @@ -49,7 +49,7 @@ def get_all_pipette_models() -> Iterator[PipetteModel]: "single_channel": "single", "ninety_six_channel": "96", "eight_channel": "multi", - "eight_channel_peek": "multipeek", + "eight_channel_peek": "multiemulsify", } assert os.listdir(paths_to_validate), "You have a path wrong" for channel_dir in os.listdir(paths_to_validate): diff --git a/shared-data/python/tests/pipette/test_validate_schema.py b/shared-data/python/tests/pipette/test_validate_schema.py index b334837cac7..27ff8ef056b 100644 --- a/shared-data/python/tests/pipette/test_validate_schema.py +++ b/shared-data/python/tests/pipette/test_validate_schema.py @@ -22,7 +22,7 @@ def iterate_models() -> Iterator[PipetteModel]: "single_channel": "single", "ninety_six_channel": "96", "eight_channel": "multi", - "eight_channel_peek": "multipeek", + "eight_channel_peek": "multiemulsify", } defn_root = get_shared_data_root() / "pipette" / "definitions" / "2" / "liquid" assert os.listdir(defn_root), "A path is wrong" @@ -64,7 +64,7 @@ def test_pick_up_configs_configuration_by_nozzle_map_keys() -> None: "single_channel": "single", "ninety_six_channel": "96", "eight_channel": "multi", - "eight_channel_peek": "multipeek", + "eight_channel_peek": "multiemulsify", } assert os.listdir(paths_to_validate), "You have a path wrong" for channel_dir in os.listdir(paths_to_validate): @@ -107,7 +107,7 @@ def test_pick_up_configs_configuration_ordered_from_smallest_to_largest() -> Non "single_channel": "single", "ninety_six_channel": "96", "eight_channel": "multi", - "eight_channel_peek": "multipeek", + "eight_channel_peek": "multiemulsify", } assert os.listdir(paths_to_validate), "You have a path wrong" for channel_dir in os.listdir(paths_to_validate):