remove all v1 remnants

Author: yaugenst-flex

tidy3d/__init__.py

@@ -397,9 +397,9 @@ def set_logging_level(level: str) -> None:
 
 log.info(f"Using client version: {__version__}")
 
-Transformed.update_forward_refs()
-ClipOperation.update_forward_refs()
-GeometryGroup.update_forward_refs()
+Transformed.model_rebuild()
+ClipOperation.model_rebuild()
+GeometryGroup.model_rebuild()
 
 __all__ = [
     "C_0",

tidy3d/components/base.py

@@ -129,7 +129,7 @@ class Tidy3dBaseModel(BaseModel):
         "For example, the following is allowed for setting an ``attr`` ``obj.attrs['foo'] = bar``. "
         "Also note that `Tidy3D`` will raise a ``TypeError`` if ``attrs`` contain objects "
         "that can not be serialized. One can check if ``attrs`` are serializable "
-        "by calling ``obj.json()``.",
+        "by calling ``obj.model_dump_json()``.",
     )
 
     _cached_properties: dict = PrivateAttr(default_factory=dict)
@@ -181,7 +181,7 @@ def __hash__(self) -> int:
         try:
             return super().__hash__(self)
         except TypeError:
-            return hash(self.json())
+            return hash(self.model_dump_json())
 
     def _hash_self(self) -> str:
         """Hash this component with ``hashlib`` in a way that is the same every session."""

tidy3d/components/data/monitor_data.py

@@ -153,7 +153,7 @@ def _updated(self, update: dict) -> MonitorData:
             thus be used carefully.
 
         """
-        data_dict = self.dict()
+        data_dict = self.model_dump()
         data_dict.update(update)
         return type(self).model_validate(data_dict)
 

tidy3d/components/data/sim_data.py

@@ -1322,7 +1322,7 @@ def to_mat_file(self, fname: str, **kwargs):
             )
 
         # Get SimData object as dictionary
-        sim_dict = self.dict()
+        sim_dict = self.model_dump()
 
         # set long field names true by default, otherwise it wont save fields with > 31 characters
         if "long_field_names" not in kwargs:

tidy3d/components/eme/grid.py

@@ -90,7 +90,7 @@ class EMEModeSpec(ModeSpec):
 
     def _to_mode_spec(self) -> ModeSpec:
         """Convert to ordinary :class:`.ModeSpec`."""
-        ms_dict = self.dict()
+        ms_dict = self.model_dump()
         ms_dict.pop("type")
         return ModeSpec.model_validate(ms_dict)
 

tidy3d/components/microwave/data/monitor_data.py

@@ -95,7 +95,7 @@ def from_directivity_data(
             New instance combining directivity data with incident and reflected power measurements.
         """
         antenna_params_dict = {
-            **dir_data.dict(),
+            **dir_data.model_dump(),
             "power_incident": power_inc,
             "power_reflected": power_refl,
         }

tidy3d/components/monitor.py

@@ -605,7 +605,7 @@ class SurfaceIntegrationMonitor(Monitor, ABC):
     def integration_surfaces(self):
         """Surfaces of the monitor where fields will be recorded for subsequent integration."""
         if self.size.count(0.0) == 0:
-            return self.surfaces_with_exclusion(**self.dict())
+            return self.surfaces_with_exclusion(**self.model_dump())
         return [self]
 
     @model_validator(mode="after")

tidy3d/components/scene.py

@@ -305,7 +305,7 @@ def intersecting_media(
             return mediums
 
         # if the test object is a volume, test each surface recursively
-        surfaces = test_object.surfaces_with_exclusion(**test_object.dict())
+        surfaces = test_object.surfaces_with_exclusion(**test_object.model_dump())
         mediums = set()
         for surface in surfaces:
             _mediums = Scene.intersecting_media(surface, structures)
@@ -347,7 +347,7 @@ def intersecting_structures(
             return structures_merged
 
         # if the test object is a volume, test each surface recursively
-        surfaces = test_object.surfaces_with_exclusion(**test_object.dict())
+        surfaces = test_object.surfaces_with_exclusion(**test_object.model_dump())
         structures_merged = []
         for surface in surfaces:
             structures_merged += Scene.intersecting_structures(surface, structures)
@@ -1766,7 +1766,7 @@ def perturbed_mediums_copy(
             Simulation after application of heat and/or charge data.
         """
 
-        scene_dict = self.dict()
+        scene_dict = self.model_dump()
         structures = self.sorted_structures
         array_dict = {
             "temperature": temperature,

tidy3d/components/simulation.py

@@ -977,8 +977,8 @@ def plot_grid(
         cell_boundaries = self.grid.boundaries
         axis, _ = self.parse_xyz_kwargs(x=x, y=y, z=z)
         _, (axis_x, axis_y) = self.pop_axis([0, 1, 2], axis=axis)
-        boundaries_x = cell_boundaries.dict()["xyz"[axis_x]]
-        boundaries_y = cell_boundaries.dict()["xyz"[axis_y]]
+        boundaries_x = cell_boundaries.model_dump()["xyz"[axis_x]]
+        boundaries_y = cell_boundaries.model_dump()["xyz"[axis_y]]
 
         if self.size[axis_x] > 0:
             for b in boundaries_x:
@@ -5194,7 +5194,7 @@ def perturbed_mediums_copy(
                             normal_axis=data.normal_axis,
                         )
 
-        sim_dict = self.dict()
+        sim_dict = self.model_dump()
         structures = self.structures
         sim_bounds = self.simulation_bounds
         array_dict = {

tidy3d/components/viz/plot_params.py

@@ -21,7 +21,7 @@ def include_kwargs(self, **kwargs) -> AbstractPlotParams:
         update_dict = {
             key: value
             for key, value in kwargs.items()
-            if key not in ("type",) and value is not None and key in self.__fields__
+            if key not in ("type",) and value is not None and key in self.model_fields
         }
         return self.copy(update=update_dict)
 
@@ -31,7 +31,7 @@ def override_with_viz_spec(self, viz_spec) -> AbstractPlotParams:
 
     def to_kwargs(self) -> dict:
         """Export the plot parameters as kwargs dict that can be supplied to plot function."""
-        kwarg_dict = self.dict()
+        kwarg_dict = self.model_dump()
         for ignore_key in ("type", "attrs"):
             kwarg_dict.pop(ignore_key)
         return kwarg_dict