Update union type syntax to use | (UP038) (#399)

Author: ebrahimebrahim

src/openlifu/bf/apod_methods/maxangle.py

@@ -23,7 +23,7 @@ class MaxAngle(ApodizationMethod):
     """Angle units"""
 
     def __post_init__(self):
-        if not isinstance(self.max_angle, (int, float)):
+        if not isinstance(self.max_angle, int | float):
             raise TypeError(f"Max angle must be a number, got {type(self.max_angle).__name__}.")
         if self.max_angle < 0:
             raise ValueError(f"Max angle must be non-negative, got {self.max_angle}.")

src/openlifu/bf/apod_methods/piecewiselinear.py

@@ -26,11 +26,11 @@ class PiecewiseLinear(ApodizationMethod):
     """Angle units"""
 
     def __post_init__(self):
-        if not isinstance(self.zero_angle, (int, float)):
+        if not isinstance(self.zero_angle, int | float):
             raise TypeError(f"Zero angle must be a number, got {type(self.zero_angle).__name__}.")
         if self.zero_angle < 0:
             raise ValueError(f"Zero angle must be non-negative, got {self.zero_angle}.")
-        if not isinstance(self.rolloff_angle, (int, float)):
+        if not isinstance(self.rolloff_angle, int | float):
             raise TypeError(f"Rolloff angle must be a number, got {type(self.rolloff_angle).__name__}.")
         if self.rolloff_angle < 0:
             raise ValueError(f"Rolloff angle must be non-negative, got {self.rolloff_angle}.")

src/openlifu/bf/delay_methods/direct.py

@@ -19,7 +19,7 @@ class Direct(DelayMethod):
     """Speed of sound in the medium (m/s)"""
 
     def __post_init__(self):
-        if not isinstance(self.c0, (int, float)):
+        if not isinstance(self.c0, int | float):
             raise TypeError("Speed of sound must be a number")
         if self.c0 <= 0:
             raise ValueError("Speed of sound must be greater than 0")

src/openlifu/bf/focal_patterns/wheel.py

@@ -34,7 +34,7 @@ def __post_init__(self):
             raise TypeError(f"Center must be a boolean, got {type(self.center).__name__}.")
         if not isinstance(self.num_spokes, int) or self.num_spokes < 1:
             raise ValueError(f"Number of spokes must be a positive integer, got {self.num_spokes}.")
-        if not isinstance(self.spoke_radius, (int, float)) or self.spoke_radius <= 0:
+        if not isinstance(self.spoke_radius, int | float) or self.spoke_radius <= 0:
             raise ValueError(f"Spoke radius must be a positive number, got {self.spoke_radius}.")
         super().__post_init__()
 

src/openlifu/io/LIFUHVController.py

@@ -170,7 +170,7 @@ def echo(self, echo_data=None) -> tuple[bytes, int]:
                 raise ValueError("Console Device  not connected")
 
             # Check if echo_data is a byte array
-            if echo_data is not None and not isinstance(echo_data, (bytes, bytearray)):
+            if echo_data is not None and not isinstance(echo_data, bytes | bytearray):
                 raise TypeError("echo_data must be a byte array")
 
             r = self.uart.send_packet(

src/openlifu/io/LIFUTXDevice.py

@@ -298,7 +298,7 @@ def echo(self, echo_data = None) -> tuple[bytes, int]:
                 return None, None
 
             # Check if echo_data is a byte array
-            if echo_data is not None and not isinstance(echo_data, (bytes, bytearray)):
+            if echo_data is not None and not isinstance(echo_data, bytes | bytearray):
                 raise TypeError("echo_data must be a byte array")
 
             r = self.uart.send_packet(id=None, packetType=OW_CONTROLLER, command=OW_CMD_ECHO, data=echo_data)

src/openlifu/io/LIFUUart.py

@@ -445,7 +445,7 @@ def send_packet(self, id=None, packetType=OW_ACK, command=OW_CMD_NOP, addr=0, re
                 id = self.packet_count
 
             if data:
-                if not isinstance(data, (bytes, bytearray)):
+                if not isinstance(data, bytes | bytearray):
                     raise ValueError("Data must be bytes or bytearray")
                 payload = data
                 payload_length = len(payload)

src/openlifu/plan/param_constraint.py

@@ -34,9 +34,9 @@ def __post_init__(self):
             if self.error_value and (not isinstance(self.error_value, tuple) or len(self.error_value) != 2 or self.error_value[0] >= self.error_value[1]):
                 raise ValueError("Error value must be a sorted tuple of two numbers")
         elif self.operator in ['<', '<=', '>', '>=']:
-            if self.warning_value is not None and not isinstance(self.warning_value, (int, float)):
+            if self.warning_value is not None and not isinstance(self.warning_value, int | float):
                 raise ValueError("Warning value must be a single value")
-            if self.error_value is not None and not isinstance(self.error_value, (int, float)):
+            if self.error_value is not None and not isinstance(self.error_value, int | float):
                 raise ValueError("Error value must be a single value")
 
     @staticmethod

src/openlifu/plan/solution_analysis.py

@@ -269,18 +269,18 @@ def __post_init__(self):
             raise ValueError("Reference sound speed must be greater than 0")
         if self.ref_density <= 0:
             raise ValueError("Reference density must be greater than 0")
-        if not isinstance(self.mainlobe_aspect_ratio, (tuple, list)) or len(self.mainlobe_aspect_ratio) != 3:
+        if not isinstance(self.mainlobe_aspect_ratio, tuple | list) or len(self.mainlobe_aspect_ratio) != 3:
             raise TypeError("Mainlobe aspect ratio must be a tuple or list of three floats (lat, ele, ax)")
         self.mainlobe_aspect_ratio = tuple(self.mainlobe_aspect_ratio)  # Ensure it's a tuple
-        if not all(isinstance(x, (int, float)) for x in self.mainlobe_aspect_ratio):
+        if not all(isinstance(x, int | float) for x in self.mainlobe_aspect_ratio):
             raise TypeError("Mainlobe aspect ratio must contain only numbers")
-        if not isinstance(self.mainlobe_radius, (int, float)) or self.mainlobe_radius <= 0:
+        if not isinstance(self.mainlobe_radius, int | float) or self.mainlobe_radius <= 0:
             raise ValueError("Mainlobe radius must be a positive number")
-        if not isinstance(self.beamwidth_radius, (int, float)) or self.beamwidth_radius <= 0:
+        if not isinstance(self.beamwidth_radius, int | float) or self.beamwidth_radius <= 0:
             raise ValueError("Beamwidth radius must be a positive number")
-        if not isinstance(self.sidelobe_radius, (int, float)) or self.sidelobe_radius <= 0:
+        if not isinstance(self.sidelobe_radius, int | float) or self.sidelobe_radius <= 0:
             raise ValueError("Sidelobe radius must be a positive number")
-        if not isinstance(self.sidelobe_zmin, (int, float)) or self.sidelobe_zmin < 0:
+        if not isinstance(self.sidelobe_zmin, int | float) or self.sidelobe_zmin < 0:
             raise ValueError("Sidelobe minimum z must be a non-negative number")
         if not isinstance(self.distance_units, str):
             raise TypeError("Distance units must be a string")

src/openlifu/plan/target_constraints.py

@@ -45,9 +45,9 @@ def __post_init__(self):
             raise TypeError("Dimension units must be a string")
         if getunittype(self.units) != 'distance':
             raise ValueError(f"Units must be a length unit, got {self.units}")
-        if not isinstance(self.min, (int, float)):
+        if not isinstance(self.min, int | float):
             raise TypeError("Minimum value must be a number")
-        if not isinstance(self.max, (int, float)):
+        if not isinstance(self.max, int | float):
             raise TypeError("Maximum value must be a number")
         if self.min > self.max:
             raise ValueError("Minimum value cannot be greater than maximum value")