change multi_peek to multipeek since we do string logic that splits o…

…n _ in a few places
Opentrons · Nov 19, 2024 · 1400574 · 1400574
1 parent a313e65
commit 1400574
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git 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": "multi_peek",
+        "eight_channel_peek": "multipeek",
     }
     _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
@@ -80,7 +80,7 @@ def channels_from_string(channels: str) -> PipetteChannelType:
     """
     if channels == "96":
         return PipetteChannelType.NINETY_SIX_CHANNEL
-    elif channels == "multi":
+    elif "multi" in channels:
         return PipetteChannelType.EIGHT_CHANNEL
     elif channels == "single":
         return PipetteChannelType.SINGLE_CHANNEL

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
@@ -355,6 +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",
     }
 
     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
@@ -216,7 +216,7 @@ def dict_for_encode(self) -> bool:
     "p1000_single_gen2",
     "p1000_single_flex",
     "p1000_multi_flex",
-    "p1000_multi_peek",
+    "p1000_multipeek",
     "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_multi_peek"
+    P1000_MULTI_PEEK = "p1000_multipeek"
     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
@@ -49,6 +49,7 @@ def get_all_pipette_models() -> Iterator[PipetteModel]:
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
+        "eight_channel_peek": "multipeek",
     }
     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
@@ -22,6 +22,7 @@ def iterate_models() -> Iterator[PipetteModel]:
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
+        "eight_channel_peek": "multipeek",
     }
     defn_root = get_shared_data_root() / "pipette" / "definitions" / "2" / "liquid"
     assert os.listdir(defn_root), "A path is wrong"
@@ -63,6 +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",
     }
     assert os.listdir(paths_to_validate), "You have a path wrong"
     for channel_dir in os.listdir(paths_to_validate):
@@ -105,6 +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",
     }
     assert os.listdir(paths_to_validate), "You have a path wrong"
     for channel_dir in os.listdir(paths_to_validate):