ruff format and auto fixes

Author: rerpha

installation_and_upgrade/calibration_files_updater.py

@@ -9,9 +9,10 @@
 import subprocess
 
 import git
+from epics import caget
 from six.moves import input
+
 from ibex_install_utils.file_utils import FileUtils
-from epics import caget
 
 FNULL = open(os.devnull, "w")
 
@@ -77,7 +78,12 @@ def get_instrument_hosts():
     """
     Returns: A collection of instrument host names
     """
-    return (inst["hostName"] for inst in json.loads(FileUtils.dehex_and_decompress(caget("CS:INSTLIST").tobytes().decode().rstrip('\x00'))))
+    return (
+        inst["hostName"]
+        for inst in json.loads(
+            FileUtils.dehex_and_decompress(caget("CS:INSTLIST").tobytes().decode().rstrip("\x00"))
+        )
+    )
 
 
 def update_instrument(host, username, password, logger, dry_run=False):

installation_and_upgrade/ibex_install_utils/ca_utils.py

@@ -1,13 +1,13 @@
 import json
 import zlib
 from ast import literal_eval
-from typing import Any
 from socket import gethostname
+from typing import Any
+
+from epics import caget, caput
 
 from ibex_install_utils.file_utils import FileUtils
 
-import epicscorelibs.path.pyepics
-from epics import caget, caput
 
 def crc8(value: str) -> str:
     """
@@ -44,6 +44,7 @@ def crc8(value: str) -> str:
 
     return "{0:02X}".format(crc)
 
+
 def dehex_and_decompress(value: bytes | str) -> str:
     """
     Dehex and decompress a string and return it
@@ -65,6 +66,7 @@ def dehex_decompress_and_dejson(value: str | bytes) -> Any:  # No known type
     """
     return json.loads(dehex_and_decompress(value))
 
+
 def _get_pv_prefix(instrument: str, is_instrument: bool) -> str:
     """
     Create the pv prefix based on instrument name and whether it is an
@@ -89,13 +91,11 @@ def _get_pv_prefix(instrument: str, is_instrument: bool) -> str:
         pv_prefix_prefix = "IN"
     else:
         pv_prefix_prefix = "TE"
-    return "{prefix}:{instrument}:".format(
-        prefix=pv_prefix_prefix, instrument=instrument_name
-    )
+    return "{prefix}:{instrument}:".format(prefix=pv_prefix_prefix, instrument=instrument_name)
 
 
 def get_machine_details_from_identifier(
-        machine_identifier: str | None = None
+    machine_identifier: str | None = None,
 ) -> tuple[str, str, str]:
     """
     Gets the details of a machine by looking it up in the instrument list first.
@@ -125,26 +125,26 @@ def get_machine_details_from_identifier(
     # that's been passed to this function if it is not found instrument_details will be None
     instrument_details = None
     try:
-        instrument_list = dehex_decompress_and_dejson(caget("CS:INSTLIST").tobytes().decode().rstrip('\x00'))
+        instrument_list = dehex_decompress_and_dejson(
+            caget("CS:INSTLIST").tobytes().decode().rstrip("\x00")
+        )
         instrument_details = next(
             (inst for inst in instrument_list if inst["pvPrefix"] == machine_identifier), None
         )
     except AttributeError:
-        print(
-            "Error getting instlist, \nContinuing execution..."
-        )
+        print("Error getting instlist, \nContinuing execution...")
 
     if instrument_details is not None:
         instrument = instrument_details["name"]
     else:
         instrument = machine_identifier.upper()
         for p in (
-                [instrument_pv_prefix, test_machine_pv_prefix]
-                + instrument_machine_prefixes
-                + test_machine_prefixes
+            [instrument_pv_prefix, test_machine_pv_prefix]
+            + instrument_machine_prefixes
+            + test_machine_prefixes
         ):
             if machine_identifier.startswith(p):
-                instrument = machine_identifier.upper()[len(p):].rstrip(":")
+                instrument = machine_identifier.upper()[len(p) :].rstrip(":")
                 break
 
     if instrument_details is not None:

installation_and_upgrade/ibex_install_utils/motor_params.py

@@ -2,8 +2,11 @@
 Script to extract information from motors to be consumed by the motion controls team. Exports data as CSV. To run,
 load the script into a genie_python console and run as a standard user script.
 """
+
 import csv
-from aioca import caget, CANothing
+
+from aioca import CANothing, caget
+
 from ibex_install_utils.ca_utils import get_machine_details_from_identifier
 
 VELOCITY_UNITS = "EGU per sec"
@@ -106,6 +109,7 @@
     TL: "_TL_SP",
 }
 
+
 async def get_params_and_save_to_file(file_reference, num_of_controllers=8):
     """
     Gets all the motor parameters and saves them to an open file reference as a csv.
@@ -125,8 +129,18 @@ async def get_params_and_save_to_file(file_reference, num_of_controllers=8):
     rows = []
 
     for axis_pv in list_of_axis_pvs:
-        hr_keys = [axis_pv] + [i for i in all_motor_params.keys()] + [i for i in galil_specific_params.keys()]
-        hr_values = await caget([axis_pv] + [axis_pv + i for i in all_motor_params.values()] + [axis_pv + i for i in galil_specific_params.values()], throw=False, timeout=0.1)
+        hr_keys = (
+            [axis_pv]
+            + [i for i in all_motor_params.keys()]
+            + [i for i in galil_specific_params.keys()]
+        )
+        hr_values = await caget(
+            [axis_pv]
+            + [axis_pv + i for i in all_motor_params.values()]
+            + [axis_pv + i for i in galil_specific_params.values()],
+            throw=False,
+            timeout=0.1,
+        )
 
         if all(isinstance(i, CANothing) for i in hr_values):
             # All PVs failed to connect so don't bother writing this axis