passing: monitor, packaging, parameter_perturbation, perturbation_medium, scene, sidewall

Author: yaugenst-flex

tests/test_components/test_medium.py

@@ -760,10 +760,8 @@ def test_nonlinear_medium():
     modulated = td.Medium(permittivity=2, modulation_spec=modulation_spec)
     with pytest.raises(pd.ValidationError):
         td.Medium2D(ss=medium, tt=medium)
-    # with pytest.raises(pd.ValidationError):
-    #     td.Medium2D(ss=modulated, tt=modulated)
-    td.Medium2D(ss=modulated, tt=modulated)
-    return
+    with pytest.raises(pd.ValidationError):
+        td.Medium2D(ss=modulated, tt=modulated)
 
     # some parameters must be real now, unless we use old implementation
     _ = td.TwoPhotonAbsorption(beta=1j, use_complex_fields=True)

tests/test_components/test_monitor.py

@@ -1,7 +1,7 @@
 """Tests monitors."""
 
 import numpy as np
-import pydantic.v1 as pydantic
+import pydantic as pd
 import pytest
 import tidy3d as td
 from tidy3d.exceptions import SetupError, ValidationError
@@ -10,7 +10,7 @@
 
 
 def test_stop_start():
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         td.FluxTimeMonitor(size=(1, 1, 0), name="f", start=2, stop=1)
 
 
@@ -57,13 +57,13 @@ def test_downsampled():
 
 
 def test_excluded_surfaces_flat():
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.FluxMonitor(size=(1, 1, 0), name="f", freqs=[1e12], exclude_surfaces=("x-",))
 
 
 def test_fld_mnt_freqs_none():
     """Test that validation errors if freqs=[None]."""
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         td.FieldMonitor(center=(0, 0, 0), size=(0, 0, 0), freqs=[None], name="test")
 
 
@@ -147,7 +147,7 @@ def test_fieldproj_surfaces():
 def test_fieldproj_surfaces_in_simulaiton():
     # test error if all projection surfaces are outside the simulation domain
     M = td.FieldProjectionAngleMonitor(size=(3, 3, 3), theta=[1], phi=[0], name="f", freqs=[2e12])
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.Simulation(
             size=(2, 2, 2),
             run_time=1e-12,
@@ -159,13 +159,13 @@ def test_fieldproj_surfaces_in_simulaiton():
     _ = td.Simulation(
         size=(2, 2, 2),
         run_time=1e-12,
-        monitors=[M],
+        monitors=(M,),
         grid_spec=td.GridSpec.uniform(0.1),
     )
 
     # error when the surfaces that are in are excluded
-    M = M.updated_copy(exclude_surfaces=["x-", "x+"])
-    with pytest.raises(pydantic.ValidationError):
+    M = M.updated_copy(exclude_surfaces=("x-", "x+"))
+    with pytest.raises(pd.ValidationError):
         _ = td.Simulation(
             size=(2, 2, 2),
             run_time=1e-12,
@@ -176,11 +176,11 @@ def test_fieldproj_surfaces_in_simulaiton():
 
 def test_fieldproj_kspace_range():
     # make sure ux, uy are in [-1, 1] for k-space projection monitors
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.FieldProjectionKSpaceMonitor(
             size=(2, 0, 2), ux=[0.1, 2], uy=[0], name="f", freqs=[2e12], proj_axis=1
         )
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.FieldProjectionKSpaceMonitor(
             size=(2, 0, 2), ux=[0.1, 0.2], uy=[1.1], name="f", freqs=[2e12], proj_axis=1
         )
@@ -209,12 +209,12 @@ def test_fieldproj_window():
     points = np.linspace(0, 10, 100)
     _ = M.window_function(points, window_size, window_minus, window_plus, 2)
     # do not allow a window size larger than 1
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.FieldProjectionAngleMonitor(
             size=(2, 0, 2), theta=[1, 2], phi=[0], name="f", freqs=[2e12], window_size=(0.2, 1.1)
         )
     # do not allow non-zero windows for volume monitors
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.FieldProjectionAngleMonitor(
             size=(2, 1, 2), theta=[1, 2], phi=[0], name="f", freqs=[2e12], window_size=(0.2, 0)
         )
@@ -239,7 +239,7 @@ def test_storage_sizes(proj_mnt):
 def test_monitor_freqs_empty():
     # errors when no frequencies supplied
 
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.FieldMonitor(
             size=(td.inf, td.inf, td.inf),
             freqs=[],
@@ -323,7 +323,7 @@ def test_diffraction_validators():
         y=td.Boundary.periodic(),
         z=td.Boundary.pml(),
     )
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.Simulation(
             size=(2, 2, 2),
             run_time=1e-12,
@@ -334,7 +334,7 @@ def test_diffraction_validators():
         )
 
     # ensure error if monitor isn't infinite in two directions
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(pd.ValidationError):
         _ = td.DiffractionMonitor(size=[td.inf, 4, 0], freqs=[1e12], name="de")
 
 
@@ -391,11 +391,11 @@ def test_monitor():
 def test_monitor_plane():
     # make sure flux, mode and diffraction monitors fail with non planar geometries
     for size in ((0, 0, 0), (1, 0, 0), (1, 1, 1)):
-        with pytest.raises(pydantic.ValidationError):
+        with pytest.raises(pd.ValidationError):
             td.ModeMonitor(size=size, freqs=FREQS, modes=[])
-        with pytest.raises(pydantic.ValidationError):
+        with pytest.raises(pd.ValidationError):
             td.ModeSolverMonitor(size=size, freqs=FREQS, modes=[])
-        with pytest.raises(pydantic.ValidationError):
+        with pytest.raises(pd.ValidationError):
             td.DiffractionMonitor(size=size, freqs=FREQS, name="de")
 
 

tests/test_components/test_parameter_perturbation.py

@@ -2,9 +2,9 @@
 
 import matplotlib.pyplot as plt
 import numpy as np
-import pydantic.v1 as pydantic
 import pytest
 import tidy3d as td
+from pydantic import ValidationError
 
 from ..utils import AssertLogLevel, cartesian_to_unstructured
 
@@ -38,14 +38,14 @@ def test_heat_perturbation():
     # test complex type detection
     assert not perturb.is_complex
 
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         perturb = td.LinearHeatPerturbation(
             coeff=0.01,
             temperature_ref=-300,
             temperature_range=(200, 400),
         )
 
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         perturb = td.LinearHeatPerturbation(
             coeff=0.01,
             temperature_ref=300,
@@ -134,7 +134,7 @@ def test_heat_perturbation():
         assert test_value_out == perturb_data.data[2]
 
     # test not allowed interpolation method
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         perturb = td.CustomHeatPerturbation(
             perturbation_values=perturb_data,
             interp_method="quadratic",
@@ -159,7 +159,7 @@ def test_charge_perturbation():
     # test complex type detection
     assert not perturb.is_complex
 
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         perturb = td.LinearChargePerturbation(
             electron_coeff=1e-21,
             electron_ref=0,
@@ -169,7 +169,7 @@ def test_charge_perturbation():
             hole_range=(0, 0.5e20),
         )
 
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         perturb = td.LinearChargePerturbation(
             electron_coeff=1e-21,
             electron_ref=0,
@@ -341,7 +341,7 @@ def test_sample(perturb):
         assert test_value_out == perturb_data[-1, -1].item()
 
     # test not allowed interpolation method
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         perturb = td.CustomChargePerturbation(
             perturbation_values=perturb_data,
             interp_method="quadratic",
@@ -668,9 +668,7 @@ def test_delta_model():
     coeffs_4 = np.array([7.4e-22, 1.245, 5.43e-20, 1.153, 7.25e-21, 0.991, 9.99e-18, 0.839])
 
     averaged_vals = (coeffs_3_5 + coeffs_4) / 2
-    interpolated_results = [
-        value.item() for _, value in delta_model._coeffs_at_ref_freq.data_vars.items()
-    ]
+    interpolated_results = [v.item() for v in delta_model._coeffs_at_ref_freq.data.flat]
     error = np.abs(np.mean(averaged_vals - np.array(interpolated_results)))
 
     assert error < 1e-16

tests/test_components/test_perturbation_medium.py

@@ -1,9 +1,9 @@
 """Tests mediums."""
 
 import numpy as np
-import pydantic.v1 as pydantic
 import pytest
 import tidy3d as td
+from pydantic import ValidationError
 
 from ..utils import AssertLogLevel, cartesian_to_unstructured
 
@@ -103,7 +103,7 @@ def test_perturbation_medium(unstructured):
         assert cmed.allow_gain == pmed.allow_gain
 
         # permittivity < 1
-        with pytest.raises(pydantic.ValidationError):
+        with pytest.raises(ValidationError):
             _ = pmed.perturbed_copy(1.1 * temperature)
 
     # conductivity validators
@@ -133,19 +133,19 @@ def test_perturbation_medium(unstructured):
     for pmed in [pmed_direct, pmed_perm, pmed_index]:
         cmed = pmed.perturbed_copy(0.9 * temperature)  # positive conductivity
         assert not cmed.subpixel
-        with pytest.raises(pydantic.ValidationError):
+        with pytest.raises(ValidationError):
             _ = pmed.perturbed_copy(1.1 * temperature)  # negative conductivity
 
         # negative conductivity but allow gain
         pmed = td.PerturbationMedium(conductivity_perturbation=pp_real, allow_gain=True)
         _ = pmed.perturbed_copy(1.1 * temperature)
 
     # complex perturbation
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         pmed = td.PerturbationMedium(permittivity=3, permittivity_perturbation=pp_complex)
 
     # overdefinition
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         _ = td.PerturbationMedium(
             permittivity=1.21,
             permittivity_perturbation=pp_real,
@@ -258,18 +258,18 @@ def test_perturbation_medium(unstructured):
         assert cmed.allow_gain == pmed.allow_gain
 
         # eps_inf < 0
-        with pytest.raises(pydantic.ValidationError):
+        with pytest.raises(ValidationError):
             _ = pmed.perturbed_copy(1.1 * temperature)
 
     # mismatch between base parameter and perturbations
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         pmed = td.PerturbationPoleResidue(
             poles=[(1j, 3), (2j, 4)],
             poles_perturbation=[(None, pp_real)],
         )
 
     # overdefinition
-    with pytest.raises(pydantic.ValidationError):
+    with pytest.raises(ValidationError):
         _ = td.PerturbationPoleResidue(
             eps_inf=1.21,
             poles=[(1j, 3), (2j, 4)],

tests/test_components/test_scene.py

@@ -2,9 +2,9 @@
 
 import matplotlib.pyplot as plt
 import numpy as np
-import pydantic.v1 as pd
 import pytest
 import tidy3d as td
+from pydantic import ValidationError
 from tidy3d.components.scene import MAX_GEOMETRY_COUNT, MAX_NUM_MEDIUMS
 
 from ..utils import SIM_FULL, cartesian_to_unstructured
@@ -44,7 +44,7 @@ def test_scene_init():
 
 
 def test_validate_components_none():
-    assert SCENE._validate_num_mediums(val=None) is None
+    assert type(SCENE)._validate_num_mediums(val=None) is None
 
 
 def test_plot_eps():
@@ -113,7 +113,7 @@ def test_structure_alpha():
     new_structs = [
         td.Structure(geometry=s.geometry, medium=SCENE_FULL.medium) for s in SCENE_FULL.structures
     ]
-    S2 = SCENE_FULL.copy(update=dict(structures=new_structs))
+    S2 = SCENE_FULL.copy(update=dict(structures=tuple(new_structs)))
     _ = S2.plot_structures_eps(x=0, alpha=0.5)
     plt.close()
 
@@ -155,7 +155,7 @@ def test_num_mediums():
         structures=structures,
     )
 
-    with pytest.raises(pd.ValidationError):
+    with pytest.raises(ValidationError):
         structures.append(
             td.Structure(geometry=td.Box(size=(1, 1, 1)), medium=td.Medium(permittivity=i + 2))
         )
@@ -191,7 +191,7 @@ def _test_names_default():
 
 
 def test_names_unique():
-    with pytest.raises(pd.ValidationError):
+    with pytest.raises(ValidationError):
         _ = td.Scene(
             structures=[
                 td.Structure(
@@ -305,5 +305,5 @@ def test_max_geometry_validation():
             medium=td.Medium(permittivity=2.0),
         ),
     ]
-    with pytest.raises(pd.ValidationError, match=f" {MAX_GEOMETRY_COUNT + 2} "):
+    with pytest.raises(ValidationError, match=f" {MAX_GEOMETRY_COUNT + 2} "):
         _ = td.Scene(structures=not_fine)