Global search and replace.

Opentrons · Sep 11, 2023 · a59fa7e · a59fa7e
1 parent d1e04b2
commit a59fa7e
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 35 deletions.
diff --git a/api-client/src/pipettes/__fixtures__/index.ts b/api-client/src/pipettes/__fixtures__/index.ts
@@ -256,7 +256,7 @@ export const pipetteSettingsResponseFixture = {
 export const pipetteDataLeftFixture = {
   data: { channels: 1, min_volume: 1, max_volume: 50 },
   instrumentModel: 'p1000_single_v3.0',
-  instrumentName: 'p1000_single_gen3',
+  instrumentName: 'flex_1channel_1000',
   instrumentType: 'pipette',
   mount: 'left',
   serialNumber: 'abc',
@@ -267,7 +267,7 @@ export const pipetteDataLeftFixture = {
 export const pipetteResponseRightFixture = {
   data: { channels: 1, min_volume: 1, max_volume: 50 },
   instrumentModel: 'p1000_single_v3.0',
-  instrumentName: 'p1000_single_gen3',
+  instrumentName: 'flex_1channel_1000',
   instrumentType: 'pipette',
   mount: 'right',
   serialNumber: 'cba',

diff --git a/api/tests/opentrons/hardware_control/test_instruments.py b/api/tests/opentrons/hardware_control/test_instruments.py
@@ -45,7 +45,7 @@ def dummy_instruments_attached_ot3():
         types.Mount.LEFT: {
             "model": "p1000_single_v3.3",
             "id": "testy",
-            "name": "p1000_single_gen3",
+            "name": "flex_1channel_1000",
         },
         types.Mount.RIGHT: {"model": None, "id": None, "name": None},
         OT3Mount.GRIPPER: None,
@@ -680,12 +680,12 @@ async def test_reset_instruments(monkeypatch, sim_and_instr):
         types.Mount.LEFT: {
             "model": "p1000_single_v3.3",
             "id": "testy",
-            "name": "p1000_single_gen3",
+            "name": "flex_1channel_1000",
         },
         types.Mount.RIGHT: {
             "model": "p1000_single_v3.3",
             "id": "testy",
-            "name": "p1000_single_gen3",
+            "name": "flex_1channel_1000",
         },
     }
     sim_builder, _ = sim_and_instr

diff --git a/api/tests/opentrons/protocol_api_old/test_context.py b/api/tests/opentrons/protocol_api_old/test_context.py
@@ -447,7 +447,7 @@ def test_instrument_trash_ot3(ctx, get_labware_def):
     ctx.home()
 
     mount = Mount.LEFT
-    instr = ctx.load_instrument("p1000_single_gen3", mount)
+    instr = ctx.load_instrument("flex_1channel_1000", mount)
 
     assert instr.trash_container.name == "opentrons_1_trash_3200ml_fixed"
 

diff --git a/...es/protocols/py/OT3_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment.py b/...es/protocols/py/OT3_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment.py
@@ -81,8 +81,8 @@ def run(protocol: protocol_api.ProtocolContext):
     EPM = reagent_plate.wells_by_name()["A7"]
 
     # pipette
-    p1000 = protocol.load_instrument("p1000_multi_gen3", "left", tip_racks=[tiprack_200_1, tiprack_200_2])
-    p50 = protocol.load_instrument("p50_multi_gen3", "right", tip_racks=[tiprack_20])
+    p1000 = protocol.load_instrument("flex_8channel_1000", "left", tip_racks=[tiprack_200_1, tiprack_200_2])
+    p50 = protocol.load_instrument("flex_8channel_50", "right", tip_racks=[tiprack_20])
 
     # tip and sample tracking
     sample_well = "A3"

diff --git a/...protocols/py/OT3_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4.py b/...protocols/py/OT3_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4.py
@@ -105,9 +105,9 @@ def run(protocol: protocol_api.ProtocolContext):
 
     # pipette
     p1000 = protocol.load_instrument(
-        "p1000_multi_gen3", "left", tip_racks=[tiprack_200_1, tiprack_200_2, tiprack_200_3]
+        "flex_8channel_1000", "left", tip_racks=[tiprack_200_1, tiprack_200_2, tiprack_200_3]
     )
-    p50 = protocol.load_instrument("p50_multi_gen3", "right", tip_racks=[tiprack_50_1, tiprack_50_2])
+    p50 = protocol.load_instrument("flex_8channel_50", "right", tip_racks=[tiprack_50_1, tiprack_50_2])
 
     # tip and sample tracking
     if COLUMNS == 1:

diff --git a/...iles/protocols/py/OT3_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x.py b/...iles/protocols/py/OT3_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x.py
@@ -70,8 +70,8 @@ def run(protocol: protocol_api.ProtocolContext):
     Barcodes3 = reagent_plate.wells_by_name()["A9"]
 
     # pipette
-    p1000 = protocol.load_instrument("p1000_multi_gen3", "right", tip_racks=[tiprack_200_1, tiprack_200_2])
-    p50 = protocol.load_instrument("p50_multi_gen3", "left", tip_racks=[tiprack_20])
+    p1000 = protocol.load_instrument("flex_8channel_1000", "right", tip_racks=[tiprack_200_1, tiprack_200_2])
+    p50 = protocol.load_instrument("flex_8channel_50", "left", tip_racks=[tiprack_20])
 
     # tip and sample tracking
     if COLUMNS == 3:

diff --git a/app-testing/files/protocols/py/OT3_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right.py b/app-testing/files/protocols/py/OT3_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right.py
@@ -55,7 +55,7 @@ def run(protocol: protocol_api.ProtocolContext):
 
     # pipette
     p1000 = protocol.load_instrument(
-        "p1000_single_gen3",
+        "flex_1channel_1000",
         "right",
         tip_racks=[tiprack_200_1, tiprack_200_2, tiprack_200_3, tiprack_200_4, tiprack_200_5, tiprack_200_6],
     )

diff --git a/.../protocols/py/OT3_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III.py b/.../protocols/py/OT3_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III.py
@@ -61,7 +61,7 @@ def run(protocol: protocol_api.ProtocolContext):
 
     # pipette
     if USE_8xMULTI == "YES":
-        p1000 = protocol.load_instrument("p1000_multi_gen3", "right")
+        p1000 = protocol.load_instrument("flex_1channel_1000", "right")
     else:
         p1000 = protocol.load_instrument("p1000_96", "left")
 

diff --git a/...esting/files/protocols/py/OT3_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2.py b/...esting/files/protocols/py/OT3_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2.py
@@ -96,8 +96,8 @@ def run(protocol: protocol_api.ProtocolContext):
     DIL = reservoir["A5"]
 
     # pipette
-    p50 = protocol.load_instrument("p50_multi_gen3", "left", tip_racks=[tiprack_50_1, tiprack_50_2])
-    p1000 = protocol.load_instrument("p1000_multi_gen3", "right", tip_racks=[tiprack_200_1])
+    p50 = protocol.load_instrument("flex_8channel_50", "left", tip_racks=[tiprack_50_1, tiprack_50_2])
+    p1000 = protocol.load_instrument("flex_8channel_1000", "right", tip_racks=[tiprack_200_1])
 
     # samples
     src_file_path = inspect.getfile(lambda: None)

diff --git a/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_1000ul_tip.py b/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_1000ul_tip.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p1000_multi_gen3", "left")
+    pipette = ctx.load_instrument("flex_8channel_1000", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(10, vial["A1"].top())

diff --git a/...re-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_1000ul_tip_increment.py b/...re-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_1000ul_tip_increment.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p1000_multi_gen3", "left")
+    pipette = ctx.load_instrument("flex_8channel_1000", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(10, vial["A1"].top())

diff --git a/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_200ul_tip.py b/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_200ul_tip.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p1000_multi_gen3", "left")
+    pipette = ctx.load_instrument("flex_8channel_1000", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(10, vial["A1"].top())

diff --git a/...are-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_200ul_tip_increment.py b/...are-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_200ul_tip_increment.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p1000_multi_gen3", "left")
+    pipette = ctx.load_instrument("flex_8channel_1000", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(10, vial["A1"].top())

diff --git a/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_50ul_tip.py b/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_50ul_tip.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p1000_multi_gen3", "left")
+    pipette = ctx.load_instrument("flex_8channel_1000", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(10, vial["A1"].top())

diff --git a/...ware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_50ul_tip_increment.py b/...ware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_multi_50ul_tip_increment.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p1000_multi_gen3", "left")
+    pipette = ctx.load_instrument("flex_8channel_1000", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(10, vial["A1"].top())

diff --git a/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_single.py b/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p1000_single.py
@@ -21,7 +21,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p1000_single_gen3", "left")
+    pipette = ctx.load_instrument("flex_1channel_1000", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(10, vial["A1"].top())

diff --git a/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p50_multi_50ul_tip.py b/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p50_multi_50ul_tip.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p50_multi_gen3", "left")
+    pipette = ctx.load_instrument("flex_8channel_50", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(pipette.min_volume, vial["A1"].top())

diff --git a/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p50_multi_50ul_tip_increment.py b/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p50_multi_50ul_tip_increment.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p50_multi_gen3", "left")
+    pipette = ctx.load_instrument("flex_8channel_50", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(pipette.min_volume, vial["A1"].top())

diff --git a/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p50_single.py b/hardware-testing/hardware_testing/protocols/gravimetric_ot3_p50_single.py
@@ -19,7 +19,7 @@ def run(ctx: ProtocolContext) -> None:
         for slot in slots
     ]
     vial = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
-    pipette = ctx.load_instrument("p50_single_gen3", "left")
+    pipette = ctx.load_instrument("flex_1channel_50", "left")
     for rack in tipracks:
         pipette.pick_up_tip(rack["A1"])
         pipette.aspirate(10, vial["A1"].top())

diff --git a/hardware-testing/tests/hardware_testing/liquid/test_heights.py b/hardware-testing/tests/hardware_testing/liquid/test_heights.py
@@ -182,8 +182,12 @@ def test_before_and_after_heights() -> None:
     #       the Corning plate assumes a perfect cylinder without a lookup table
     tiprack, trough, plate, _ = _load_labware(ctx)
     # load a pipette
-    single = ctx.load_instrument("p1000_single_gen3", mount="left", tip_racks=[tiprack])
-    multi = ctx.load_instrument("p1000_multi_gen3", mount="right", tip_racks=[tiprack])
+    single = ctx.load_instrument(
+        "flex_1channel_1000", mount="left", tip_racks=[tiprack]
+    )
+    multi = ctx.load_instrument(
+        "flex_8channel_1000", mount="right", tip_racks=[tiprack]
+    )
     # initialize liquid tracker
     tracker = LiquidTracker()
     initialize_liquid_from_deck(ctx, tracker)
@@ -250,8 +254,12 @@ def test_update_affected_wells() -> None:
     #       the Corning plate assumes a perfect cylinder without a lookup table
     tiprack, trough, plate, _ = _load_labware(ctx)
     # load a pipette
-    single = ctx.load_instrument("p1000_single_gen3", mount="left", tip_racks=[tiprack])
-    multi = ctx.load_instrument("p1000_multi_gen3", mount="right", tip_racks=[tiprack])
+    single = ctx.load_instrument(
+        "flex_1channel_1000", mount="left", tip_racks=[tiprack]
+    )
+    multi = ctx.load_instrument(
+        "flex_8channel_1000", mount="right", tip_racks=[tiprack]
+    )
     # initialize liquid tracker
     tracker = LiquidTracker()
     initialize_liquid_from_deck(ctx, tracker)

diff --git a/...ol-designer/src/components/modals/CreateFileWizard/__tests__/ModulesAndOtherTile.test.tsx b/...ol-designer/src/components/modals/CreateFileWizard/__tests__/ModulesAndOtherTile.test.tsx
@@ -48,7 +48,7 @@ const mockWizardTileProps: Partial<WizardTileProps> = {
       robotType: FLEX_ROBOT_TYPE,
     },
     pipettesByMount: {
-      left: { pipetteName: 'p1000_single_gen3', tiprackDefURI: 'mocktip' },
+      left: { pipetteName: 'flex_1channel_1000', tiprackDefURI: 'mocktip' },
       right: { pipetteName: null, tiprackDefURI: null },
     } as FormPipettesByMount,
     modulesByType: {

diff --git a/robot-server/simulators/test-flex.json b/robot-server/simulators/test-flex.json
@@ -6,15 +6,15 @@
       "model": "p1000_single_3.4",
       "id": "321",
       "max_volume": 1000,
-      "name": "p1000_single_gen3",
+      "name": "flex_1channel_1000",
       "tip_length": 0,
       "channels": 1
     },
     "left": {
       "model": "p50_single_3.4",
       "id": "123",
       "max_volume": 50,
-      "name": "p50_single_gen3",
+      "name": "flex_1channel_50",
       "tip_length": 0,
       "channels": 1
     }

diff --git a/robot-server/tests/integration/protocols/flex_basic_transfer_standalone.py b/robot-server/tests/integration/protocols/flex_basic_transfer_standalone.py
@@ -16,8 +16,9 @@ def run(protocol: ProtocolContext) -> None:
     tiprack_1 = protocol.load_labware("opentrons_flex_96_tiprack_50ul", "D2")
     p50 = protocol.load_instrument("flex_1channel_50", "right", tip_racks=[tiprack_1])
 
-    # TODO (spp, 2023-07-13): replace 'p1000_single_gen3' with the newer name once '.._gen3' is discontinued
-    p1000 = protocol.load_instrument("p1000_single_gen3", "left", tip_racks=[tiprack_1])
+    p1000 = protocol.load_instrument(
+        "flex_1channel_1000", "left", tip_racks=[tiprack_1]
+    )
 
     p50.pick_up_tip()
     p50.aspirate(40, plate["A1"])