fix(abr-testing): unify all script compatibility with same ip file (#…

…16922) # Overview Ensures data collection scripts can all use the same IPs.json file when connecting to robots --------- Co-authored-by: rclarke0 <[email protected]>
Opentrons · Nov 21, 2024 · da74897 · da74897
1 parent ead4491
commit da74897
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/abr-testing/abr_testing/data_collection/abr_calibration_logs.py b/abr-testing/abr_testing/data_collection/abr_calibration_logs.py
@@ -286,6 +286,7 @@ def run(
     ip_json_file = os.path.join(storage_directory, "IPs.json")
     try:
         ip_file = json.load(open(ip_json_file))
+        robot_dict = ip_file.get("ip_address_list")
     except FileNotFoundError:
         print(f"Add .json file with robot IPs to: {storage_directory}.")
         sys.exit()
@@ -294,7 +295,7 @@ def run(
         ip_or_all = input("IP Address or ALL: ")
         calibration_data = []
         if ip_or_all.upper() == "ALL":
-            ip_address_list = ip_file["ip_address_list"]
+            ip_address_list = list(robot_dict.keys())
             for ip in ip_address_list:
                 saved_file_path, calibration = read_robot_logs.get_calibration_offsets(
                     ip, storage_directory

diff --git a/abr-testing/abr_testing/data_collection/get_run_logs.py b/abr-testing/abr_testing/data_collection/get_run_logs.py
@@ -104,10 +104,11 @@ def get_all_run_logs(
     ip_json_file = os.path.join(storage_directory, "IPs.json")
     try:
         ip_file = json.load(open(ip_json_file))
+        robot_dict = ip_file.get("ip_address_list")
     except FileNotFoundError:
         print(f"Add .json file with robot IPs to: {storage_directory}.")
         sys.exit()
-    ip_address_list = ip_file["ip_address_list"]
+    ip_address_list = list(robot_dict.keys())
     runs_from_storage = read_robot_logs.get_run_ids_from_google_drive(google_drive)
     for ip in ip_address_list:
         runs = get_run_ids_from_robot(ip)

diff --git a/hardware-testing/hardware_testing/scripts/ABRAsairScript.py b/hardware-testing/hardware_testing/scripts/ABRAsairScript.py
@@ -2,6 +2,7 @@
 import sys
 import paramiko as pmk
 import time
+import json
 import multiprocessing
 from typing import Optional, List, Any
 
@@ -69,11 +70,10 @@ def run(file_name: str) -> List[Any]:
     robot_ips = []
     robot_names = []
     with open(file_name) as file:
-        for line in file.readlines():
-            info = line.split(",")
-            if "Y" in info[2]:
-                robot_ips.append(info[0])
-                robot_names.append(info[1])
+        file_dict = json.load(file)
+        robot_dict = file_dict.get("ip_address_list")
+        robot_ips = list(robot_dict.keys())
+        robot_names = list(robot_dict.values())
     print("Executing Script on All Robots:")
     # Launch the processes for each robot.
     processes = []
@@ -89,10 +89,8 @@ def run(file_name: str) -> List[Any]:
     # Wait for all processes to finish.
     file_name = sys.argv[1]
     processes = run(file_name)
-
     for process in processes:
         process.start()
         time.sleep(20)
-
     for process in processes:
         process.join()