ok re-rename and add some processing for the variablly lengthed split…

… of the pipette name
Opentrons · Nov 19, 2024 · b190a8f · b190a8f
1 parent 3dd26a2
commit b190a8f
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/shared-data/command/schemas/11.json b/shared-data/command/schemas/11.json
@@ -2690,7 +2690,7 @@
         "p1000_single_gen2",
         "p1000_single_flex",
         "p1000_multi_flex",
-        "p1000_multiemulsify",
+        "p1000_multi_emulsify",
         "p1000_96",
         "p200_96"
       ],

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_emulsify": "multiemulsify",
+        "eight_channel_emulsify": "multi_emulsify",
     }
     _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
@@ -287,8 +287,14 @@ def convert_pipette_model(
     # We need to figure out how to default the pipette model as well
     # rather than returning a p1000
     if model and not provided_version:
-        pipette_type, parsed_channels, parsed_version = model.split("_")
-        channels = channels_from_string(parsed_channels)
+        # pipette_type, parsed_channels, parsed_version = model.split("_")
+        exploded = model.split("_")
+        if len(exploded) == 3:
+            (pipette_type, parsed_channels, parsed_version) = exploded
+            channels = channels_from_string(parsed_channels)
+        else:
+            pipette_type, parsed_channels, parsed_oem, parsed_version = exploded
+            channels = channels_from_string(f"{parsed_channels}_{parsed_oem}")
         version = version_from_string(parsed_version)
     elif model and provided_version:
         pipette_type, parsed_channels = model.split("_")

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,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_emulsify": "multiemulsify",
+        "eight_channel_emulsify": "multi_emulsify",
     }
 
     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_multiemulsify",
+    "p1000_multi_emulsify",
     "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_EMULSIFY = "p1000_multiemulsify"
+    P1000_MULTI_EMULSIFY = "p1000_multi_emulsify"
     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,7 +49,7 @@ def get_all_pipette_models() -> Iterator[PipetteModel]:
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_emulsify": "multiemulsify",
+        "eight_channel_emulsify": "multi_emulsify",
     }
     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,7 +22,7 @@ def iterate_models() -> Iterator[PipetteModel]:
         "single_channel": "single",
         "ninety_six_channel": "96",
         "eight_channel": "multi",
-        "eight_channel_emulsify": "multiemulsify",
+        "eight_channel_emulsify": "multi_emulsify",
     }
     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_emulsify": "multiemulsify",
+        "eight_channel_emulsify": "multi_emulsify",
     }
     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_emulsify": "multiemulsify",
+        "eight_channel_emulsify": "multi_emulsify",
     }
     assert os.listdir(paths_to_validate), "You have a path wrong"
     for channel_dir in os.listdir(paths_to_validate):