Fix some stragglers

Author: yaugenst-flex

tests/test_components/test_types.py

@@ -7,7 +7,7 @@
 import pytest
 
 from tidy3d.components.base import Tidy3dBaseModel
-from tidy3d.components.types import ArrayLike, Complex, Tuple, constrained_array
+from tidy3d.components.types import ArrayLike, Complex, constrained_array
 
 
 def _test_validate_array_like():
@@ -92,7 +92,7 @@ def test_hash():
     class MyClass(Tidy3dBaseModel):
         a: ArrayLike
         b: constrained_array(ndim=1)
-        c: Tuple[ArrayLike, ...]
+        c: tuple[ArrayLike, ...]
 
     c = MyClass(a=[1.0], b=[2.0, 1.0], c=([2.0, 1.0]))
     hash(c.json())

tidy3d/components/geometry/primitives.py

@@ -13,7 +13,7 @@
 from tidy3d.components.autograd import AutogradFieldMap, TracedSize1D
 from tidy3d.components.autograd.derivative_utils import DerivativeInfo
 from tidy3d.components.base import cached_property, skip_if_fields_missing
-from tidy3d.components.types import Axis, Bound, Coordinate, MatrixReal4x4, Shapely, Tuple
+from tidy3d.components.types import Axis, Bound, Coordinate, MatrixReal4x4, Shapely
 from tidy3d.constants import C_0, LARGE_NUMBER, MICROMETER
 from tidy3d.exceptions import SetupError, ValidationError
 from tidy3d.packaging import verify_packages_import
@@ -357,7 +357,7 @@ def _normal_2dmaterial(self) -> Axis:
             raise ValidationError("'Medium2D' requires the 'Cylinder' length to be zero.")
         return self.axis
 
-    def _update_from_bounds(self, bounds: Tuple[float, float], axis: Axis) -> Cylinder:
+    def _update_from_bounds(self, bounds: tuple[float, float], axis: Axis) -> Cylinder:
         """Returns an updated geometry which has been transformed to fit within ``bounds``
         along the ``axis`` direction."""
         if axis != self.axis:

tidy3d/components/validators.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Optional
+
 import numpy as np
 import pydantic.v1 as pydantic
 from autograd.tracer import isbox
@@ -14,7 +16,6 @@
 from .data.dataset import Dataset, FieldDataset
 from .geometry.base import Box
 from .mode_spec import ModeSpec
-from .types import Tuple
 
 """ Explanation of pydantic validators:
 
@@ -326,9 +327,9 @@ def _single_frequency_in_range(cls, val: FieldDataset, values: dict) -> FieldDat
 def _warn_potential_error(
     field_name: str,
     base_value: float,
-    val_change_range: Tuple[float, float],
-    allowed_real_range: Tuple[float, float],
-    allowed_imag_range: Tuple[float, float],
+    val_change_range: tuple[float, float],
+    allowed_real_range: tuple[float, float],
+    allowed_imag_range: tuple[float, float],
 ):
     """Basic validation that perturbations do not drive a parameter out of physical bounds."""
 
@@ -361,8 +362,8 @@ def _warn_potential_error(
 def validate_parameter_perturbation(
     field_name: str,
     base_field_name: str,
-    allowed_real_range: Tuple[Tuple[float, float], ...],
-    allowed_imag_range: Tuple[Tuple[float, float], ...] = None,
+    allowed_real_range: tuple[tuple[float, float], ...],
+    allowed_imag_range: Optional[tuple[tuple[float, float], ...]] = None,
     allowed_complex: bool = True,
 ):
     """Assert perturbations do not drive a parameter out of physical bounds."""