fixed double quotes issure for multi transfer

AD-SDL · Nov 25, 2024 · 01a9da3 · 01a9da3
1 parent ed81874
commit 01a9da3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/ot2_driver/protopiler/protopiler.py b/ot2_driver/protopiler/protopiler.py
@@ -153,7 +153,6 @@ def _postprocess_commands(self) -> None:  # Could use more testing
                     ):
                         orig_deck_location = orig_command.split(":")[0]
                         new_locations.append(f"{orig_deck_location}:{loc}")
-
                     command.source = new_locations
                 if ":[" in command.destination:
                     command.destination = self._unpack_alias(command.destination)
@@ -863,6 +862,7 @@ def _create_commands(self, payload: Optional[Dict]) -> List[str]:
                         src_wellplate_location = self._parse_wellplate_location(src)
                         # should handle things not formed like loc:well
                         src_well = new_src[0]
+                        src_well = src_well.strip('\"')
 
                         aspirate_command = aspirate_template.replace(
                             "#pipette#", f'pipettes["{pipette_mount}"]'
@@ -898,6 +898,7 @@ def _create_commands(self, payload: Optional[Dict]) -> List[str]:
                         dst_well = new_dst[
                             0
                         ]  # should handle things not formed like loc:well
+                        dst_well = dst_well.strip('\"')
                         dispense_command = dispense_template.replace(
                             "#pipette#", f'pipettes["{pipette_mount}"]'
                         )

diff --git a/ot2_driver/protopiler/test_configs/flex_test.yaml b/ot2_driver/protopiler/test_configs/flex_test.yaml
@@ -3,35 +3,37 @@ equipment:
     location: "2"
     alias: plate
     offset: [0, 1.7, 3.9]
-  - name: opentrons_flex_96_tiprack_50ul
+  - name: opentrons_flex_96_tiprack_200ul
     location: "11"
     offset: [0.5, 0.9, -0.3]
-  - name: flex_1channel_50
-    mount: left
-  # - name: flex_8channel_1000
-  #   mount: right
+  # - name: flex_1channel_50
+  #   mount: left
+  - name: flex_8channel_1000
+    mount: right
   - name: trash
     location: "4"
 
 commands:
-  - name: test
-    command: transfer
-    source: 2:A1
-    aspirate_clearance: 2
-    destination: 2:A4
-    dispense_clearance: 2
-    volume: [10, 10, 10]
-    mix_cycles: 0
-    mix_volume: 0
-    drop_tip: [false, false, true]
-
   # - name: test
-  #   command: multi_transfer
-  #   multi_source: 1:[[A1, B1, C1], [A2, B2, C2], [A3, B3, C3]]
-  #   multi_aspirate_clearance: 1
-  #   multi_destination: 1:[[A4, B4, C4], [A5, B5, C5], [A6, B6, C6]]
-  #   multi_dispense_clearance: 1
-  #   multi_volume: 10
+  #   command: transfer
+  #   source: 2:[A1, A2, A3]
+  #   aspirate_clearance: 2
+  #   destination: 2:[A4, A5, A6]
+  #   dispense_clearance: 2
+  #   volume: [10, 10, 10]
+  #   mix_cycles: 0
+  #   mix_volume: 0
+  #   drop_tip: [false, false, true]
+
+  - name: test
+    command: multi_transfer
+    multi_source: 2:[[A1, B1, C1], [A2, B2, C2], [A3, B3, C3]]
+    # multi_source: 2:[["A1", "B1", "C1"], ["A2", "B2", "C2"], ["A3", "B3", "C3"]]
+    multi_aspirate_clearance: 1
+    multi_destination: 2:[[A4, B4, C4], [A5, B5, C5], [A6, B6, C6]]
+    # multi_destination: 2:[["A4", "B4", "C4"], ["A5", "B5", "C5"], ["A6", "B6", "C6"]]
+    multi_dispense_clearance: 1
+    multi_volume: 200
 
 metadata:
   protocolName: Flex test