fix: stabilize model hashing in tests

Author: yaugenst-flex

tests/test_web/test_tidy3d_stub.py

@@ -118,53 +118,57 @@ def test_stub_data_to_file(tmp_path):
 def test_stub_data_postprocess_logs(tmp_path):
     """Tests the postprocess method of Tidy3dStubData when simulation diverged."""
     td.log.set_capture(True)
-
-    # test diverged
-    sim_data = make_sim_data()
-    sim_data = sim_data.updated_copy(diverged=True, log="The simulation has diverged!")
-    file_path = os.path.join(tmp_path, "test_diverged.hdf5")
-    sim_data.to_file(file_path)
-    Tidy3dStubData.postprocess(file_path)
-
-    # test warnings
-    sim_data = make_sim_data()
-    sim_data = sim_data.updated_copy(log="WARNING: messages were found in the solver log.")
-    file_path = os.path.join(tmp_path, "test_warnings.hdf5")
-    sim_data.to_file(file_path)
-    Tidy3dStubData.postprocess(file_path)
+    try:
+        # test diverged
+        sim_data = make_sim_data()
+        sim_data = sim_data.updated_copy(diverged=True, log="The simulation has diverged!")
+        file_path = os.path.join(tmp_path, "test_diverged.hdf5")
+        sim_data.to_file(file_path)
+        Tidy3dStubData.postprocess(file_path)
+
+        # test warnings
+        sim_data = make_sim_data()
+        sim_data = sim_data.updated_copy(log="WARNING: messages were found in the solver log.")
+        file_path = os.path.join(tmp_path, "test_warnings.hdf5")
+        sim_data.to_file(file_path)
+        Tidy3dStubData.postprocess(file_path)
+    finally:
+        td.log.set_capture(False)
 
 
 @responses.activate
 def test_stub_data_lazy_loading(tmp_path):
     """Tests the postprocess method with lazy loading of Tidy3dStubData when simulation diverged."""
     td.log.set_capture(True)
     sim_diverged_log = "The simulation has diverged!"
-
-    # make sim data where test diverged
-    sim_data = make_sim_data()
-    sim_data = sim_data.updated_copy(diverged=True, log=sim_diverged_log)
-    file_path = os.path.join(tmp_path, "test_diverged.hdf5")
-    sim_data.to_file(file_path)
-
-    # default case with lazy=False should output a warning
-    with AssertLogLevel("WARNING", contains_str=sim_diverged_log):
-        Tidy3dStubData.postprocess(file_path, lazy=False)
-
-    # we expect no warning in lazy mode as object should not be loaded
-    with AssertLogLevel(None):
-        sim_data = Tidy3dStubData.postprocess(file_path, lazy=True)
-
-    sim_data_copy = sim_data.copy()
-
-    # variable dict should only contain metadata to load the data, not the data itself
-    assert is_lazy_object(sim_data)
-
-    # the type should be still SimulationData despite being lazy
-    assert isinstance(sim_data, SimulationData)
-
-    # we expect a warning from the lazy object if some field is accessed
-    with AssertLogLevel("WARNING", contains_str=sim_diverged_log):
-        _ = sim_data_copy.monitor_data
+    try:
+        # make sim data where test diverged
+        sim_data = make_sim_data()
+        sim_data = sim_data.updated_copy(diverged=True, log=sim_diverged_log)
+        file_path = os.path.join(tmp_path, "test_diverged.hdf5")
+        sim_data.to_file(file_path)
+
+        # default case with lazy=False should output a warning
+        with AssertLogLevel("WARNING", contains_str=sim_diverged_log):
+            Tidy3dStubData.postprocess(file_path, lazy=False)
+
+        # we expect no warning in lazy mode as object should not be loaded
+        with AssertLogLevel(None):
+            sim_data = Tidy3dStubData.postprocess(file_path, lazy=True)
+
+        sim_data_copy = sim_data.copy()
+
+        # variable dict should only contain metadata to load the data, not the data itself
+        assert is_lazy_object(sim_data)
+
+        # the type should be still SimulationData despite being lazy
+        assert isinstance(sim_data, SimulationData)
+
+        # we expect a warning from the lazy object if some field is accessed
+        with AssertLogLevel("WARNING", contains_str=sim_diverged_log):
+            _ = sim_data_copy.monitor_data
+    finally:
+        td.log.set_capture(False)
 
 
 @pytest.mark.parametrize(

tidy3d/components/base.py

@@ -26,7 +26,6 @@
 from autograd.numpy.numpy_boxes import ArrayBox
 from autograd.tracer import isbox
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr, field_validator, model_validator
-from pydantic.functional_validators import ModelWrapValidatorHandler
 
 from tidy3d.exceptions import FileError
 from tidy3d.log import log
@@ -42,6 +41,7 @@
     from typing import Callable
 
     from pydantic.fields import FieldInfo
+    from pydantic.functional_validators import ModelWrapValidatorHandler
 
     from tidy3d.compat import Self
 
@@ -306,11 +306,16 @@ def _recursive_hash(value: Any) -> int:
         if isinstance(value, Tidy3dBaseModel):
             # This function needs to take special care because of mutable attributes inside of frozen pydantic models
             to_hash_list = []
-            for k, v in dict(value).items():
+            for k in type(value).model_fields:
                 if k == "attrs":
                     continue
-                v_hash = Tidy3dBaseModel._recursive_hash(v)
+                v_hash = Tidy3dBaseModel._recursive_hash(getattr(value, k))
                 to_hash_list.append((k, v_hash))
+            extra = getattr(value, "__pydantic_extra__", None)
+            if extra:
+                for k, v in extra.items():
+                    v_hash = Tidy3dBaseModel._recursive_hash(v)
+                    to_hash_list.append((k, v_hash))
             # attrs is mutable, use serialized output as safe hashing option
             if value.attrs:
                 attrs_str = value._attrs_digest()