Turning a few validators into root validators

Author: momchil-flex

tidy3d/components/base_sim/data/sim_data.py

@@ -52,15 +52,15 @@ def monitor_data(self) -> dict[str, AbstractMonitorData]:
         """Dictionary mapping monitor name to its associated :class:`AbstractMonitorData`."""
         return {monitor_data.monitor.name: monitor_data for monitor_data in self.data}
 
-    @pd.validator("data", always=True)
-    @skip_if_fields_missing(["simulation"])
-    def data_monitors_match_sim(cls, val, values):
+    @pd.root_validator(skip_on_failure=True)
+    def data_monitors_match_sim(cls, values):
         """Ensure each :class:`AbstractMonitorData` in ``.data`` corresponds to a monitor in
         ``.simulation``.
         """
         sim = values.get("simulation")
+        data = values.get("data")
 
-        for mnt_data in val:
+        for mnt_data in data:
             try:
                 monitor_name = mnt_data.monitor.name
                 sim.get_monitor_by_name(monitor_name)
@@ -69,7 +69,7 @@ def data_monitors_match_sim(cls, val, values):
                     f"Data with monitor name '{monitor_name}' supplied "
                     f"but not found in the original '{sim.type}'."
                 ) from exc
-        return val
+        return values
 
     @pd.validator("data", always=True)
     @skip_if_fields_missing(["simulation"])

tidy3d/components/data/unstructured/base.py

@@ -114,20 +114,21 @@ def values_right_indexing(cls, val):
             )
         return val
 
-    @pd.validator("values", always=True)
-    @skip_if_fields_missing(["points"])
-    def number_of_values_matches_points(cls, val, values):
+    @pd.root_validator(skip_on_failure=True)
+    def number_of_values_matches_points(cls, values):
         """Check that the number of data values matches the number of grid points."""
-        num_values = len(val.index)
-
         points = values.get("points")
-        num_points = len(points)
-        if num_points != num_values:
-            raise ValidationError(
-                f"The number of data values ({num_values}) does not match the number of grid "
-                f"points ({num_points})."
-            )
-        return val
+        vals = values.get("values")
+
+        if points is not None and vals is not None:
+            num_points = len(points)
+            num_values = len(vals.index)
+            if num_points != num_values:
+                raise ValidationError(
+                    f"The number of data values ({num_values}) does not match the number of grid "
+                    f"points ({num_points})."
+                )
+        return values
 
     @pd.validator("cells", always=True)
     def match_cells_to_vtk_type(cls, val):

tidy3d/components/tcad/data/sim_data.py

@@ -8,7 +8,7 @@
 import numpy as np
 import pydantic.v1 as pd
 
-from tidy3d.components.base import Tidy3dBaseModel, skip_if_fields_missing
+from tidy3d.components.base import Tidy3dBaseModel
 from tidy3d.components.base_sim.data.sim_data import AbstractSimulationData
 from tidy3d.components.data.data_array import (
     SpatialDataArray,
@@ -560,23 +560,23 @@ def mesher(self) -> VolumeMesher:
             monitors=self.monitors,
         )
 
-    @pd.validator("data", always=True)
-    @skip_if_fields_missing(["monitors"])
-    def data_monitors_match_sim(cls, val, values):
+    @pd.root_validator(skip_on_failure=True)
+    def data_monitors_match_sim(cls, values):
         """Ensure each :class:`AbstractMonitorData` in ``.data`` corresponds to a monitor in
         ``.simulation``.
         """
         monitors = values.get("monitors")
+        data = values.get("data")
         mnt_names = {mnt.name for mnt in monitors}
 
-        for mnt_data in val:
+        for mnt_data in data:
             monitor_name = mnt_data.monitor.name
             if monitor_name not in mnt_names:
                 raise DataError(
                     f"Data with monitor name '{monitor_name}' supplied "
                     f"but not found in the list of monitors."
                 )
-        return val
+        return values
 
     def get_monitor_by_name(self, name: str) -> VolumeMeshMonitor:
         """Return monitor named 'name'."""